Dispose non-reconnectable streams

microsoft · Aug 3, 2023 · 4ecfc51 · 4ecfc51
1 parent e69e8b0
commit 4ecfc51
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/cs/src/Connections/TunnelClient.cs b/cs/src/Connections/TunnelClient.cs
@@ -302,9 +302,13 @@ private void OnForwardedPortAdded(PortForwardingService pfs, ForwardedPortEventA
                         lock (this.disconnectedStreams)
                         {
                             // The host is no longer accepting connections on the forwarded port?
-                            // Clear the list of disconnected streams for the port, because
-                            // it seems it is no longer possible to reconnect them.
-                            streams.Clear();
+                            // Dispose and clear the list of disconnected streams for the port,
+                            // because it seems it is no longer possible to reconnect them.
+                            while (streams.Count > 0)
+                            {
+                                streams[0].Dispose();
+                                streams.RemoveAt(0);
+                            }
                         }
                     }
                 });

diff --git a/ts/src/connections/tunnelClientBase.ts b/ts/src/connections/tunnelClientBase.ts
@@ -275,7 +275,9 @@ export class TunnelClientBase
                 // it seems it is no longer possible to reconnect them.
                 const streams = this.disconnectedStreams.get(port);
                 if (streams) {
-                    streams.splice(0, streams.length);
+                    while (streams.length > 0) {
+                        streams.pop()!.dispose();
+                    }
                 }
             });
         }