await all reads & writes before disposing the sockets

Author: zivillian

RfpProxy/TcpProxy.cs

@@ -95,17 +95,21 @@ private async Task HandleClientAsync(TcpClient client, CancellationToken cancell
                 {
                     await server.ConnectAsync(_server, _port, cts.Token).ConfigureAwait(false);
                     var clientData = OnClientConnected(client, server);
+                    var tasks = new List<Task>();
                     try
                     {
                         var clientPipe = new Pipe();
                         var fillClientPipe = PipeHelper.FillPipeAsync(client.Client, clientPipe.Writer, cts.Token);
+                        tasks.Add(fillClientPipe);
                         var readClientPipe = ReadFromClientAsync(clientData, clientPipe.Reader, cts.Token);
+                        tasks.Add(readClientPipe);
 
                         var serverPipe = new Pipe();
                         var fillServerPipe = PipeHelper.FillPipeAsync(server.Client, serverPipe.Writer, cts.Token);
+                        tasks.Add(fillServerPipe);
                         var readServerPipe = ReadFromServerAsync(clientData, serverPipe.Reader, cts.Token);
-
-                        var t = await Task.WhenAny(fillClientPipe, readClientPipe, fillServerPipe, readServerPipe).ConfigureAwait(false);
+                        tasks.Add(readServerPipe);
+                        var t = await Task.WhenAny(tasks).ConfigureAwait(false);
                         await t;
                     }
                     catch (Exception ex)
@@ -117,6 +121,7 @@ private async Task HandleClientAsync(TcpClient client, CancellationToken cancell
                     {
                         cts.Cancel();
                         OnClientDisconnected(clientData);
+                        await Task.WhenAll(tasks);
                     }
                 }
         }