R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Server browser hosting logic improvements

Browse Source 
* Added missing mutex lock in 'CBrowser::UpdateHostingStatus' when host status is 'NOT_HOSTING'.
* Use server's remote checksum to test whether or not the checksum is valid, as this is the one that will be used for hosting.
* Construct 'NetGameServer_t' from the main thread instead, and dispatch back into separate thread for remote query.
This commit is contained in:
Kawe Mazidjatari 2023-02-12 11:22:18 +01:00
parent 2d7e2d5567
commit 26f52eea28
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
r5dev/gameui/IBrowser.cpp
View File

@ -672,7 +672,11 @@ void CBrowser::UpdateHostingStatus(void)
{
case EHostStatus_t::NOT_HOSTING:
{
m_svHostToken.clear();
std::lock_guard<std::mutex> g(m_Mutex);
if (!m_svHostToken.empty())
{
m_svHostToken.clear();
}
if (ImGui::ColorConvertFloat4ToU32(m_HostRequestMessageColor) == // Only clear if this is green (a valid hosting message).
ImGui::ColorConvertFloat4ToU32(ImVec4(0.00f, 1.00f, 0.00f, 1.00f)))
@ -690,7 +694,7 @@ void CBrowser::UpdateHostingStatus(void)
break;
}
if (*g_nClientRemoteChecksum == NULL) // Check if script checksum is valid yet.
if (*g_nServerRemoteChecksum == NULL) // Check if script checksum is valid yet.
{
break;
}
@ -708,28 +712,33 @@ void CBrowser::UpdateHostingStatus(void)
break;
}
NetGameServer_t netGameServer // !FIXME: create from main thread.
g_TaskScheduler->Dispatch([this]()
{
g_pServerListManager->m_Server.m_svHostName,
g_pServerListManager->m_Server.m_svDescription,
g_pServerListManager->m_Server.m_bHidden,
g_pHostState->m_levelName,
mp_gamemode->GetString(),
hostip->GetString(),
hostport->GetString(),
g_pNetKey->GetBase64NetKey(),
std::to_string(*g_nServerRemoteChecksum),
SDK_VERSION,
std::to_string(g_pServer->GetNumHumanPlayers() + g_pServer->GetNumFakeClients()),
std::to_string(g_ServerGlobalVariables->m_nMaxClients),
std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now().time_since_epoch()
).count()
};
std::lock_guard<std::mutex> l(g_pServerListManager->m_Mutex);
NetGameServer_t netGameServer
{
g_pServerListManager->m_Server.m_svHostName,
g_pServerListManager->m_Server.m_svDescription,
g_pServerListManager->m_Server.m_bHidden,
g_pHostState->m_levelName,
mp_gamemode->GetString(),
hostip->GetString(),
hostport->GetString(),
g_pNetKey->GetBase64NetKey(),
std::to_string(*g_nServerRemoteChecksum),
SDK_VERSION,
std::to_string(g_pServer->GetNumHumanPlayers() + g_pServer->GetNumFakeClients()),
std::to_string(g_ServerGlobalVariables->m_nMaxClients),
std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now().time_since_epoch()
).count()
};
std::thread post(&CBrowser::SendHostingPostRequest, this, netGameServer);
post.detach();
}, 0);
break;
}
default: