handleTCPStream: relocate from server/ to share/

server/handleTCPStream() is sufficiently general to handle TCP stream
functionality for both the client and server. Therefore, move it to
share/ so it can be re-used by the client when chisel learns to
support reverse port forwarding, in which case TCP stream handling
will be done by the client rather than the server.

Author: sunshineco

server/handler.go

@@ -2,13 +2,11 @@ package chserver
 
 import (
 	"io"
-	"net"
 	"net/http"
 	"strings"
 	"sync/atomic"
 	"time"
 
-	"github.com/jpillora/sizestr"
 	"golang.org/x/crypto/ssh"
 
 	"github.com/jpillora/chisel/share"
@@ -150,7 +148,7 @@ func (s *Server) handleSSHChannels(clientLog *chshare.Logger, chans <-chan ssh.N
 		if socks {
 			go s.handleSocksStream(clientLog.Fork("socks#%05d", connID), stream)
 		} else {
-			go HandleTCPStream(clientLog.Fork(" tcp#%05d", connID), &s.connStats, stream, remote)
+			go chshare.HandleTCPStream(clientLog.Fork(" tcp#%05d", connID), &s.connStats, stream, remote)
 		}
 	}
 }
@@ -168,17 +166,3 @@ func (s *Server) handleSocksStream(l *chshare.Logger, src io.ReadWriteCloser) {
 		l.Debugf("%s Closed", s.connStats.Status())
 	}
 }
-
-func HandleTCPStream(l *chshare.Logger, connStats *shshare.ConnStats, src io.ReadWriteCloser, remote string) {
-	dst, err := net.Dial("tcp", remote)
-	if err != nil {
-		l.Debugf("Remote failed (%s)", err)
-		src.Close()
-		return
-	}
-	connStats.Open()
-	l.Debugf("%s Open", connStats.Status())
-	sent, received := chshare.Pipe(src, dst)
-	connStats.Close()
-	l.Debugf("%s Close (sent %s received %s)", connStats.Status(), sizestr.ToString(sent), sizestr.ToString(received))
-}

share/ssh.go

@@ -9,8 +9,10 @@ import (
 	"encoding/pem"
 	"fmt"
 	"io"
+	"net"
 	"strings"
 
+	"github.com/jpillora/sizestr"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -55,3 +57,17 @@ func RejectStreams(chans <-chan ssh.NewChannel) {
 		ch.Reject(ssh.Prohibited, "Tunnels disallowed")
 	}
 }
+
+func HandleTCPStream(l *Logger, connStats *ConnStats, src io.ReadWriteCloser, remote string) {
+	dst, err := net.Dial("tcp", remote)
+	if err != nil {
+		l.Debugf("Remote failed (%s)", err)
+		src.Close()
+		return
+	}
+	connStats.Open()
+	l.Debugf("%s Open", connStats.Status())
+	sent, received := Pipe(src, dst)
+	connStats.Close()
+	l.Debugf("%s Close (sent %s received %s)", connStats.Status(), sizestr.ToString(sent), sizestr.ToString(received))
+}