fix

Fixing a missed namespace, formatting, and some minor style related issues with newly added private statics.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Transports/Unified/UnifiedNetcodeTransport.cs

@@ -4,6 +4,7 @@
 using Unity.Burst;
 using Unity.Burst.Intrinsics;
 using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
 using Unity.Entities;
 using Unity.NetCode;
 using Unity.Netcode.Transports.UTP;
@@ -42,12 +43,12 @@ public static NativeArray<byte> ToNativeArray(in FixedBytes1280 data)
         }
     }
 
-    [BurstCompile]    
+    [BurstCompile]
     internal struct TransportRpc : IOutOfBandRpcCommand, IRpcCommandSerializer<TransportRpc>
     {
         public FixedBytes1280 Buffer;
         public ulong Order;
-        
+
         public unsafe void Serialize(ref DataStreamWriter writer, in RpcSerializerState state, in TransportRpc data)
         {
             writer.WriteULong(data.Order);
@@ -64,7 +65,7 @@ public unsafe void Deserialize(ref DataStreamReader reader, in RpcDeserializerSt
             {
                 Length = length
             };
-    
+
             var span = new Span<byte>(FixedBytes1280.GetUnsafePtr(data.Buffer), length);
             reader.ReadBytes(span);
         }
@@ -74,7 +75,7 @@ private static void InvokeExecute(ref RpcExecutor.Parameters parameters)
         {
             RpcExecutor.ExecuteCreateRequestComponent<TransportRpc, TransportRpc>(ref parameters);
         }
-        
+
         private static readonly PortableFunctionPointer<RpcExecutor.ExecuteDelegate> k_InvokeExecuteFunctionPointer = new PortableFunctionPointer<RpcExecutor.ExecuteDelegate>(InvokeExecute);
 
         public PortableFunctionPointer<RpcExecutor.ExecuteDelegate> CompileExecute()
@@ -113,13 +114,13 @@ public void OnUpdate(ref SystemState state)
             state.Dependency = sendJob.Schedule(m_Request.Query, state.Dependency);
         }
     }
