optimized code in SocketConnector

kerryjiang · Feb 10, 2024 · 76ad533 · 76ad533
1 parent 27553dc
commit 76ad533
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/SuperSocket.Client/SocketConnector.cs b/src/SuperSocket.Client/SocketConnector.cs
@@ -51,10 +51,14 @@ protected override async ValueTask<ConnectState> ConnectAsync(EndPoint remoteEnd
 #if NET5_0_OR_GREATER
                 await socket.ConnectAsync(remoteEndPoint, cancellationToken);
 #else
-                Task result = socket.ConnectAsync(remoteEndPoint);               
-                int index = Task.WaitAny(new[] { result }, cancellationToken);
-                var connected = socket.Connected;
-                if (!connected)
+                Task connectTask = socket.ConnectAsync(remoteEndPoint);
+
+                var tcs = new TaskCompletionSource<bool>();
+                cancellationToken.Register(() => tcs.SetResult(false));
+
+                await Task.WhenAny(new[] { connectTask, tcs.Task });
+
+                if (!socket.Connected)
                 {
                     socket.Close();