fix Connect(SAEA) for connectionless sockets

antonfirsov · antonfirsov · commit cf66af6b36aa · 2020-03-11T02:13:15.000+01:00
SO_UPDATE_CONNECT_CONTEXT should not be set,
since regular Connect has been called instead of ConnectEx
diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncEventArgs.Windows.cs
@@ -1168,6 +1168,13 @@ private unsafe SocketError FinishOperationConnect()
         {
             try
             {
+                if (_currentSocket!.SocketType != SocketType.Stream)
+                {
+                    // With connectionless sockets, regular connect is used instead of ConnectEx,
+                    // attempting to set SO_UPDATE_CONNECT_CONTEXT will result in an error.
+                    return SocketError.Success;
+                }
+
                 // Update the socket context.
                 SocketError socketError = Interop.Winsock.setsockopt(
                     _currentSocket!.SafeHandle,
diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
@@ -30,6 +31,18 @@ public async Task Connect_Success(IPAddress listenAt)
             }
         }
 
+        [Theory]
+        [MemberData(nameof(Loopbacks))]
+        public async Task Connect_Udp_Success(IPAddress listenAt)
+        {
+            using Socket listener = new Socket(listenAt.AddressFamily, SocketType.Dgram, ProtocolType.Udp);
+            using Socket client = new Socket(listenAt.AddressFamily, SocketType.Dgram, ProtocolType.Udp);
+            listener.Bind(new IPEndPoint(listenAt, 0));
+
+            await ConnectAsync(client, new IPEndPoint(listenAt, ((IPEndPoint)listener.LocalEndPoint).Port));
+            Assert.True(client.Connected);
+        }
+
         [OuterLoop]
         [Theory]
         [MemberData(nameof(Loopbacks))]

Original file line number	Diff line number	Diff line change
`@@ -1168,6 +1168,13 @@ private unsafe SocketError FinishOperationConnect()`
`1168`	`1168`	`{`
`1169`	`1169`	`try`
`1170`	`1170`	`{`
	`1171`	`+ if (_currentSocket!.SocketType != SocketType.Stream)`
	`1172`	`+ {`
	`1173`	`+ // With connectionless sockets, regular connect is used instead of ConnectEx,`
	`1174`	`+ // attempting to set SO_UPDATE_CONNECT_CONTEXT will result in an error.`
	`1175`	`+ return SocketError.Success;`
	`1176`	`+ }`
	`1177`	`+`
`1171`	`1178`	`// Update the socket context.`
`1172`	`1179`	`SocketError socketError = Interop.Winsock.setsockopt(`
`1173`	`1180`	`_currentSocket!.SafeHandle,`