Fix incorrect player verification in CnCNet lobby (CnCNet#587)

* Add XML documentation for PlayerInfo.Verified * Set PlayerInfo.Verified regardless of hash consistency * Rename to PlayerInfo.HashReceived * Code style changes
SadPencil · Dec 2, 2024 · a8522b0 · a8522b0
1 parent 42854e1
commit a8522b0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetGameLoadingLobby.cs b/DXMainClient/DXGUI/Multiplayer/CnCNet/CnCNetGameLoadingLobby.cs
@@ -416,17 +416,14 @@ private void HandleFileHashCommand(string sender, string fileHash)
             if (!IsHost)
                 return;
 
-            if (fileHash != gameFilesHash)
-            {
-                PlayerInfo pInfo = Players.Find(p => p.Name == sender);
-
-                if (pInfo == null)
-                    return;
+            PlayerInfo pInfo = Players.Find(p => p.Name == sender);
+            if (pInfo == null)
+                return;
 
-                pInfo.Verified = true;
+            pInfo.HashReceived = true;
 
+            if (fileHash != gameFilesHash)
                 HandleCheaterNotification(hostName, sender); // This is kinda hacky
-            }
         }
 
         private void HandleCheaterNotification(string sender, string cheaterName)

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/CnCNetGameLobby.cs
@@ -1456,7 +1456,7 @@ private void FileHashNotification(string sender, string filesHash)
             PlayerInfo pInfo = Players.Find(p => p.Name == sender);
 
             if (pInfo != null)
-                pInfo.Verified = true;
+                pInfo.HashReceived = true;
             CopyPlayerDataToUI();
 
             if (filesHash != gameFilesHash)

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/LANGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/LANGameLobby.cs
@@ -93,7 +93,7 @@ private void HandleFileHashCommand(string sender, string fileHash)
             if (pInfo == null)
                 return;
 
-            pInfo.Verified = true;
+            pInfo.HashReceived = true;
             CopyPlayerDataToUI();
         }
 

diff --git a/DXMainClient/DXGUI/Multiplayer/GameLobby/MultiplayerGameLobby.cs b/DXMainClient/DXGUI/Multiplayer/GameLobby/MultiplayerGameLobby.cs
@@ -843,7 +843,7 @@ protected override void BtnLaunchGame_LeftClick(object sender, EventArgs e)
                 if (player.Name == ProgramConstants.PLAYERNAME)
                     continue;
 
-                if (!player.Verified)
+                if (!player.HashReceived)
                 {
                     NotVerifiedNotification(iId - 1);
                     return;
@@ -998,7 +998,7 @@ protected override void CopyPlayerDataToUI()
             // Player statuses
             for (int pId = 0; pId < Players.Count; pId++)
             {
-                /* if (pId != 0 && !Players[pId].Verified) // If player is not verified (not counting the host)
+                /* if (pId != 0 && !Players[pId].HashReceived) // If player is not verified (not counting the host)
                 {
                     StatusIndicators[pId].SwitchTexture("error");
                 }

diff --git a/DXMainClient/DXGUI/Multiplayer/LANGameLoadingLobby.cs b/DXMainClient/DXGUI/Multiplayer/LANGameLoadingLobby.cs
@@ -475,7 +475,7 @@ private void Server_HandleFileHashMessage(LANPlayerInfo sender, string hash)
         {
             if (hash != localFileHash)
                 AddNotice(string.Format("{0} - modified files detected! They could be cheating!".L10N("Client:Main:PlayerCheating"), sender.Name), Color.Red);
-            sender.Verified = true;
+            sender.HashReceived = true;
         }
 
         private void Server_HandleReadyRequest(LANPlayerInfo sender)

diff --git a/DXMainClient/Domain/Multiplayer/PlayerInfo.cs b/DXMainClient/Domain/Multiplayer/PlayerInfo.cs
@@ -36,7 +36,11 @@ public PlayerInfo(string name, int sideId, int startingLocation, int colorId, in
         public bool IsInGame { get; set; }
         public virtual string IPAddress { get; set; } = "0.0.0.0";
         public int Port { get; set; }
-        public bool Verified { get; set; }
+
+        /// <summary>
+        /// Whether the file hash information is received from the player, regardless of whether it is consistent with the one calculated by this client.
+        /// </summary>
+        public bool HashReceived { get; set; }
 
         public int Index { get; set; }