Ticket #3643: defuse_v2.patch

source/network/NetServer.cpp

@@ -1064 +1064 @@
         // TODO: we shouldn't send the message back to the client that first sent it
     }
     else if (message->GetType() == (uint)NMT_SYNC_CHECK)
     {
         CSyncCheckMessage* syncMessage = static_cast<CSyncCheckMessage*> (message);
-        server.m_ServerTurnManager->NotifyFinishedClientUpdate(session->GetHostID(), session->GetUserName(), syncMessage->m_Turn, syncMessage->m_Hash);
+        server.m_ServerTurnManager->NotifyFinishedClientUpdate(session, syncMessage->m_Turn, syncMessage->m_Hash);
     }
     else if (message->GetType() == (uint)NMT_END_COMMAND_BATCH)
     {
         CEndCommandBatchMessage* endMessage = static_cast<CEndCommandBatchMessage*> (message);
-        server.m_ServerTurnManager->NotifyFinishedClientCommands(session->GetHostID(), endMessage->m_Turn);
+        server.m_ServerTurnManager->NotifyFinishedClientCommands(session, endMessage->m_Turn);
     }
 
     return true;
 }
 

source/network/NetTurnManager.cpp

@@ -582 +582 @@
     // so store dummy values into the saved lengths list
     m_SavedTurnLengths.push_back(0);
     m_SavedTurnLengths.push_back(0);
 }
 
-void CNetServerTurnManager::NotifyFinishedClientCommands(int client, u32 turn)
+void CNetServerTurnManager::NotifyFinishedClientCommands(CNetServerSession* session, u32 turn)
 {
+    int client = session->GetHostID();
+
     NETTURN_LOG((L"NotifyFinishedClientCommands(client=%d, turn=%d)\n", client, turn));
 
     // Must be a client we've already heard of
     ENSURE(m_ClientsReady.find(client) != m_ClientsReady.end());
 
     // Clients must advance one turn at a time
-    ENSURE(turn == m_ClientsReady[client] + 1);
+    if (turn != m_ClientsSimulated[client] + 1)
+    {
+        LOGERROR("NotifyFinishedClientCommands: Client %d (%s) is ready for turn %d, but expected %d",
+            client,
+            utf8_from_wstring(session->GetUserName()).c_str(),
+            turn,
+            m_ClientsReady[client] + 1
+        );
+
+        session->Disconnect(NDR_UNKNOWN);
+    }
+
     m_ClientsReady[client] = turn;
 
     // Check whether this was the final client to become ready
     CheckClientsReady();
 }
@@ -623 +636 @@
     // Save the turn length in case it's needed later
     ENSURE(m_SavedTurnLengths.size() == m_ReadyTurn);
     m_SavedTurnLengths.push_back(m_TurnLength);
 }
 
-void CNetServerTurnManager::NotifyFinishedClientUpdate(int client, const CStrW& playername, u32 turn, const CStr& hash)
+void CNetServerTurnManager::NotifyFinishedClientUpdate(CNetServerSession* session, u32 turn, const CStr& hash)
 {
+
+    int client = session->GetHostID();
+    const CStrW& playername = session->GetUserName();
+
     // Clients must advance one turn at a time
-    ENSURE(turn == m_ClientsSimulated[client] + 1);
+    if (turn != m_ClientsSimulated[client] + 1)
+    {
+        LOGERROR("NotifyFinishedClientUpdate: Client %d (%s) is ready for turn %d, but expected %d",
+            client,
+            utf8_from_wstring(playername).c_str(),
+            turn,
+            m_ClientsReady[client] + 1
+        );
+
+        session->Disconnect(NDR_UNKNOWN);
+    }
+
     m_ClientsSimulated[client] = turn;
 
     // Check for OOS only if in sync
     if (m_HasSyncError)
         return;

source/network/NetTurnManager.h

@@ -19 +19 @@
 #define INCLUDED_NETTURNMANAGER
 
 #include "simulation2/helpers/SimulationCommand.h"
 #include "lib/os_path.h"
 #include "NetMessage.h"
+#include "NetSession.h"
 
 #include <list>
 #include <map>
 #include <vector>
 
@@ -292 +293 @@
 {
     NONCOPYABLE(CNetServerTurnManager);
 public:
     CNetServerTurnManager(CNetServerWorker& server);
 
-    void NotifyFinishedClientCommands(int client, u32 turn);
+    void NotifyFinishedClientCommands(CNetServerSession* session, u32 turn);
 
-    void NotifyFinishedClientUpdate(int client, const CStrW& playername, u32 turn, const CStr& hash);
+    void NotifyFinishedClientUpdate(CNetServerSession* session, u32 turn, const CStr& hash);
 
     /**
      * Inform the turn manager of a new client who will be sending commands.
      */
     void InitialiseClient(int client, u32 turn);