switch to go module

go.mod

@@ -0,0 +1,38 @@
+module github.com/ginuerzh/gost
+
+require (
+	git.torproject.org/pluggable-transports/goptlib.git v0.0.0-20180321061416-7d56ec4f381e
+	git.torproject.org/pluggable-transports/obfs4.git v0.0.0-20181103133120-08f4d470188e
+	github.com/Yawning/chacha20 v0.0.0-20170904085104-e3b1f968fc63 // indirect
+	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
+	github.com/bifurcation/mint v0.0.0-20181105071958-a14404e9a861 // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/dchest/siphash v1.2.1 // indirect
+	github.com/ginuerzh/gosocks4 v0.0.1
+	github.com/ginuerzh/gosocks5 v0.2.0
+	github.com/ginuerzh/tls-dissector v0.0.1
+	github.com/go-log/log v0.1.0
+	github.com/gobwas/glob v0.2.3
+	github.com/hashicorp/golang-lru v0.5.0 // indirect
+	github.com/klauspost/compress v1.4.1
+	github.com/klauspost/cpuid v1.2.0 // indirect
+	github.com/klauspost/crc32 v1.2.0 // indirect
+	github.com/klauspost/reedsolomon v1.7.0 // indirect
+	github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f // indirect
+	github.com/lucas-clemente/quic-go v0.10.0
+	github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced // indirect
+	github.com/miekg/dns v1.1.1
+	github.com/pkg/errors v0.8.0 // indirect
+	github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735
+	github.com/shadowsocks/shadowsocks-go v0.0.0-20170121203516-97a5c71f80ba
+	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
+	github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b // indirect
+	github.com/tjfoc/gmsm v1.0.1 // indirect
+	golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9
+	golang.org/x/net v0.0.0-20181201002055-351d144fa1fc
+	golang.org/x/sys v0.0.0-20181206074257-70b957f3b65e // indirect
+	golang.org/x/text v0.3.0 // indirect
+	gopkg.in/gorilla/websocket.v1 v1.4.0
+	gopkg.in/xtaci/kcp-go.v4 v4.3.2
+	gopkg.in/xtaci/smux.v1 v1.0.7
+)

kcp.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/go-log/log"
 	"github.com/klauspost/compress/snappy"
-	"gopkg.in/xtaci/kcp-go.v2"
+	"gopkg.in/xtaci/kcp-go.v4"
 	"gopkg.in/xtaci/smux.v1"
 )
 
