Merge branch 'develop-2.0.0' into vetting-test-develop-2.0.0

Author: michalChrobot

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -17,6 +17,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
+- Fixed issue where NetworkConfig.ConnectionData could cause the ConnectionRequestMessage to exceed the transport's MTU size and would result in a buffer overflow error. (#3564)
 - Fixed regression issue in v2.x where `NetworkObject.GetNetworkBehaviourAtOrderIndex` was converted from public to internal. (#3541)
 - Fixed ensuring OnValueChanged callback is still triggered on the authority when a collection changes and then reverts to the previous value in the same frame. (#3539)
 - Fixed synchronizing the destroyGameObject parameter to clients for InScenePlaced network objects. (#3514)

com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs

@@ -635,7 +635,7 @@ private void SendConnectionRequest()
                 }
             }
 
-            SendMessage(ref message, NetworkDelivery.ReliableSequenced, NetworkManager.ServerClientId);
+            SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, NetworkManager.ServerClientId);
             message.MessageVersions.Dispose();
         }
 

com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageCorruptionTests.cs

@@ -90,10 +90,13 @@ public unsafe void Send(ulong clientId, NetworkDelivery delivery, FastBufferWrit
                             break;
                         }
                     case TypeOfCorruption.CorruptBytes:
-                        batchData.Seek(batchData.Length - 2);
-                        var currentByte = batchData.GetUnsafePtr()[0];
-                        batchData.WriteByteSafe((byte)(currentByte == 0 ? 1 : 0));
-                        MessageQueue.Add(batchData.ToArray());
+                        for (int i = 0; i < 4; i++)
+                        {
+                            var currentByte = batchData.GetUnsafePtr()[i];
+                            currentByte = (byte)((currentByte + 1) % 255);
+                            batchData.WriteByteSafe(currentByte);
+                            MessageQueue.Add(batchData.ToArray());
+                        }
                         break;
                     case TypeOfCorruption.Truncated:
                         batchData.Truncate(batchData.Length - 1);

com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApproval.cs

@@ -22,7 +22,7 @@ public enum PlayerCreation
             Prefab,
             PrefabHash,
             NoPlayer,
-            FailValidation
+            FailValidation,
         }
         private PlayerCreation m_PlayerCreation;
         private bool m_ClientDisconnectReasonValidated;
@@ -38,7 +38,7 @@ public ConnectionApprovalTests(PlayerCreation playerCreation)
 
         protected override int NumberOfClients => 1;
 
-        private Guid m_ValidationToken;
+        private string m_ValidationToken;
 
         protected override bool ShouldCheckForSpawnedPlayers()
         {
@@ -56,8 +56,13 @@ protected override void OnServerAndClientsCreated()
             m_ClientDisconnectReasonValidated = false;
             m_BypassConnectionTimeout = m_PlayerCreation == PlayerCreation.FailValidation;
             m_Validated.Clear();
-            m_ValidationToken = Guid.NewGuid();
-            var validationToken = Encoding.UTF8.GetBytes(m_ValidationToken.ToString());
+            m_ValidationToken = string.Empty;
+            // Exceed the expected MTU size
+            while (m_ValidationToken.Length < 2000)
+            {
+                m_ValidationToken += Guid.NewGuid().ToString();
+            }
+            var validationToken = Encoding.UTF8.GetBytes(m_ValidationToken);
             m_ServerNetworkManager.ConnectionApprovalCallback = NetworkManagerObject_ConnectionApprovalCallback;
             m_ServerNetworkManager.NetworkConfig.PlayerPrefab = m_PlayerCreation == PlayerCreation.Prefab ? m_PlayerPrefab : null;
             if (m_PlayerCreation == PlayerCreation.PrefabHash)
@@ -66,7 +71,6 @@ protected override void OnServerAndClientsCreated()
             }
             m_ServerNetworkManager.NetworkConfig.ConnectionApproval = true;
             m_ServerNetworkManager.NetworkConfig.ConnectionData = validationToken;
-
             foreach (var client in m_ClientNetworkManagers)
             {
                 client.NetworkConfig.PlayerPrefab = m_PlayerCreation == PlayerCreation.Prefab ? m_PlayerPrefab : null;

com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTests.cs

@@ -51,6 +51,7 @@ public IEnumerator Cleanup()
 
                 // Need to destroy the GameObject (all assigned components will get destroyed too)
                 UnityEngine.Object.DestroyImmediate(m_Server.gameObject);
+                m_Server = null;
             }
 
             if (m_Client1)
@@ -59,6 +60,7 @@ public IEnumerator Cleanup()
 
                 // Need to destroy the GameObject (all assigned components will get destroyed too)
                 UnityEngine.Object.DestroyImmediate(m_Client1.gameObject);
+                m_Client1 = null;
             }
 
             if (m_Client2)
@@ -67,6 +69,7 @@ public IEnumerator Cleanup()
 
                 // Need to destroy the GameObject (all assigned components will get destroyed too)
                 UnityEngine.Object.DestroyImmediate(m_Client2.gameObject);
+                m_Client2 = null;
             }
             m_ServerEvents?.Clear();
             m_Client1Events?.Clear();
@@ -317,7 +320,7 @@ public IEnumerator DisconnectOnReliableSendQueueOverflow()
             m_Server.StartServer();
             m_Client1.StartClient();
 
-            yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events);
+            yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events, 5.0f);
 
             var serverClientId = m_Client1.ServerClientId;