-    
+
     internal partial class UnifiedNetcodeUpdateSystem : SystemBase
     {
         public UnifiedNetcodeTransport Transport;
 
         public List<Connection> DisconnectQueue = new List<Connection>();
-        
+
         public void Disconnect(Connection connection)
         {
             DisconnectQueue.Add(connection);
@@ -128,7 +129,7 @@ public void Disconnect(Connection connection)
         protected override void OnUpdate()
         {
             using var commandBuffer = new EntityCommandBuffer(Allocator.Temp);
-            foreach(var (request, rpc, entity) in SystemAPI.Query<RefRO<ReceiveRpcCommandRequest>, RefRO<TransportRpc>>().WithEntityAccess())
+            foreach (var (request, rpc, entity) in SystemAPI.Query<RefRO<ReceiveRpcCommandRequest>, RefRO<TransportRpc>>().WithEntityAccess())
             {
                 var connectionId = SystemAPI.GetComponent<NetworkId>(request.ValueRO.SourceConnection).Value;
 
@@ -150,7 +151,7 @@ protected override void OnUpdate()
             DisconnectQueue.Clear();
 
             commandBuffer.Playback(EntityManager);
-                
+
         }
     }
 
@@ -162,7 +163,7 @@ internal class UnifiedNetcodeTransport : NetworkTransport
         public override ulong ServerClientId => (ulong)m_ServerClientId;
 
         private NetworkManager m_NetworkManager;
-        
+
         private IRealTimeProvider m_RealTimeProvider;
 
         private class ConnectionInfo
@@ -174,9 +175,9 @@ private class ConnectionInfo
             public ulong LastReceived;
             public Dictionary<ulong, FixedBytes1280> DeferredMessages;
         }
- 
+
         private Dictionary<int, ConnectionInfo> m_Connections;
-        
+
         internal void DispatchMessage(int connectionId, in FixedBytes1280 buffer, ulong order)
         {
             var connectionInfo = m_Connections[connectionId];
@@ -197,7 +198,7 @@ internal void DispatchMessage(int connectionId, in FixedBytes1280 buffer, ulong
                 connectionInfo.DeferredMessages[order] = buffer;
                 return;
             }
-            
+
             using var arr = FixedBytes1280.ToNativeArray(buffer);
             var reader = new DataStreamReader(arr);
             if (connectionInfo.ReceiveQueue == null)
@@ -246,15 +247,15 @@ public override unsafe void Send(ulong clientId, ArraySegment<byte> payload, Net
                 {
                     Buffer = new FixedBytes1280(),
                 };
-                
+
                 var writer = new DataStreamWriter(FixedBytes1280.GetUnsafePtr(rpc.Buffer), k_MaxPacketSize);
 
                 var amount = connectionInfo.SendQueue.FillWriterWithBytes(ref writer, k_MaxPacketSize);
                 rpc.Buffer.Length = amount;
                 rpc.Order = ++connectionInfo.LastSent;
 
                 connectionInfo.Connection.SendOutOfBandMessage(rpc);
-                
+
                 connectionInfo.SendQueue.Consume(amount);
             }
         }
@@ -266,7 +267,7 @@ public override NetworkEvent PollEvent(out ulong clientId, out ArraySegment<byte
             receiveTime = 0;
             return NetworkEvent.Nothing;
         }
-        
+
         private void OnClientConnectedToServer(Connection connection, NetCodeConnectionEvent connectionEvent)
         {
             m_Connections[connection.NetworkId.Value] = new ConnectionInfo
@@ -276,62 +277,62 @@ private void OnClientConnectedToServer(Connection connection, NetCodeConnectionE
                 Connection = connection
             };
             m_ServerClientId = connection.NetworkId.Value;
-            InvokeOnTransportEvent(NetworkEvent.Connect, (ulong)connection.NetworkId.Value, default,  m_RealTimeProvider.RealTimeSinceStartup);
+            InvokeOnTransportEvent(NetworkEvent.Connect, (ulong)connection.NetworkId.Value, default, m_RealTimeProvider.RealTimeSinceStartup);
         }
-        
+
         private void OnServerNewClientConnection(Connection connection, NetCodeConnectionEvent connectionEvent)
         {
             m_Connections[connection.NetworkId.Value] = new ConnectionInfo
             {
                 ReceiveQueue = null,
                 SendQueue = new BatchedSendQueue(BatchedSendQueue.MaximumMaximumCapacity),
                 Connection = connection
-            };;
-            InvokeOnTransportEvent(NetworkEvent.Connect, (ulong)connection.NetworkId.Value, default,  m_RealTimeProvider.RealTimeSinceStartup);
+            }; ;
+            InvokeOnTransportEvent(NetworkEvent.Connect, (ulong)connection.NetworkId.Value, default, m_RealTimeProvider.RealTimeSinceStartup);
         }
 
