update deps to kcp-go to v5.5.5

commit 58d2c9d3468aa1c04f8cb60f0680186b6330804c
Author: xtaci <daniel820313@gmail.com>
Date:   Thu Dec 26 17:40:36 2019 +0800

    combine smux v1 & v2

README.md

@@ -1,20 +1,18 @@
 # <img src="logo.png" alt="kcptun" height="54px" /> 
 
-[![Release][13]][14] [![Powered][17]][18] [![MIT licensed][11]][12] [![Build Status][3]][4] [![Go Report Card][5]][6] [![Downloads][15]][16] [![Docker][1]][2]
+[![Release][13]][14] [![Powered][17]][18] [![MIT licensed][11]][12] [![Build Status][3]][4] [![Go Report Card][5]][6] [![Downloads][15]][16] [![Docker][1]][2] 
 
-[1]: https://images.microbadger.com/badges/image/xtaci/kcptun.svg
-[2]: https://microbadger.com/images/xtaci/kcptun
+[1]: https://img.shields.io/docker/pulls/xtaci/kcptun
+[2]: https://hub.docker.com/r/xtaci/kcptun
 [3]: https://travis-ci.org/xtaci/kcptun.svg?branch=master
 [4]: https://travis-ci.org/xtaci/kcptun
 [5]: https://goreportcard.com/badge/github.com/xtaci/kcptun
 [6]: https://goreportcard.com/report/github.com/xtaci/kcptun
-[7]: https://img.shields.io/badge/license-MIT-blue.svg
-[8]: https://raw.githubusercontent.com/xtaci/kcptun/master/LICENSE.md
-[11]: https://img.shields.io/badge/license-MIT-blue.svg
+[11]: https://img.shields.io/github/license/xtaci/kcptun
 [12]: LICENSE.md
-[13]: https://img.shields.io/github/release/xtaci/kcptun.svg
+[13]: https://img.shields.io/github/v/release/xtaci/kcptun?color=orange
 [14]: https://github.com/xtaci/kcptun/releases/latest
-[15]: https://img.shields.io/github/downloads/xtaci/kcptun/total.svg?maxAge=1800
+[15]: https://img.shields.io/github/downloads/xtaci/kcptun/total.svg?maxAge=1800&color=orange
 [16]: https://github.com/xtaci/kcptun/releases
 [17]: https://img.shields.io/badge/KCP-Powered-blue.svg
 [18]: https://github.com/skywind3000/kcp
@@ -68,11 +66,13 @@ which tunnels the original connection:
 
 > Application -> Target Server(8388/tcp) 
 
-### Install from source
+### Build from source
 
 ```
-$ export GO111MODULE=on
-$ go get -u github.com/xtaci/kcptun/...
+$ git clone https://github.com/xtaci/kcptun.git
+$ cd kcptun
+$ ./build-release.sh
+$ cd build
 ```
 
 All precompiled releases are genereated from `build-release.sh` script.

client/dial.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/pkg/errors"
-	kcp "github.com/xtaci/kcp-go"
+	kcp "github.com/xtaci/kcp-go/v5"
 	"github.com/xtaci/tcpraw"
 )
 

client/main.go

@@ -14,10 +14,9 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	kcp "github.com/xtaci/kcp-go"
+	kcp "github.com/xtaci/kcp-go/v5"
 	"github.com/xtaci/kcptun/generic"
 	"github.com/xtaci/smux"
