Ticket #3604: t3604_stop_rejoin_confusion_v3.patch

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

@@ -17 +17 @@
     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 already in use");
     default:
         warn("Unknown disconnect-reason ID received: " + id);
         return sprintf(translate("\\[Invalid value %(id)s]"), { "id": id });
     }
 }

source/network/NetHost.h

@@ -63 +63 @@
     NDR_UNEXPECTED_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             0x01010008      // Arbitrary protocol
+#define PS_PROTOCOL_VERSION             0x01010009      // 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

@@ -844 +844 @@
         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);
+
+    // Prohibit joins if the same name exists
+    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);
@@ -1174 +1185 @@
         name = L"Anonymous";
 
     return name;
 }
 
-CStrW CNetServerWorker::DeduplicatePlayerName(const CStrW& original)
-{
-    CStrW name = original;
-
-    // Try names "Foo", "Foo (2)", "Foo (3)", etc
-    size_t id = 2;
-    while (true)
-    {
-        bool unique = true;
-        for (size_t i = 0; i < m_Sessions.size(); ++i)
-        {
-            if (m_Sessions[i]->GetUserName() == name)
-            {
-                unique = false;
-                break;
-            }
-        }
-
-        if (unique)
-            return name;
-
-        name = original + L" (" + CStrW::FromUInt(id++) + L")";
-    }
-}
 
 
 
 
 CNetServer::CNetServer(int autostartPlayers) :

source/network/NetServer.h

@@ -236 +236 @@
      * Make a player name 'nicer' by limiting the length and removing forbidden characters etc.
      */
     static CStrW SanitisePlayerName(const CStrW& original);
 
     /**
-     * Make a player name unique, if it matches any existing session's name.
-     */
-    CStrW DeduplicatePlayerName(const CStrW& original);
-
-    /**
      * Get the script context used for game attributes.
      */
     ScriptInterface& GetScriptInterface();
 
     /**