@@ -52,15 +52,13 @@ type KCPConfig struct {
 func (c *KCPConfig) Init() {
 	switch c.Mode {
 	case "normal":
-		c.NoDelay, c.Interval, c.Resend, c.NoCongestion = 0, 50, 2, 1
+		c.NoDelay, c.Interval, c.Resend, c.NoCongestion = 0, 40, 2, 1
+	case "fast":
+		c.NoDelay, c.Interval, c.Resend, c.NoCongestion = 0, 30, 2, 1
 	case "fast2":
-		c.NoDelay, c.Interval, c.Resend, c.NoCongestion = 1, 30, 2, 1
-	case "fast3":
 		c.NoDelay, c.Interval, c.Resend, c.NoCongestion = 1, 20, 2, 1
-	case "fast":
-		fallthrough
-	default:
-		c.NoDelay, c.Interval, c.Resend, c.NoCongestion = 0, 40, 2, 1
+	case "fast3":
+		c.NoDelay, c.Interval, c.Resend, c.NoCongestion = 1, 10, 2, 1
 	}
 }
 
@@ -177,18 +175,17 @@ func (tr *kcpTransporter) initSession(addr string, conn net.Conn, config *KCPCon
 
 	kcpconn, err := kcp.NewConn(addr,
 		blockCrypt(config.Key, config.Crypt, KCPSalt),
-		config.DataShard, config.ParityShard,
-		&kcp.ConnectedUDPConn{UDPConn: udpConn, Conn: udpConn})
+		config.DataShard, config.ParityShard, &connectedUDPConn{udpConn})
 	if err != nil {
 		return nil, err
 	}
 
 	kcpconn.SetStreamMode(true)
+	kcpconn.SetWriteDelay(false)
 	kcpconn.SetNoDelay(config.NoDelay, config.Interval, config.Resend, config.NoCongestion)
 	kcpconn.SetWindowSize(config.SndWnd, config.RcvWnd)
 	kcpconn.SetMtu(config.MTU)
 	kcpconn.SetACKNoDelay(config.AckNodelay)
-	kcpconn.SetKeepAlive(config.KeepAlive)
 
 	// if err := kcpconn.SetDSCP(config.DSCP); err != nil {
 	// 	log.Log("[kcp]", err)
@@ -203,6 +200,7 @@ func (tr *kcpTransporter) initSession(addr string, conn net.Conn, config *KCPCon
 	// stream multiplex
 	smuxConfig := smux.DefaultConfig()
 	smuxConfig.MaxReceiveBuffer = config.SockBuf
+	smuxConfig.KeepAliveInterval = time.Duration(config.KeepAlive) * time.Second
 	var cc net.Conn = kcpconn
 	if !config.NoComp {
 		cc = newCompStreamConn(kcpconn)
@@ -274,18 +272,19 @@ func (l *kcpListener) listenLoop() {
 			return
 		}
 		conn.SetStreamMode(true)
+		conn.SetWriteDelay(false)
 		conn.SetNoDelay(l.config.NoDelay, l.config.Interval, l.config.Resend, l.config.NoCongestion)
 		conn.SetMtu(l.config.MTU)
 		conn.SetWindowSize(l.config.SndWnd, l.config.RcvWnd)
 		conn.SetACKNoDelay(l.config.AckNodelay)
-		conn.SetKeepAlive(l.config.KeepAlive)
 		go l.mux(conn)
 	}
 }
 
 func (l *kcpListener) mux(conn net.Conn) {
 	smuxConfig := smux.DefaultConfig()
 	smuxConfig.MaxReceiveBuffer = l.config.SockBuf
+	smuxConfig.KeepAliveInterval = time.Duration(l.config.KeepAlive) * time.Second
 
 	log.Logf("[kcp] %s - %s", conn.RemoteAddr(), l.Addr())
 
@@ -343,6 +342,8 @@ func blockCrypt(key, crypt, salt string) (block kcp.BlockCrypt) {
 	pass := pbkdf2.Key([]byte(key), []byte(salt), 4096, 32, sha1.New)
 
 	switch crypt {
+	case "sm4":
+		block, _ = kcp.NewSM4BlockCrypt(pass[:16])
 	case "tea":
 		block, _ = kcp.NewTEABlockCrypt(pass[:16])
 	case "xor":
@@ -451,3 +452,11 @@ func (c *compStreamConn) SetReadDeadline(t time.Time) error {
 func (c *compStreamConn) SetWriteDeadline(t time.Time) error {
 	return c.conn.SetWriteDeadline(t)
 }
+
+// connectedUDPConn is a wrapper for net.UDPConn which converts WriteTo syscalls
+// to Write syscalls that are 4 times faster on some OS'es. This should only be
+// used for connections that were produced by a net.Dial* call.
+type connectedUDPConn struct{ *net.UDPConn }
+
+// WriteTo redirects all writes to the Write syscall, which is 4 times faster.
+func (c *connectedUDPConn) WriteTo(b []byte, addr net.Addr) (int, error) { return c.Write(b) }

signal_unix.go

@@ -8,7 +8,7 @@ import (
 	"syscall"
 
 	"github.com/go-log/log"
-	"gopkg.in/xtaci/kcp-go.v2"
+	"gopkg.in/xtaci/kcp-go.v4"
 )
 
 func kcpSigHandler() {