do not use 1.1.1.1 and similar

antonfirsov · Oct 12, 2020 · 80501f9 · 80501f9
1 parent 512edf5
commit 80501f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/libraries/Common/tests/System/Net/Sockets/SocketTestExtensions.cs b/src/libraries/Common/tests/System/Net/Sockets/SocketTestExtensions.cs
@@ -58,6 +58,13 @@ public static (Socket, Socket) CreateConnectedSocketPair(IPAddress serverAddress
             return (client, server);
         }
 
+        public static int GetUnusedPort(AddressFamily addressFamily, ProtocolType protocolType)
+        {
+            using Socket temp = new Socket(addressFamily, protocolType == ProtocolType.Tcp ? SocketType.Stream : SocketType.Dgram, protocolType);
+            IPAddress address = addressFamily == AddressFamily.InterNetwork ? IPAddress.Loopback : IPAddress.IPv6Loopback;
+            return temp.BindToAnonymousPort(address);
+        }
+
         // Tries to connect within the provided timeout interval
         // Useful to speed up "can not connect" assertions on Windows
         public static bool TryConnect(this Socket socket, EndPoint remoteEndpoint, int millisecondsTimeout)

diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.cs
@@ -122,12 +122,12 @@ public async Task Connect_AfterDisconnect_Fails()
 
         public static readonly TheoryData<IPAddress> ConnectGetsCanceledByDispose_Data = new TheoryData<IPAddress>
         {
-            { IPAddress.Parse("1.1.1.1") },
-            { IPAddress.Parse("fd11:1:1:1:1:1:1:1") },
-            { IPAddress.Parse("1.1.1.1").MapToIPv6() },
+            { IPAddress.Loopback },
+            { IPAddress.IPv6Loopback },
+            { IPAddress.Loopback.MapToIPv6() },
         };
 
-        [Theory]
+        [Theory(Timeout = 30000)]
         [MemberData(nameof(ConnectGetsCanceledByDispose_Data))]
         [PlatformSpecific(~(TestPlatforms.OSX | TestPlatforms.FreeBSD))] // Not supported on BSD like OSes.
         public async Task ConnectGetsCanceledByDispose(IPAddress address)
@@ -140,8 +140,8 @@ public async Task ConnectGetsCanceledByDispose(IPAddress address)
             {
                 var client = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
                 if (address.IsIPv4MappedToIPv6) client.DualMode = true;
-
-                Task connectTask = ConnectAsync(client, new IPEndPoint(address, 23));
+                int port = SocketTestExtensions.GetUnusedPort(address.AddressFamily, ProtocolType.Tcp);
+                Task connectTask = ConnectAsync(client, new IPEndPoint(address, port));
 
                 // Wait a little so the operation is started.
                 await Task.Delay(msDelay);