Fix Windows ConnectAsync(saea) for non-stream protocols

dotnet · Mar 2, 2020 · be45f45 · be45f45
1 parent d0cdc06
commit be45f45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs
@@ -3752,6 +3752,7 @@ private bool ConnectAsync(SocketAsyncEventArgs e, bool userSocket)
 
                 WildcardBindForConnectIfNecessary(endPointSnapshot.AddressFamily);
 
+                bool canUseConnectEx = CanUseConnectEx(endPointSnapshot);
                 // Save the old RightEndPoint and prep new RightEndPoint.
                 EndPoint? oldEndPoint = _rightEndPoint;
                 if (_rightEndPoint == null)
@@ -3767,7 +3768,7 @@ private bool ConnectAsync(SocketAsyncEventArgs e, bool userSocket)
                 SocketError socketError = SocketError.Success;
                 try
                 {
-                    if (CanUseConnectEx(endPointSnapshot))
+                    if (canUseConnectEx)
                     {
                         socketError = e.DoOperationConnectEx(this, _handle);
                     }

diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/UnixDomainSocketTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/UnixDomainSocketTest.cs
@@ -100,7 +100,7 @@ public async Task Socket_ConnectAsyncUnixDomainSocketEndPoint_NotServer()
                     }
 
                     Assert.Equal(
-                        RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? SocketError.InvalidArgument : SocketError.AddressNotAvailable,
+                        RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? SocketError.ConnectionRefused : SocketError.AddressNotAvailable,
                         args.SocketError);
                 }
             }