-	smuxv2 "github.com/xtaci/smux/v2"
 )
 
 const (
@@ -33,14 +32,14 @@ const (
 var VERSION = "SELFBUILD"
 
 // handleClient aggregates connection p1 on mux with 'writeLock'
-func handleClient(mux generic.Mux, p1 net.Conn, ctrl *generic.CopyControl, quiet bool) {
+func handleClient(session *smux.Session, p1 net.Conn, quiet bool) {
 	logln := func(v ...interface{}) {
 		if !quiet {
 			log.Println(v...)
 		}
 	}
 	defer p1.Close()
-	p2, err := mux.Open()
+	p2, err := session.OpenStream()
 	if err != nil {
 		logln(err)
 		return
@@ -48,27 +47,15 @@ func handleClient(mux generic.Mux, p1 net.Conn, ctrl *generic.CopyControl, quiet
 
 	defer p2.Close()
 
-	if s2, ok := p2.(generic.Stream); ok {
-		logln("stream opened", "in:", p1.RemoteAddr(), "out:", fmt.Sprint(s2.RemoteAddr(), "(", s2.ID(), ")"))
-		defer logln("stream closed", "in:", p1.RemoteAddr(), "out:", fmt.Sprint(s2.RemoteAddr(), "(", s2.ID(), ")"))
-	}
+	logln("stream opened", "in:", p1.RemoteAddr(), "out:", fmt.Sprint(p2.RemoteAddr(), "(", p2.ID(), ")"))
+	defer logln("stream closed", "in:", p1.RemoteAddr(), "out:", fmt.Sprint(p2.RemoteAddr(), "(", p2.ID(), ")"))
 
 	// start tunnel & wait for tunnel termination
 	streamCopy := func(dst io.Writer, src io.ReadCloser) {
-		if _, err := generic.Copy(dst, src, ctrl); err != nil {
-			if s2, ok := p2.(generic.Stream); ok {
-				// verbose error handling
-				cause := err
-				if e, ok := err.(interface{ Cause() error }); ok {
-					cause = e.Cause()
-				}
-
-				switch cause {
-				case smux.ErrInvalidProtocol:
-					log.Println("smux version:1", err, "in:", p1.RemoteAddr(), "out:", fmt.Sprint(s2.RemoteAddr(), "(", s2.ID(), ")"))
-				case smuxv2.ErrInvalidProtocol:
-					log.Println("smux version:2", err, "in:", p1.RemoteAddr(), "out:", fmt.Sprint(s2.RemoteAddr(), "(", s2.ID(), ")"))
-				}
+		if _, err := generic.Copy(dst, src); err != nil {
+			// report protocol error
+			if err == smux.ErrInvalidProtocol {
+				log.Println("smux", err, "in:", p1.RemoteAddr(), "out:", fmt.Sprint(p2.RemoteAddr(), "(", p2.ID(), ")"))
 			}
 		}
 		p1.Close()
@@ -377,7 +364,7 @@ func main() {
 			block, _ = kcp.NewAESBlockCrypt(pass)
 		}
 
-		createConn := func() (generic.Mux, error) {
+		createConn := func() (*smux.Session, error) {
 			kcpconn, err := dial(&config, block)
 			if err != nil {
 				return nil, errors.Wrap(err, "dial()")
@@ -399,47 +386,31 @@ func main() {
 				log.Println("SetWriteBuffer:", err)
 			}
 			log.Println("smux version:", config.SmuxVer, "on connection:", kcpconn.LocalAddr(), "->", kcpconn.RemoteAddr())
-			switch config.SmuxVer {
-			case 1:
-				smuxConfig := smux.DefaultConfig()
-				smuxConfig.MaxReceiveBuffer = config.SmuxBuf
-				smuxConfig.KeepAliveInterval = time.Duration(config.KeepAlive) * time.Second
+			smuxConfig := smux.DefaultConfig()
+			smuxConfig.Version = config.SmuxVer
+			smuxConfig.MaxReceiveBuffer = config.SmuxBuf
+			smuxConfig.MaxStreamBuffer = config.StreamBuf
+			smuxConfig.KeepAliveInterval = time.Duration(config.KeepAlive) * time.Second
 
-				// stream multiplex
-				var session *smux.Session
-				if config.NoComp {
-					session, err = smux.Client(kcpconn, smuxConfig)
-				} else {
-					session, err = smux.Client(generic.NewCompStream(kcpconn), smuxConfig)
-				}
-				if err != nil {
-					return nil, errors.Wrap(err, "createConn()")
-				}
-				return session, nil
-			case 2:
-				smuxConfig := smuxv2.DefaultConfig()
-				smuxConfig.MaxReceiveBuffer = config.SmuxBuf
-				smuxConfig.MaxStreamBuffer = config.StreamBuf
-				smuxConfig.KeepAliveInterval = time.Duration(config.KeepAlive) * time.Second
-
-				// stream multiplex
-				var session *smuxv2.Session
-				if config.NoComp {
-					session, err = smuxv2.Client(kcpconn, smuxConfig)
-				} else {
-					session, err = smuxv2.Client(generic.NewCompStream(kcpconn), smuxConfig)
-				}
-				if err != nil {
-					return nil, errors.Wrap(err, "createConn()")
-				}
-				return session, nil
-			default:
-				panic("incorrect smux version")
+			if err := smux.VerifyConfig(smuxConfig); err != nil {
+				log.Fatalf("%+v", err)
 			}
+
+			// stream multiplex
+			var session *smux.Session
+			if config.NoComp {
+				session, err = smux.Client(kcpconn, smuxConfig)
+			} else {
+				session, err = smux.Client(generic.NewCompStream(kcpconn), smuxConfig)
+			}
+			if err != nil {
+				return nil, errors.Wrap(err, "createConn()")
+			}
+			return session, nil
 		}
 
 		// wait until a connection is ready
-		waitConn := func() generic.Mux {
+		waitConn := func() *smux.Session {
 			for {
 				if session, err := createConn(); err == nil {
 					return session
@@ -452,18 +423,16 @@ func main() {
 
 		numconn := uint16(config.Conn)
 		muxes := make([]struct {
-			session generic.Mux
+			session *smux.Session
 			ttl     time.Time
-			ctrl    *generic.CopyControl // for control of memory in copying
 		}, numconn)
 
 		for k := range muxes {
 			muxes[k].session = waitConn()
 			muxes[k].ttl = time.Now().Add(time.Duration(config.AutoExpire) * time.Second)
-			muxes[k].ctrl = &generic.CopyControl{Buffer: make([]byte, bufSize)}
 		}
 
-		chScavenger := make(chan generic.Mux, 128)
+		chScavenger := make(chan *smux.Session, 128)
 		go scavenger(chScavenger, config.ScavengeTTL)
 		go generic.SnmpLogger(config.SnmpLog, config.SnmpPeriod)
 		rr := uint16(0)
@@ -479,10 +448,9 @@ func main() {
 				chScavenger <- muxes[idx].session
 				muxes[idx].session = waitConn()
 				muxes[idx].ttl = time.Now().Add(time.Duration(config.AutoExpire) * time.Second)
-				muxes[idx].ctrl = &generic.CopyControl{Buffer: make([]byte, bufSize)}
 			}
 
-			go handleClient(muxes[idx].session, p1, muxes[idx].ctrl, config.Quiet)
+			go handleClient(muxes[idx].session, p1, config.Quiet)
 			rr++
 		}
 	}
@@ -490,11 +458,11 @@ func main() {
 }
 
 type scavengeSession struct {
-	session generic.Mux
+	session *smux.Session
 	ts      time.Time
 }
 
-func scavenger(ch chan generic.Mux, ttl int) {
+func scavenger(ch chan *smux.Session, ttl int) {
 	ticker := time.NewTicker(time.Second)
 	defer ticker.Stop()
 	var sessionList []scavengeSession

client/signal.go

@@ -8,7 +8,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	kcp "github.com/xtaci/kcp-go"
+	kcp "github.com/xtaci/kcp-go/v5"
 )
 
 func init() {

examples/kcptun.service

@@ -0,0 +1,16 @@
+Description=kcptun
+
+Wants=network.target
+After=syslog.target network-online.target
+
+[Service]
+Type=simple
+Environment=GOGC=20
+ExecStart=/home/user/client_linux_amd64 -c /home/user/local.json
+Restart=on-failure
+RestartSec=10
+KillMode=process
+LimitNOFILE=65536
+
+[Install]
+WantedBy=multi-user.target

generic/copy.go

@@ -2,19 +2,12 @@ package generic
 
 import (
 	"io"
-	"net"
-	"sync"
 )
 
 const bufSize = 4096
 
-type CopyControl struct {
-	Buffer []byte // shared buffer for copying controlled by mutex
-	sync.Mutex
-}
-
 // Memory optimized io.Copy function specified for this library
-func Copy(dst io.Writer, src io.Reader, ctrl *CopyControl) (written int64, err error) {
+func Copy(dst io.Writer, src io.Reader) (written int64, err error) {
 	// If the reader has a WriteTo method, use it to do the copy.
 	// Avoids an allocation and a copy.
 	if wt, ok := src.(io.WriterTo); ok {
@@ -25,15 +18,6 @@ func Copy(dst io.Writer, src io.Reader, ctrl *CopyControl) (written int64, err e
 		return rt.ReadFrom(src)
 	}
 
-	// if src is net.TCPConn, and dst is a multiplexed connection
-	// reading can be controlled by writable events of smux
-	// and make the reading serialized
-	if tcpconn, ok := src.(*net.TCPConn); ok {
-		if ctrl != nil {
-			return rawCopy(dst, tcpconn, ctrl)
-		}
-	}
-
 	// fallback to standard io.CopyBuffer
 	buf := make([]byte, bufSize)
 	return io.CopyBuffer(dst, src, buf)

generic/mux.go

@@ -1,21 +0,0 @@
-package generic
-
-import (
-	"io"
-	"net"
-)
-
-type Mux interface {
-	Open() (io.ReadWriteCloser, error)
-	Accept() (io.ReadWriteCloser, error)
-	IsClosed() bool
-	NumStreams() int
-	RemoteAddr() net.Addr
-	Close() error
-}
-
-type Stream interface {
-	io.ReadWriteCloser
-	ID() uint32
-	RemoteAddr() net.Addr
-}

generic/rawcopy_unix.go

@@ -1,83 +0,0 @@
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package generic
-
-import (
-	"io"
-	"net"
-
-	"syscall"
-)
-
-// rawCopy can fan in N src into 1 dst with only 1 shared buffer
-func rawCopy(dst io.Writer, src *net.TCPConn, ctrl *CopyControl) (written int64, err error) {
-	c, err := src.SyscallConn()
-	if err != nil {
-		return 0, err
-	}
-
-	buf := ctrl.Buffer
-	var locked bool
-	for {
-		var er error
-		var nr int
-		rr := c.Read(func(s uintptr) bool {
-			// if the 'src' readable, acquire the shared lock first
-			// to make sure no other writers to 'dst' are blocked on dst.Write.
-			// With such design, we only need 1 buffer for a specific 'dst',
-			// especially when 'dst' is a multiplexed connection.
-			ctrl.Lock()
-			locked = true
-			nr, er = syscall.Read(int(s), buf)
-			if er == syscall.EAGAIN {
-				ctrl.Unlock()
-				locked = false
-				return false
-			}
-			// keep the lock on the shared buffer
-			// for the following dst.Write
-			return true
-		})
-
-		// read EOF
-		if nr == 0 && er == nil {
-			break
-		}
-
-		if nr > 0 {
-			nw, ew := dst.Write(buf[0:nr])
-			ctrl.Unlock()
-			locked = false
-
-			if nw > 0 {
-				written += int64(nw)
-			}
-			if ew != nil {
-				err = ew
-				break
-			}
-			if nr != nw {
-				err = io.ErrShortWrite
-				break
-			}
-		}
-		if er != nil {
-			if er != io.EOF {
-				err = er
-			}
-			break
-		}
-		if rr != nil {
-			if rr != io.EOF {
-				err = rr
-			}
-			break
-		}
-	}
-
-	if locked {
-		ctrl.Unlock()
-	}
-
-	return written, err
-}

generic/rawcopy_windows.go

@@ -1,14 +0,0 @@
-// +build windows
-
-package generic
-
-import (
-	"io"
-	"net"
-)
-
-func rawCopy(dst io.Writer, src *net.TCPConn, ctrl *CopyControl) (written int64, err error) {
-	// fallback to standard io.CopyBuffer
-	buf := make([]byte, bufSize)
-	return io.CopyBuffer(dst, src, buf)
-}

generic/snmp.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/xtaci/kcp-go"
+	kcp "github.com/xtaci/kcp-go/v5"
 )
 
 func SnmpLogger(path string, interval int) {

go.mod

@@ -4,21 +4,12 @@ require (
 	github.com/coreos/go-iptables v0.4.2 // indirect
 	github.com/golang/snappy v0.0.1
 	github.com/google/gopacket v1.1.17 // indirect
-	github.com/klauspost/cpuid v1.2.2 // indirect
-	github.com/klauspost/reedsolomon v1.9.3 // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
-	github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
-	github.com/tjfoc/gmsm v1.0.1 // indirect
 	github.com/urfave/cli v1.21.0
-	github.com/xtaci/kcp-go v5.4.20+incompatible
-	github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae // indirect
-	github.com/xtaci/smux v1.4.8
-	github.com/xtaci/smux/v2 v2.0.18
+	github.com/xtaci/kcp-go/v5 v5.5.5
+	github.com/xtaci/smux v1.5.9
 	github.com/xtaci/tcpraw v1.2.25
 	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
-	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
-	golang.org/x/sys v0.0.0-20191218084908-4a24b4065292 // indirect
 )
 
 go 1.13

go.sum

@@ -11,30 +11,46 @@ github.com/klauspost/reedsolomon v1.9.3 h1:N/VzgeMfHmLc+KHMD1UL/tNkfXAt8FnUqlgXG
 github.com/klauspost/reedsolomon v1.9.3/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/templexxx/cpu v0.0.1 h1:hY4WdLOgKdc8y13EYklu9OUTXik80BkxHoWvTO6MQQY=
+github.com/templexxx/cpu v0.0.1/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk=
 github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 h1:89CEmDvlq/F7SJEOqkIdNDGJXrQIhuIx9D2DBXjavSU=
 github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU=
 github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b h1:fj5tQ8acgNUr6O8LEplsxDhUIe2573iLkJc+PqnzZTI=
 github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4=
+github.com/templexxx/xorsimd v0.3.1 h1:K6aBXKOSPgs0Pz/VXDy0pQK/RlwvtI1Cf9sOm3dPDrU=
+github.com/templexxx/xorsimd v0.3.1/go.mod h1:W+ffZz8jJMH2SXwuKu9WhygqBMbFnp14G2fqEr8qaNo=
+github.com/templexxx/xorsimd v0.4.1 h1:iUZcywbOYDRAZUasAs2eSCUW8eobuZDy0I9FJiORkVg=
+github.com/templexxx/xorsimd v0.4.1/go.mod h1:W+ffZz8jJMH2SXwuKu9WhygqBMbFnp14G2fqEr8qaNo=
 github.com/tjfoc/gmsm v1.0.1 h1:R11HlqhXkDospckjZEihx9SW/2VW0RgdwrykyWMFOQU=
 github.com/tjfoc/gmsm v1.0.1/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc=
 github.com/urfave/cli v1.21.0 h1:wYSSj06510qPIzGSua9ZqsncMmWE3Zr55KBERygyrxE=
 github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ=
 github.com/xtaci/kcp-go v5.4.20+incompatible h1:TN1uey3Raw0sTz0Fg8GkfM0uH3YwzhnZWQ1bABv5xAg=
 github.com/xtaci/kcp-go v5.4.20+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE=
+github.com/xtaci/kcp-go/v5 v5.4.23 h1:fQG2rrEYWRKyq/PRtUZdBZ+RSr3S/3QQFuScA/KzjxU=
+github.com/xtaci/kcp-go/v5 v5.4.23/go.mod h1:kaRUj0x4HWAdtA32VaDNGGY8AZTRsFIOSCJQOWYcDc0=
+github.com/xtaci/kcp-go/v5 v5.4.25 h1:hD2bpx3R92TXvXoYGQ844heHekXNmXafnpKUE/uxGbc=
+github.com/xtaci/kcp-go/v5 v5.4.25/go.mod h1:kaRUj0x4HWAdtA32VaDNGGY8AZTRsFIOSCJQOWYcDc0=
+github.com/xtaci/kcp-go/v5 v5.4.26 h1:4NhV2D9c8IMUzhxI8eS0QVRR4MPqjhxoPGoh7Za3lQU=
+github.com/xtaci/kcp-go/v5 v5.4.26/go.mod h1:Oyw+zrBrO58urX1AaWV+2RynthEKcs+qrRAh0Q8YpdU=
+github.com/xtaci/kcp-go/v5 v5.5.0 h1:dEfJ6gid0SsGPMfvOxiF8SggVV+mtJ949ajOot+dMZg=
+github.com/xtaci/kcp-go/v5 v5.5.0/go.mod h1:Oyw+zrBrO58urX1AaWV+2RynthEKcs+qrRAh0Q8YpdU=
+github.com/xtaci/kcp-go/v5 v5.5.2 h1:CzcoWZmYR1bAgk73D3ZUa3QVSwN8fgPbTglyqCGOFJM=
+github.com/xtaci/kcp-go/v5 v5.5.2/go.mod h1:Oyw+zrBrO58urX1AaWV+2RynthEKcs+qrRAh0Q8YpdU=
+github.com/xtaci/kcp-go/v5 v5.5.3 h1:kBSV/WG8HOp/IC3GuSgqhTnrWnPq6O5t/tKwGn1mq7E=
+github.com/xtaci/kcp-go/v5 v5.5.3/go.mod h1:Oyw+zrBrO58urX1AaWV+2RynthEKcs+qrRAh0Q8YpdU=
+github.com/xtaci/kcp-go/v5 v5.5.4 h1:LxBOkiy+NKBK80tfKF1uFMfQyMIRyyIjaLrvR9udkyk=
+github.com/xtaci/kcp-go/v5 v5.5.4/go.mod h1:Oyw+zrBrO58urX1AaWV+2RynthEKcs+qrRAh0Q8YpdU=
+github.com/xtaci/kcp-go/v5 v5.5.5 h1:6wHtI6FyJVQ+PemXtCwhvVS6yu7sBQJWli6nOrg82qQ=
+github.com/xtaci/kcp-go/v5 v5.5.5/go.mod h1:Oyw+zrBrO58urX1AaWV+2RynthEKcs+qrRAh0Q8YpdU=
 github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae h1:J0GxkO96kL4WF+AIT3M4mfUVinOCPgf2uUWYFUzN0sM=
 github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE=
-github.com/xtaci/smux v1.4.6 h1:p9e/qj3Bj0zUT8qJWdmAZfmx5lOcZh0vLL0bQ8jnA7M=
-github.com/xtaci/smux v1.4.6/go.mod h1:LuA3S0xssf4fmGRJ7ow3EehgmDUzib4EcobaFNKvlMA=
-github.com/xtaci/smux v1.4.7 h1:ew5LGDZJWBuhwDq3cAqCQx4jRLKm54Y0SkObNQJJKu8=
-github.com/xtaci/smux v1.4.7/go.mod h1:LuA3S0xssf4fmGRJ7ow3EehgmDUzib4EcobaFNKvlMA=
-github.com/xtaci/smux v1.4.8 h1:QzYkAtRqlBqRJqDVOt/0Qj9O91YdxjEZppQt5aJrOAU=
-github.com/xtaci/smux v1.4.8/go.mod h1:LuA3S0xssf4fmGRJ7ow3EehgmDUzib4EcobaFNKvlMA=
-github.com/xtaci/smux/v2 v2.0.16 h1:2pGGbkFKTaMHIctYaovpwRpgdwWYy/6ZPaOQo00VW08=
-github.com/xtaci/smux/v2 v2.0.16/go.mod h1:Iqy5a3Gax2p7WCKHOHkSNo/COthNFXd3/vqrcKNtzqI=
-github.com/xtaci/smux/v2 v2.0.17 h1:baE6Dek0lkTZjofAFZxrd+LYOxN92GTxBRFRR6nKcXU=
-github.com/xtaci/smux/v2 v2.0.17/go.mod h1:Iqy5a3Gax2p7WCKHOHkSNo/COthNFXd3/vqrcKNtzqI=
-github.com/xtaci/smux/v2 v2.0.18 h1:Sa+W8IMR0dv3Tj9XxDUqovEFYGtU8Upydmmpez7IZgA=
-github.com/xtaci/smux/v2 v2.0.18/go.mod h1:Iqy5a3Gax2p7WCKHOHkSNo/COthNFXd3/vqrcKNtzqI=
+github.com/xtaci/smux v1.5.7 h1:fVOjux34i112nzp5BIF7yg4WvVKLj1pUMqEgSdiBho4=
+github.com/xtaci/smux v1.5.7/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY=
+github.com/xtaci/smux v1.5.8 h1:qyXDeYtjmAnSLqmptfgebpD1Wx1KPMF39POSfx0klDw=
+github.com/xtaci/smux v1.5.8/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY=
+github.com/xtaci/smux v1.5.9 h1:Sysv8NISQoULTQut7Cj4RIb3jVP/WMw5nYGgvSSTWKo=
+github.com/xtaci/smux v1.5.9/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY=
 github.com/xtaci/tcpraw v1.2.25 h1:VDlqo0op17JeXBM6e2G9ocCNLOJcw9mZbobMbJjo0vk=
 github.com/xtaci/tcpraw v1.2.25/go.mod h1:dKyZ2V75s0cZ7cbgJYdxPvms7af0joIeOyx1GgJQbLk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -46,8 +62,8 @@ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191218084908-4a24b4065292 h1:Y8q0zsdcgAd+JU8VUA8p8Qv2YhuY9zevDG2ORt5qBUI=
-golang.org/x/sys v0.0.0-20191218084908-4a24b4065292/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8 h1:JA8d3MPx/IToSyXZG/RhwYEtfrKO1Fxrqe8KrkiLXKM=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

server/main.go

@@ -16,10 +16,9 @@ import (
 	"golang.org/x/crypto/pbkdf2"
 
 	"github.com/urfave/cli"
-	kcp "github.com/xtaci/kcp-go"
+	kcp "github.com/xtaci/kcp-go/v5"
 	"github.com/xtaci/kcptun/generic"
 	"github.com/xtaci/smux"
-	smuxv2 "github.com/xtaci/smux/v2"
 	"github.com/xtaci/tcpraw"
 )
 
@@ -45,48 +44,27 @@ func handleMux(conn net.Conn, config *Config) {
 	log.Println("smux version:", config.SmuxVer, "on connection:", conn.LocalAddr(), "->", conn.RemoteAddr())
 
 	// stream multiplex
-	var muxer generic.Mux
-	switch config.SmuxVer {
-	case 1:
-		smuxConfig := smux.DefaultConfig()
-		smuxConfig.MaxReceiveBuffer = config.SmuxBuf
-		smuxConfig.KeepAliveInterval = time.Duration(config.KeepAlive) * time.Second
+	smuxConfig := smux.DefaultConfig()
+	smuxConfig.Version = config.SmuxVer
+	smuxConfig.MaxReceiveBuffer = config.SmuxBuf
+	smuxConfig.MaxStreamBuffer = config.StreamBuf
+	smuxConfig.KeepAliveInterval = time.Duration(config.KeepAlive) * time.Second
 
-		mux, err := smux.Server(conn, smuxConfig)
-		if err != nil {
-			log.Println(err)
-			return
-		}
-		defer mux.Close()
-		muxer = mux
-	case 2:
-		smuxConfig := smuxv2.DefaultConfig()
-		smuxConfig.MaxReceiveBuffer = config.SmuxBuf
-		smuxConfig.MaxStreamBuffer = config.StreamBuf
-		smuxConfig.KeepAliveInterval = time.Duration(config.KeepAlive) * time.Second
-
-		mux, err := smuxv2.Server(conn, smuxConfig)
-		if err != nil {
-			log.Println(err)
-			return
-		}
-		defer mux.Close()
-		muxer = mux
-	default:
-		panic("incorrect smux version")
+	mux, err := smux.Server(conn, smuxConfig)
+	if err != nil {
+		log.Println(err)
+		return
 	}
-
-	// copy to stream control
-	copyControl := &generic.CopyControl{Buffer: make([]byte, bufSize)}
+	defer mux.Close()
 
 	for {
-		stream, err := muxer.Accept()
+		stream, err := mux.AcceptStream()
 		if err != nil {
 			log.Println(err)
 			return
 		}
 
-		go func(p1 io.ReadWriteCloser) {
+		go func(p1 *smux.Stream) {
 			var p2 net.Conn
 			var err error
 			if !isUnix {
@@ -100,12 +78,12 @@ func handleMux(conn net.Conn, config *Config) {
 				p1.Close()
 				return
 			}
-			handleClient(p1, p2, copyControl, config.Quiet)
+			handleClient(p1, p2, config.Quiet)
 		}(stream)
 	}
 }
 
-func handleClient(p1 io.ReadWriteCloser, p2 net.Conn, ctrl *generic.CopyControl, quiet bool) {
+func handleClient(p1 *smux.Stream, p2 net.Conn, quiet bool) {
 	logln := func(v ...interface{}) {
 		if !quiet {
 			log.Println(v...)
@@ -115,27 +93,14 @@ func handleClient(p1 io.ReadWriteCloser, p2 net.Conn, ctrl *generic.CopyControl,
 	defer p1.Close()
 	defer p2.Close()
 
-	if s1, ok := p1.(generic.Stream); ok {
-		logln("stream opened", "in:", fmt.Sprint(s1.RemoteAddr(), "(", s1.ID(), ")"), "out:", p2.RemoteAddr())
-		defer logln("stream closed", "in:", fmt.Sprint(s1.RemoteAddr(), "(", s1.ID(), ")"), "out:", p2.RemoteAddr())
-	}
+	logln("stream opened", "in:", fmt.Sprint(p1.RemoteAddr(), "(", p1.ID(), ")"), "out:", p2.RemoteAddr())
+	defer logln("stream closed", "in:", fmt.Sprint(p1.RemoteAddr(), "(", p1.ID(), ")"), "out:", p2.RemoteAddr())
 
 	// start tunnel & wait for tunnel termination
 	streamCopy := func(dst io.Writer, src io.ReadCloser) {
-		if _, err := generic.Copy(dst, src, ctrl); err != nil {
-			if s1, ok := p1.(generic.Stream); ok {
-				// verbose error handling
-				cause := err
-				if e, ok := err.(interface{ Cause() error }); ok {
-					cause = e.Cause()
-				}
-
-				switch cause {
-				case smux.ErrInvalidProtocol:
-					log.Println("smux version:1", err, "in:", fmt.Sprint(s1.RemoteAddr(), "(", s1.ID(), ")"), "out:", p2.RemoteAddr())
-				case smuxv2.ErrInvalidProtocol:
-					log.Println("smux version:2", err, "in:", fmt.Sprint(s1.RemoteAddr(), "(", s1.ID(), ")"), "out:", p2.RemoteAddr())
-				}
+		if _, err := generic.Copy(dst, src); err != nil {
+			if err == smux.ErrInvalidProtocol {
+				log.Println("smux", err, "in:", fmt.Sprint(p1.RemoteAddr(), "(", p1.ID(), ")"), "out:", p2.RemoteAddr())
 			}
 		}
 		p1.Close()

server/signal.go

@@ -8,7 +8,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	kcp "github.com/xtaci/kcp-go"
+	kcp "github.com/xtaci/kcp-go/v5"
 )
 
 func init() {