MickSlash
/
goldberg_emulator
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: MickSlash:60fbdcfdba10a8949a05375d3b8069e9ce10b961
Branches Tags
MickSlash:master
MickSlash:test_ci
MickSlash:inventory_pr
MickSlash:0.2.5
MickSlash:v0.2.4
MickSlash:v0.2.3
MickSlash:v0.2.2
..
compare: MickSlash:657a36a21a567f1c8ab6eb6d56fc9c78bc80fb3f
Branches Tags
MickSlash:master
MickSlash:test_ci
MickSlash:inventory_pr
MickSlash:0.2.5
MickSlash:v0.2.4
MickSlash:v0.2.3
MickSlash:v0.2.2

No commits in common. "60fbdcfdba10a8949a05375d3b8069e9ce10b961" and "657a36a21a567f1c8ab6eb6d56fc9c78bc80fb3f" have entirely different histories.
60fbdcfdba ... 657a36a21a

2 changed files with 10 additions and 26 deletions
Show Stats Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@
CXX=clang++ CXX=clang++
CXX_FLAGS += -fPIC -std=c++11 CXX_FLAGS += -fPIC -std=c++11
LD_FLAGS += -shared -lprotobuf-lite -ldl -Wl,--no-undefined LD_FLAGS += -shared -lprotobuf-lite -Wl,--no-undefined
LIBRARY_NAME=libsteam_api.so LIBRARY_NAME=libsteam_api.so
RM = rm -f RM = rm -f

34
dll/steam_networking.h
View File

@ -16,7 +16,6 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include "base.h" #include "base.h"
#include <list>
//packet timeout in seconds for non connections //packet timeout in seconds for non connections
#define ORPHANED_PACKET_TIMEOUT (20) #define ORPHANED_PACKET_TIMEOUT (20)
@ -73,8 +72,7 @@ public ISteamNetworking
class RunEveryRunCB *run_every_runcb; class RunEveryRunCB *run_every_runcb;
std::recursive_mutex messages_mutex; std::recursive_mutex messages_mutex;
std::list<Common_Message> messages; std::vector<Common_Message> messages;
std::list<Common_Message> unprocessed_messages;
std::recursive_mutex connections_edit_mutex; std::recursive_mutex connections_edit_mutex;
std::vector<struct Steam_Networking_Connection> connections; std::vector<struct Steam_Networking_Connection> connections;
@ -133,17 +131,6 @@ void remove_connection(CSteamID id)
} }
} }
} }
{
auto msg = std::begin(unprocessed_messages);
while (msg != std::end(unprocessed_messages)) {
if (msg->source_id() == id.ConvertToUint64()) {
msg = messages.erase(msg);
} else {
++msg;
}
}
}
} }
SNetSocket_t create_connection_socket(CSteamID target, int nVirtualPort, uint32 nIP, uint16 nPort, SNetListenSocket_t id=0, enum steam_socket_connection_status status=SOCKET_CONNECTING, SNetSocket_t other_id=0) SNetSocket_t create_connection_socket(CSteamID target, int nVirtualPort, uint32 nIP, uint16 nPort, SNetListenSocket_t id=0, enum steam_socket_connection_status status=SOCKET_CONNECTING, SNetSocket_t other_id=0)
@ -830,10 +817,9 @@ void RunCallbacks()
{ {
std::lock_guard<std::recursive_mutex> lock(messages_mutex); std::lock_guard<std::recursive_mutex> lock(messages_mutex);
{ for (auto &msg : messages) {
auto msg = std::begin(unprocessed_messages); CSteamID source_id((uint64)msg.source_id());
while (msg != std::end(unprocessed_messages)) { if (!msg.network().processed()) {
CSteamID source_id((uint64)msg->source_id());
if (!connection_exists(source_id)) { if (!connection_exists(source_id)) {
if (new_connection_times.find(source_id) == new_connection_times.end()) { if (new_connection_times.find(source_id) == new_connection_times.end()) {
new_connections_to_call_cb.push(source_id); new_connections_to_call_cb.push(source_id);
@ -841,13 +827,11 @@ void RunCallbacks()
} }
} else { } else {
struct Steam_Networking_Connection *conn = get_or_create_connection(source_id); struct Steam_Networking_Connection *conn = get_or_create_connection(source_id);
conn->open_channels.insert(msg->network().channel()); conn->open_channels.insert(msg.network().channel());
} }
msg->mutable_network()->set_processed(true); msg.mutable_network()->set_processed(true);
msg->mutable_network()->set_time_processed(current_time); msg.mutable_network()->set_time_processed(current_time);
messages.push_back(*msg);
msg = unprocessed_messages.erase(msg);
} }
} }
@ -913,12 +897,12 @@ void Callback(Common_Message *msg)
}PRINT_DEBUG("\n"); }PRINT_DEBUG("\n");
#endif #endif
std::lock_guard<std::recursive_mutex> lock(messages_mutex);
if (msg->network().type() == Network::DATA) { if (msg->network().type() == Network::DATA) {
unprocessed_messages.push_back(Common_Message(*msg)); messages.push_back(Common_Message(*msg));
} }
if (msg->network().type() == Network::NEW_CONNECTION) { if (msg->network().type() == Network::NEW_CONNECTION) {
std::lock_guard<std::recursive_mutex> lock(messages_mutex);
auto msg_temp = std::begin(messages); auto msg_temp = std::begin(messages);
while (msg_temp != std::end(messages)) { while (msg_temp != std::end(messages)) {
//only delete processed to handle unreliable message arriving at the same time. //only delete processed to handle unreliable message arriving at the same time.