Get rid of unnecessary UTP_TRANSPORT_2_4_ABOVE define

simon-lemay-unity · simon-lemay-unity · commit 00684bea5d5e · 2025-08-05T17:03:26.000-04:00
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
@@ -7,7 +7,7 @@
 
 using System;
 using System.Collections.Generic;
-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE
+#if HOSTNAME_RESOLUTION_AVAILABLE
 using System.Text.RegularExpressions;
 #endif
 using Unity.Burst;
@@ -260,7 +260,7 @@ public NetworkEndpoint ServerEndPoint
                     var networkEndpoint = ParseNetworkEndpoint(Address, Port);
                     if (networkEndpoint == default)
                     {
-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE
+#if HOSTNAME_RESOLUTION_AVAILABLE
                         if (!IsValidFqdn(Address))
 #endif
                         {
@@ -667,7 +667,7 @@ private NetworkPipeline SelectSendPipeline(NetworkDelivery delivery)
             }
         }
 
-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE
+#if HOSTNAME_RESOLUTION_AVAILABLE
         private static bool IsValidFqdn(string fqdn)
         {
             // Regular expression to validate FQDN
@@ -693,7 +693,7 @@ private bool ClientBindAndConnect()
             // Verify the endpoint is valid before proceeding
             if (serverEndpoint.Family == NetworkFamily.Invalid)
             {
-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE
+#if HOSTNAME_RESOLUTION_AVAILABLE
 
                 // If it's not valid, assure it meets FQDN standards
                 if (IsValidFqdn(ConnectionData.Address))
@@ -745,7 +745,7 @@ private bool ServerBindAndListen(NetworkEndpoint endPoint)
             // Verify the endpoint is valid before proceeding
             if (endPoint.Family == NetworkFamily.Invalid)
             {
-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE
+#if HOSTNAME_RESOLUTION_AVAILABLE
                 // If it's not valid, assure it meets FQDN standards
                 if (!IsValidFqdn(ConnectionData.Address))
                 {
diff --git a/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef b/com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef
@@ -68,11 +68,6 @@
             "expression": "6000.0.11f1",
             "define": "COM_UNITY_MODULES_PHYSICS2D_LINEAR"
         },
-        {
-            "name": "com.unity.transport",
-            "expression": "2.4.0",
-            "define": "UTP_TRANSPORT_2_4_ABOVE"
-        },
         {
             "name": "Unity",
             "expression": "6000.1.0a1",
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs
@@ -132,7 +132,7 @@ public void UnityTransport_RestartSucceedsAfterFailure()
             Assert.False(transport.StartServer());
             LogAssert.Expect(LogType.Error, "Invalid network endpoint: 127.0.0.:4242.");
 
-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE
+#if HOSTNAME_RESOLUTION_AVAILABLE
             LogAssert.Expect(LogType.Error, "Listen network address (127.0.0.) is not a valid Ipv4 or Ipv6 address!");
 #else
             LogAssert.Expect(LogType.Error, "Network listen address (127.0.0.) is Invalid!");
@@ -166,7 +166,7 @@ public void UnityTransport_StartClientFailsWithBadAddress()
             transport.SetConnectionData("foobar", 4242);
             Assert.False(transport.StartClient());
             LogAssert.Expect(LogType.Error, "Invalid network endpoint: foobar:4242.");
-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE
+#if HOSTNAME_RESOLUTION_AVAILABLE
             LogAssert.Expect(LogType.Error, "Target server network address (foobar) is not a valid Fully Qualified Domain Name!");
 #else
             LogAssert.Expect(LogType.Error, "Target server network address (foobar) is Invalid!");
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef b/com.unity.netcode.gameobjects/Tests/Editor/Unity.Netcode.Editor.Tests.asmdef
@@ -38,11 +38,6 @@
             "expression": "(0,2022.2.0a5)",
             "define": "UNITY_UNET_PRESENT"
         },
-        {
-            "name": "com.unity.transport",
-            "expression": "2.4.0",
-            "define": "UTP_TRANSPORT_2_4_ABOVE"
-        },
         {
             "name": "Unity",
             "expression": "6000.1.0a1",
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportConnectionTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportConnectionTests.cs
@@ -67,7 +67,7 @@ public void DetectInvalidEndpoint()
             m_Clients[0].ConnectionData.Address = "MoreFubar";
             Assert.False(m_Server.StartServer(), "Server failed to detect invalid endpoint!");
             Assert.False(m_Clients[0].StartClient(), "Client failed to detect invalid endpoint!");
-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE
+#if HOSTNAME_RESOLUTION_AVAILABLE
             LogAssert.Expect(LogType.Error, $"Listen network address ({m_Server.ConnectionData.Address}) is not a valid {Networking.Transport.NetworkFamily.Ipv4} or {Networking.Transport.NetworkFamily.Ipv6} address!");
             LogAssert.Expect(LogType.Error, $"Target server network address ({m_Clients[0].ConnectionData.Address}) is not a valid Fully Qualified Domain Name!");
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef b/com.unity.netcode.gameobjects/Tests/Runtime/Unity.Netcode.Runtime.Tests.asmdef
@@ -48,11 +48,6 @@
             "expression": "",
             "define": "COM_UNITY_MODULES_PHYSICS"
         },
-        {
-            "name": "com.unity.transport",
-            "expression": "2.4.0",
-            "define": "UTP_TRANSPORT_2_4_ABOVE"
-        },
         {
             "name": "Unity",
             "expression": "6000.1.0a1",

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`using System;`
`9`	`9`	`using System.Collections.Generic;`
`10`		`-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE`
	`10`	`+#if HOSTNAME_RESOLUTION_AVAILABLE`
`11`	`11`	`using System.Text.RegularExpressions;`
`12`	`12`	`#endif`
`13`	`13`	`using Unity.Burst;`
`@@ -260,7 +260,7 @@ public NetworkEndpoint ServerEndPoint`
`260`	`260`	`var networkEndpoint = ParseNetworkEndpoint(Address, Port);`
`261`	`261`	`if (networkEndpoint == default)`
`262`	`262`	`{`
`263`		`-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE`
	`263`	`+#if HOSTNAME_RESOLUTION_AVAILABLE`
`264`	`264`	`if (!IsValidFqdn(Address))`
`265`	`265`	`#endif`
`266`	`266`	`{`
`@@ -667,7 +667,7 @@ private NetworkPipeline SelectSendPipeline(NetworkDelivery delivery)`
`667`	`667`	`}`
`668`	`668`	`}`
`669`	`669`
`670`		`-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE`
	`670`	`+#if HOSTNAME_RESOLUTION_AVAILABLE`
`671`	`671`	`private static bool IsValidFqdn(string fqdn)`
`672`	`672`	`{`
`673`	`673`	`// Regular expression to validate FQDN`
`@@ -693,7 +693,7 @@ private bool ClientBindAndConnect()`
`693`	`693`	`// Verify the endpoint is valid before proceeding`
`694`	`694`	`if (serverEndpoint.Family == NetworkFamily.Invalid)`
`695`	`695`	`{`
`696`		`-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE`
	`696`	`+#if HOSTNAME_RESOLUTION_AVAILABLE`
`697`	`697`
`698`	`698`	`// If it's not valid, assure it meets FQDN standards`
`699`	`699`	`if (IsValidFqdn(ConnectionData.Address))`
`@@ -745,7 +745,7 @@ private bool ServerBindAndListen(NetworkEndpoint endPoint)`
`745`	`745`	`// Verify the endpoint is valid before proceeding`
`746`	`746`	`if (endPoint.Family == NetworkFamily.Invalid)`
`747`	`747`	`{`
`748`		`-#if HOSTNAME_RESOLUTION_AVAILABLE && UTP_TRANSPORT_2_4_ABOVE`
	`748`	`+#if HOSTNAME_RESOLUTION_AVAILABLE`
`749`	`749`	`// If it's not valid, assure it meets FQDN standards`
`750`	`750`	`if (!IsValidFqdn(ConnectionData.Address))`
`751`	`751`	`{`