bump protocol version

jpillora · Dec 29, 2018 · 4a85f97 · 4a85f97
1 parent 389eab6
commit 4a85f97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/handler.go b/server/handler.go
@@ -24,7 +24,7 @@ func (s *Server) handleClientHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		//print into server logs and silently fall-through
-		s.Infof("ignored client connection using protocol version %s (expected %s)",
+		s.Infof("ignored client connection using protocol '%s', expected '%s'",
 			protocol, chshare.ProtocolVersion)
 	}
 	//proxy target was provided

diff --git a/share/proxy.go b/share/proxy.go
@@ -23,7 +23,7 @@ type TCPProxy struct {
 func NewTCPProxy(logger *Logger, ssh GetSSHConn, index int, remote *Remote) *TCPProxy {
 	id := index + 1
 	return &TCPProxy{
-		Logger: logger.Fork("proxy#%d<%s>", id, remote),
+		Logger: logger.Fork("proxy#%d:%s", id, remote),
 		ssh:    ssh,
 		id:     id,
 		remote: remote,
@@ -46,7 +46,7 @@ func (p *TCPProxy) listen(ctx context.Context, l net.Listener) {
 		select {
 		case <-ctx.Done():
 			l.Close()
-			p.Debugf("Closed")
+			p.Infof("Closed")
 		case <-done:
 		}
 	}()

diff --git a/share/version.go b/share/version.go
@@ -4,6 +4,6 @@ package chshare
 //incompatible changes are made, this will
 //be incremented to signify a protocol
 //mismatch.
-const ProtocolVersion = "chisel-v2"
+const ProtocolVersion = "chisel-v3"
 
 var BuildVersion = "0.0.0-src"