Close ssh tunnel when either end closes the connection

google · Sep 7, 2018 · dab8fc1 · dab8fc1
1 parent 73abbe5
commit dab8fc1
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/core/os/device/remotessh/commands.go b/core/os/device/remotessh/commands.go
@@ -208,10 +208,17 @@ func (b binding) doTunnel(ctx context.Context, local net.Conn, remotePort int) e
 
 	wg := sync.WaitGroup{}
 
-	copy := func(writer io.Writer, reader io.Reader) {
+	copy := func(writer net.Conn, reader net.Conn) {
 		_, err := io.Copy(writer, reader)
+		writer.Close()
+		// Ignore the 'use of closed network connection' error for 'read' operation
+		if e, ok := err.(*net.OpError); ok {
+			if (e.Op == "read") && (e.Err.Error() == "use of closed network connection") {
+				err = nil
+			}
+		}
 		if err != nil {
-			log.E(ctx, "Copy Error %s", err)
+			log.E(ctx, "Copy Error, error type: %T, error msg: %s", err, err)
 		}
 		wg.Done()
 	}