dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix NetServerTurnManager hanging if a client passed handshake but not authentication on gamestart.

Browse source 
Fixes #5201.
This commit is contained in:
elexis 2025-08-31 19:09:00 +02:00 committed by Ralph Sennhauser
parent 27b5368f1b
commit 1f58836cf1
No known key found for this signature in database
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/network/NetServer.cpp
View file

@ -1594,6 +1594,21 @@ void CNetServerWorker::PreStartGame(const CStr& initAttribs)
for (CNetServerSession* session : m_Sessions)
{
// InitialiseClient makes the NetServerTurnManager wait for this client.
// But we only want to wait for clients who have passed authentication, i.e. who have the correct password.
// Therefore we may not call InitialiseClient for unauthenticated clients.
if (session->GetCurrState() != NSS_PREGAME)
{
// We only support clients joining before or after, not during the loading screen.
// Therefore we have to disconnect clients who did not complete the authentication yet.
LOGMESSAGE("Dropping client (%s / %s / %d) not in NSS_PREGAME when starting the game",
session->GetUserName().ToUTF8().c_str(),
session->GetGUID().c_str(),
session->GetHostID());
session->Disconnect(NDR_SERVER_LOADING);
continue;
}
// Special case: the controller shouldn't be treated as an observer in any case.
bool isObserver = m_PlayerAssignments[session->GetGUID()].m_PlayerID == -1 && m_ControllerGUID != session->GetGUID();
m_ServerTurnManager->InitialiseClient(session->GetHostID(), 0, isObserver);