fix

NGO v1.x compatibility for UTP v2.x

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs

@@ -1215,6 +1215,31 @@ public override ulong GetCurrentRtt(ulong clientId)
             return (ulong)ExtractRtt(ParseClientId(clientId));
         }
 
+#if UTP_TRANSPORT_2_0_ABOVE
+        /// <summary>
+        /// Provides the <see cref="NetworkEndpoint"/> for the NGO client identifier specified.
+        /// </summary>
+        /// <remarks>
+        /// - This is only really useful for direct connections.
+        /// - Relay connections and clients connected using a distributed authority network topology will not provide the client's actual endpoint information.
+        /// - For LAN topologies this should work as long as it is a direct connection and not a relay connection.
+        /// </remarks>
+        /// <param name="clientId">NGO client identifier to get endpoint information about.</param>
+        /// <returns><see cref="NetworkEndpoint"/></returns>
+        public NetworkEndpoint GetEndpoint(ulong clientId)
+        {
+            if (m_Driver.IsCreated && NetworkManager != null && NetworkManager.IsListening)
+            {
+                var transportId = NetworkManager.ConnectionManager.ClientIdToTransportId(clientId);
+                var networkConnection = ParseClientId(transportId);
+                if (m_Driver.GetConnectionState(networkConnection) == NetworkConnection.State.Connected)
+                {
+                    return m_Driver.GetRemoteEndpoint(networkConnection);
+                }
+            }
+            return new NetworkEndpoint();
+        }
+#else
         /// <summary>
         /// Provides the <see cref="NetworkEndpoint"/> for the NGO client identifier specified.
         /// </summary>
@@ -1238,6 +1263,8 @@ public NetworkEndpoint GetEndpoint(ulong clientId)
             }
             return new NetworkEndpoint();
         }
+#endif
+
 
         /// <summary>
         /// Initializes the transport

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

@@ -173,8 +173,14 @@ internal class TransportEndpointTests : NetcodeIntegrationTest
         public IEnumerator GetEndpointReportedCorrectly()
         {
             var serverUnityTransport = m_ServerNetworkManager.NetworkConfig.NetworkTransport as UnityTransport;
+
+#if UTP_TRANSPORT_2_0_ABOVE
+            var serverEndpoint = new NetworkEndpoint();
+            var clientEndpoint = new NetworkEndpoint();
+#else
             var serverEndpoint = new NetworkEndPoint();
             var clientEndpoint = new NetworkEndPoint();
+#endif
             foreach (var client in m_ClientNetworkManagers)
             {
                 var unityTransport = client.NetworkConfig.NetworkTransport as UnityTransport;