Ticket #3604: t3604_stop_rejoin_confusion_v4.patch

binaries/data/config/default.cfg

@@ -347 +347 @@
 xpartamupp = "wfgbot20"             ; Name of the server-side xmpp client that manage games
 
 [mod]
 enabledmods = "mod public"
 
+[network]
+prohibitIdenticalPlayernames = true ; Disable joins as "User (2)" in case someone with the name "User" is already connected
+
 [overlay]
 fps = "false"                     ; Show frames per second in top right corner
 realtime = "false"                ; Show current system time in top right corner
 netwarnings = "true"              ; Show warnings if the network connection is bad
 

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

@@ -55 +55 @@
     case 2: return translate("Incorrect network protocol version");
     case 3: return translate("Game is loading, please try later");
     case 4: return translate("Game has already started, no observers allowed");
     case 5: return translate("You have been kicked");
     case 6: return translate("You have been banned");
+    case 7: return translate("Playername in use. If you were disconnected, retry in few seconds");
     default:
         warn("Unknown disconnect-reason ID received: " + id);
         return sprintf(translate("\\[Invalid value %(id)s]"), { "id": id });
     }
 }

source/network/NetHost.h

@@ -63 +63 @@
     NDR_SERVER_SHUTDOWN,
     NDR_INCORRECT_PROTOCOL_VERSION,
     NDR_SERVER_LOADING,
     NDR_SERVER_ALREADY_IN_GAME,
     NDR_KICKED,
-    NDR_BANNED
+    NDR_BANNED,
+    NDR_PLAYERNAME_IN_USE
 };
 
 class CNetHost
 {
 public:

source/network/NetMessages.h

@@ -26 +26 @@
 #include "ps/CStr.h"
 #include "scriptinterface/ScriptVal.h"
 
 #define PS_PROTOCOL_MAGIC               0x5073013f      // 'P', 's', 0x01, '?'
 #define PS_PROTOCOL_MAGIC_RESPONSE      0x50630121      // 'P', 'c', 0x01, '!'
-#define PS_PROTOCOL_VERSION             0x01010009      // Arbitrary protocol
+#define PS_PROTOCOL_VERSION             0x01010010      // Arbitrary protocol
 #define PS_DEFAULT_PORT                 0x5073          // 'P', 's'
 
 // Defines the list of message types. The order of the list must not change.
 // The message types having a negative value are used internally and not sent
 // over the network. The message types used for network communication have

source/network/NetServer.cpp

@@ -899 +899 @@
         session->Disconnect(NDR_SERVER_LOADING);
         return true;
     }
 
     CAuthenticateMessage* message = (CAuthenticateMessage*)event->GetParamRef();
-    CStrW username = server.DeduplicatePlayerName(SanitisePlayerName(message->m_Name));
+    CStrW username = SanitisePlayerName(message->m_Name);
+
+    // Check for duplicate names
+    bool prohibitIdenticalPlayernames = false;
+    CFG_GET_VAL("network.prohibitIdenticalPlayernames", prohibitIdenticalPlayernames);
+    if (!prohibitIdenticalPlayernames)
+        username = server.DeduplicatePlayerName(username);
+    else if (std::find_if(
+            server.m_Sessions.begin(), server.m_Sessions.end(),
+            [&username] (const CNetServerSession* session)
+            { return session->GetUserName() == username; })
+        != server.m_Sessions.end())
+    {
+        session->Disconnect(NDR_PLAYERNAME_IN_USE);
+        return true;
+    }
 
     // Disconnect banned usernames
     if (std::find(server.m_BannedPlayers.begin(), server.m_BannedPlayers.end(), username) != server.m_BannedPlayers.end())
     {
         session->Disconnect(NDR_BANNED);