Changeset 21832 for ps

Timestamp:

06/01/18 19:35:00 (7 years ago)

Author:

elexis

Message:

Report network timeouts and lag warnings to clients that finished the loading screen but are waiting for other clients to finish it.

This allows the host to distinguish clients that are just slower than everyone else with the loading screen from clients who have most likely disconnected or crashed already and may be considered to be kicked.
This is especially important for D1513, because that increases the timeout tolerance to a minute or longer.

Fixes #5193
Differential Revision: ​https://code.wildfiregames.com/D1546
Reviewed By: causative

Location:

ps/trunk/source/network

Files:

• NetClient.cpp (modified) (2 diffs)
• NetServer.cpp (modified) (2 diffs)

ps/trunk/source/network/NetClient.cpp

@@ -776 +776 @@
     JSAutoRequest rq(cx);
 
-    if (client->GetCurrState() == NCS_LOADING)
-        return true;
-
     CClientTimeoutMessage* message = (CClientTimeoutMessage*)event->GetParamRef();
     JS::RootedValue msg(cx);
@@ -799 +796 @@
     JSContext* cx = client->GetScriptInterface().GetContext();
     JSAutoRequest rq(cx);
-
-    if (client->GetCurrState() == NCS_LOADING)
-        return true;
 
     CClientPerformanceMessage* message = (CClientPerformanceMessage*)event->GetParamRef();

ps/trunk/source/network/NetServer.cpp

@@ -554 +554 @@
 void CNetServerWorker::CheckClientConnections()
 {
-    if (m_State == SERVER_STATE_LOADING)
-        return;
-
     // Send messages at most once per second
     std::time_t now = std::time(nullptr);
@@ -591 +588 @@
 
         // Send to all clients except the affected one
-        // (since that will show the locally triggered warning instead)
+        // (since that will show the locally triggered warning instead).
+        // Also send it to clients that finished the loading screen while
+        // the game is still waiting for other clients to finish the loading screen.
         if (message)
             for (size_t j = 0; j < m_Sessions.size(); ++j)
             {
                 if (i != j && (
-                    m_Sessions[j]->GetCurrState() == NSS_PREGAME ||
+                    (m_Sessions[j]->GetCurrState() == NSS_PREGAME && m_State == SERVER_STATE_PREGAME) ||
                     m_Sessions[j]->GetCurrState() == NSS_INGAME))
                 {