Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix some serverlist issues

Browse Source
This commit is contained in:
Maurice Heumann 2023-02-06 18:39:55 +01:00
parent f94b775094
commit 74100dc869
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/client/steam/interfaces/matchmaking_servers.cpp
View File

@ -21,6 +21,8 @@ namespace steam
gameserveritem_t server_item{}; gameserveritem_t server_item{};
}; };
auto* const internet_request = reinterpret_cast<void*>(1);
using servers = std::vector<server>; using servers = std::vector<server>;
::utils::concurrency::container<servers> queried_servers{}; ::utils::concurrency::container<servers> queried_servers{};
@ -32,7 +34,7 @@ namespace steam
gameserveritem_t server{}; gameserveritem_t server{};
server.m_NetAdr.m_usConnectionPort = address.port; server.m_NetAdr.m_usConnectionPort = address.port;
server.m_NetAdr.m_usQueryPort = address.port; server.m_NetAdr.m_usQueryPort = address.port;
server.m_NetAdr.m_unIP = address.addr; server.m_NetAdr.m_unIP = ntohl(address.addr);
server.m_nPing = static_cast<int>(ping); server.m_nPing = static_cast<int>(ping);
server.m_bHadSuccessfulResponse = success; server.m_bHadSuccessfulResponse = success;
server.m_bDoNotRefresh = false; server.m_bDoNotRefresh = false;
@ -111,16 +113,16 @@ namespace steam
if (success) if (success)
{ {
res->ServerResponded(reinterpret_cast<void*>(1), *index); res->ServerResponded(internet_request, *index);
} }
else else
{ {
res->ServerFailedToRespond(reinterpret_cast<void*>(1), *index); res->ServerFailedToRespond(internet_request, *index);
} }
if (all_handled) if (all_handled)
{ {
res->RefreshComplete(reinterpret_cast<void*>(1), eServerResponded); res->RefreshComplete(internet_request, eServerResponded);
} }
} }
@ -145,13 +147,13 @@ namespace steam
if (!success) if (!success)
{ {
res->RefreshComplete(reinterpret_cast<void*>(1), eServerFailedToRespond); res->RefreshComplete(internet_request, eServerFailedToRespond);
return; return;
} }
if (s.empty()) if (s.empty())
{ {
res->RefreshComplete(reinterpret_cast<void*>(1), eNoServersListedOnMasterServer); res->RefreshComplete(internet_request, eNoServersListedOnMasterServer);
return; return;
} }
@ -177,7 +179,7 @@ namespace steam
}); });
return reinterpret_cast<void*>(1); return internet_request;
} }
void* matchmaking_servers::RequestLANServerList(unsigned int iApp, void* matchmaking_servers::RequestLANServerList(unsigned int iApp,
@ -212,12 +214,15 @@ namespace steam
void matchmaking_servers::ReleaseRequest(void* hServerListRequest) void matchmaking_servers::ReleaseRequest(void* hServerListRequest)
{ {
current_response = nullptr; if (internet_request == hServerListRequest)
{
current_response = nullptr;
}
} }
gameserveritem_t* matchmaking_servers::GetServerDetails(void* hRequest, int iServer) gameserveritem_t* matchmaking_servers::GetServerDetails(void* hRequest, int iServer)
{ {
if (reinterpret_cast<void*>(1) != hRequest) if (internet_request != hRequest)
{ {
return nullptr; return nullptr;
} }
@ -250,7 +255,7 @@ namespace steam
int matchmaking_servers::GetServerCount(void* hRequest) int matchmaking_servers::GetServerCount(void* hRequest)
{ {
if (reinterpret_cast<void*>(1) != hRequest) if (internet_request != hRequest)
{ {
return 0; return 0;
} }
@ -261,11 +266,31 @@ namespace steam
}); });
} }
void matchmaking_servers::RefreshServer(void* hRequest, int iServer) void matchmaking_servers::RefreshServer(void* hRequest, const int iServer)
{ {
if (internet_request != hRequest)
{
return;
}
std::optional<game::netadr_t> address{};
queried_servers.access([&](const servers& s)
{
if (iServer < 0 || static_cast<size_t>(iServer) >= s.size())
{
return;
}
address = s[iServer].address;
});
if (address)
{
ping_server(*address);
}
} }
void* matchmaking_servers::PingServer(unsigned int unIP, unsigned short usPort, void* matchmaking_servers::PingServer(const unsigned int unIP, const unsigned short usPort,
matchmaking_ping_response* pRequestServersResponse) matchmaking_ping_response* pRequestServersResponse)
{ {
auto response = pRequestServersResponse; auto response = pRequestServersResponse;