-        private const string InvalidRpcMessage = "An invalid RPC was received";
-        private const string HandshakeTimeoutMessage = "The connection was closed because the handshake timed out.";
-        private const string ApprovalFailureMessage = "The connection was closed because the connection was not approved by the server.";
-        private const string ApprovalTimeoutMessage = "The connection was closed because the connection approval process timed out.";
-        
+        private const string k_InvalidRpcMessage = "An invalid RPC was received";
+        private const string k_HandshakeTimeoutMessage = "The connection was closed because the handshake timed out.";
+        private const string k_ApprovalFailureMessage = "The connection was closed because the connection was not approved by the server.";
+        private const string k_ApprovalTimeoutMessage = "The connection was closed because the connection approval process timed out.";
+
         private string GetDisconnectMessageFromNetworkStreamDisconnectReason(NetworkStreamDisconnectReason reason)
         {
             switch (reason)
             {
                 case NetworkStreamDisconnectReason.ConnectionClose:
                     return UnityTransportNotificationHandler.DisconnectedMessage;
-                case NetworkStreamDisconnectReason.Timeout: 
+                case NetworkStreamDisconnectReason.Timeout:
                     return UnityTransportNotificationHandler.TimeoutMessage;
-                case NetworkStreamDisconnectReason.MaxConnectionAttempts: 
+                case NetworkStreamDisconnectReason.MaxConnectionAttempts:
                     return UnityTransportNotificationHandler.MaxConnectionAttemptsMessage;
-                case NetworkStreamDisconnectReason.ClosedByRemote: 
-                    return  UnityTransportNotificationHandler.ClosedRemoteConnectionMessage;
+                case NetworkStreamDisconnectReason.ClosedByRemote:
+                    return UnityTransportNotificationHandler.ClosedRemoteConnectionMessage;
                 case NetworkStreamDisconnectReason.BadProtocolVersion:
-                    return  UnityTransportNotificationHandler.ProtocolErrorMessage;
+                    return UnityTransportNotificationHandler.ProtocolErrorMessage;
                 case NetworkStreamDisconnectReason.InvalidRpc:
-                    return InvalidRpcMessage;
+                    return k_InvalidRpcMessage;
                 case NetworkStreamDisconnectReason.AuthenticationFailure:
                     return UnityTransportNotificationHandler.AuthenticationFailureMessage;
                 case NetworkStreamDisconnectReason.ProtocolError:
-                    return  UnityTransportNotificationHandler.ProtocolErrorMessage;
+                    return UnityTransportNotificationHandler.ProtocolErrorMessage;
                 case NetworkStreamDisconnectReason.HandshakeTimeout:
-                    return HandshakeTimeoutMessage;
+                    return k_HandshakeTimeoutMessage;
                 case NetworkStreamDisconnectReason.ApprovalFailure:
-                    return ApprovalFailureMessage;
+                    return k_ApprovalFailureMessage;
                 case NetworkStreamDisconnectReason.ApprovalTimeout:
-                    return ApprovalTimeoutMessage;
+                    return k_ApprovalTimeoutMessage;
             }
             return "Unknown reason";
         }
-        
+
         private DisconnectEvents GetDisconnectEventFromNetworkStreamDisconnectReason(NetworkStreamDisconnectReason reason)
         {
             switch (reason)
             {
                 case NetworkStreamDisconnectReason.ConnectionClose:
                     return DisconnectEvents.Disconnected;
-                case NetworkStreamDisconnectReason.Timeout: 
+                case NetworkStreamDisconnectReason.Timeout:
                     return DisconnectEvents.ProtocolTimeout;
                 case NetworkStreamDisconnectReason.MaxConnectionAttempts:
                     return DisconnectEvents.MaxConnectionAttempts;
@@ -361,12 +362,12 @@ private void OnClientDisconnectFromServer(Connection connection, NetCodeConnecti
                 GetDisconnectEventFromNetworkStreamDisconnectReason(connectionEvent.DisconnectReason),
                 GetDisconnectMessageFromNetworkStreamDisconnectReason(connectionEvent.DisconnectReason)
             );
-            InvokeOnTransportEvent(NetworkEvent.Disconnect, (ulong)connection.NetworkId.Value, default,  m_RealTimeProvider.RealTimeSinceStartup);
+            InvokeOnTransportEvent(NetworkEvent.Disconnect, (ulong)connection.NetworkId.Value, default, m_RealTimeProvider.RealTimeSinceStartup);
         }
 
         private void OnServerClientDisconnected(Connection connection, NetCodeConnectionEvent connectionEvent)
         {
-            InvokeOnTransportEvent(NetworkEvent.Disconnect, (ulong)connection.NetworkId.Value, default,  m_RealTimeProvider.RealTimeSinceStartup);
+            InvokeOnTransportEvent(NetworkEvent.Disconnect, (ulong)connection.NetworkId.Value, default, m_RealTimeProvider.RealTimeSinceStartup);
         }
 
         public override bool StartClient()