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

Some networking/matchmaking improvements.

merge-requests/30/head
Mr_Goldberg 2020-03-03 09:04:04 -05:00
parent 0e72e995ee
commit a0b66407bf
No known key found for this signature in database
GPG Key ID: 8597D87419DEF278
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dll/network.cpp
View File

@ -1141,6 +1141,16 @@ bool Networking::sendToIPPort(Common_Message *msg, uint32 ip, uint16 port, bool
return true; return true;
} }
uint32 Networking::getIP(CSteamID id)
{
Connection *conn = find_connection(id, this->appid);
if (conn) {
return ntohl(conn->tcp_ip_port.ip);
}
return 0;
}
bool Networking::sendTo(Common_Message *msg, bool reliable, Connection *conn) bool Networking::sendTo(Common_Message *msg, bool reliable, Connection *conn)
{ {
if (!enabled) return false; if (!enabled) return false;

1
dll/network.h
View File

@ -135,6 +135,7 @@ public:
bool sendToIPPort(Common_Message *msg, uint32 ip, uint16 port, bool reliable); bool sendToIPPort(Common_Message *msg, uint32 ip, uint16 port, bool reliable);
bool setCallback(Callback_Ids id, CSteamID steam_id, void (*message_callback)(void *object, Common_Message *msg), void *object); bool setCallback(Callback_Ids id, CSteamID steam_id, void (*message_callback)(void *object, Common_Message *msg), void *object);
uint32 getIP(CSteamID id);
uint32 getOwnIP(); uint32 getOwnIP();
void shutDown(); void shutDown();

9
dll/steam_matchmaking.h
View File

@ -113,7 +113,7 @@ void send_lobby_data()
} }
} }
void trigger_lobby_dataupdate(CSteamID lobby, CSteamID member, bool success, double cb_timeout=0.0, bool send_changed_lobby=true) void trigger_lobby_dataupdate(CSteamID lobby, CSteamID member, bool success, double cb_timeout=0.005, bool send_changed_lobby=true)
{ {
PRINT_DEBUG("Lobby dataupdate %llu %llu\n", lobby.ConvertToUint64(), member.ConvertToUint64()); PRINT_DEBUG("Lobby dataupdate %llu %llu\n", lobby.ConvertToUint64(), member.ConvertToUint64());
LobbyDataUpdate_t data; LobbyDataUpdate_t data;
@ -1092,9 +1092,12 @@ CSteamID GetLobbyOwner( CSteamID steamIDLobby )
PRINT_DEBUG("GetLobbyOwner %llu\n", steamIDLobby.ConvertToUint64()); PRINT_DEBUG("GetLobbyOwner %llu\n", steamIDLobby.ConvertToUint64());
std::lock_guard<std::recursive_mutex> lock(global_mutex); std::lock_guard<std::recursive_mutex> lock(global_mutex);
Lobby *lobby = get_lobby(steamIDLobby); Lobby *lobby = get_lobby(steamIDLobby);
if (!lobby || lobby->deleted()) return k_steamIDNil;
Lobby_Member *member = get_lobby_member(lobby, settings->get_local_steam_id());
CSteamID id = k_steamIDNil; CSteamID id = k_steamIDNil;
if (lobby) id = (uint64)lobby->owner(); if (member) id = (uint64)lobby->owner();
return id; return id;
} }

7
dll/steam_networking.h
View File

@ -453,9 +453,8 @@ bool GetP2PSessionState( CSteamID steamIDRemote, P2PSessionState_t *pConnectionS
pConnectionState->m_bUsingRelay = false; pConnectionState->m_bUsingRelay = false;
pConnectionState->m_nBytesQueuedForSend = 0; pConnectionState->m_nBytesQueuedForSend = 0;
pConnectionState->m_nPacketsQueuedForSend = 0; pConnectionState->m_nPacketsQueuedForSend = 0;
//TODO ip? pConnectionState->m_nRemoteIP = network->getIP(steamIDRemote);
pConnectionState->m_nRemoteIP = 0; pConnectionState->m_nRemotePort = 12345;
pConnectionState->m_nRemotePort = 0;
} }
PRINT_DEBUG("Connection\n"); PRINT_DEBUG("Connection\n");
@ -470,7 +469,7 @@ bool GetP2PSessionState( CSteamID steamIDRemote, P2PSessionState_t *pConnectionS
// P2P packet relay is allowed by default // P2P packet relay is allowed by default
bool AllowP2PPacketRelay( bool bAllow ) bool AllowP2PPacketRelay( bool bAllow )
{ {
PRINT_DEBUG("Steam_Networking::AllowP2PPacketRelay\n"); PRINT_DEBUG("Steam_Networking::AllowP2PPacketRelay %u\n", bAllow);
return true; return true;
} }