Ticket #3949: unique_guid_rev1.patch

binaries/data/mods/public/gui/common/network.js

@@ -71 +71 @@
     case 6: return translate("You have been banned");
     case 7: return translate("Playername in use. If you were disconnected, retry in few seconds");
     case 8: return translate("Server full");
+    case 9: return translate("Player identifier in use, retry connecting");
     default:
         warn("Unknown disconnect-reason ID received: " + id);
         return sprintf(translate("\\[Invalid value %(id)s]"), { "id": id });

binaries/data/mods/public/gui/credits/texts/programming.json

@@ -176 +176 @@
             {"nick": "Sandarac"},
             {"nick": "sanderd17", "name": "Sander Deryckere"},
             {"nick": "sathyam", "name": "Sathyam Vellal"},
+            {"nick": "sbirmi", "name": "Sharad Birmiwal"},
             {"nick": "sbte", "name": "Sven Baars"},
             {"nick": "scroogie", "name": "André Gemünd"},
             {"nick": "scythetwirler", "name": "Casey X."},

source/network/NetHost.h

@@ -67 +67 @@
     NDR_KICKED,
     NDR_BANNED,
     NDR_PLAYERNAME_IN_USE,
-    NDR_SERVER_FULL
+    NDR_SERVER_FULL,
+    NDR_PLAYERGUID_IN_USE
 };
 
 class CNetHost

source/network/NetServer.cpp

@@ -903 +903 @@
 
     CAuthenticateMessage* message = (CAuthenticateMessage*)event->GetParamRef();
     CStrW username = SanitisePlayerName(message->m_Name);
+    CStr guid = message->m_GUID;
 
     // Either deduplicate or prohibit join if name is in use
     bool duplicatePlayernames = false;
@@ -919 +920 @@
         return true;
     }
 
+    // Disconnect user if the provided GUID is already in use
+    if (std::find_if(
+        server.m_Sessions.begin(), server.m_Sessions.end(),
+        [&guid] (const CNetServerSession* session)
+        { return session->GetGUID() == guid; }) != server.m_Sessions.end())
+    {
+        session->Disconnect(NDR_PLAYERGUID_IN_USE);
+        return true;
+    }
+
     // Disconnect banned usernames
     if (std::find(server.m_BannedPlayers.begin(), server.m_BannedPlayers.end(), username) != server.m_BannedPlayers.end())
     {