yinqiwen · sbilly · Nov 17, 2020 · Feb 4, 2021 · Feb 4, 2021 · Feb 4, 2021
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,15 @@ vendor
 .DS_Store
 *.tar.gz
 *.tar.bz2
+.history
+.vscode
+go.sum
+
+MITM
+
+# pidfile
+*.pid
+
+# binary
+gsnova
 
diff --git a/common/channel/dial.go b/common/channel/dial.go
diff --git a/common/channel/http/local.go b/common/channel/http/local.go
diff --git a/common/channel/http/remote.go b/common/channel/http/remote.go
diff --git a/common/channel/http2/local.go b/common/channel/http2/local.go
diff --git a/common/channel/http2/remote.go b/common/channel/http2/remote.go
diff --git a/common/channel/kcp/local.go b/common/channel/kcp/local.go
diff --git a/common/channel/kcp/remote.go b/common/channel/kcp/remote.go
diff --git a/common/channel/quic/local.go b/common/channel/quic/local.go
diff --git a/common/channel/quic/remote.go b/common/channel/quic/remote.go
@@ -1,6 +1,7 @@
 package quic
 
 import (
+	"context"
 	"crypto/tls"
 
 	quic "github.com/lucas-clemente/quic-go"
@@ -11,7 +12,7 @@ import (
 
 func servQUIC(lp quic.Listener) {
 	for {
-		sess, err := lp.Accept()
+		sess, err := lp.Accept(context.Background())
 		if nil != err {
 			continue
 		}

diff --git a/common/channel/tcp/local.go b/common/channel/tcp/local.go
diff --git a/common/channel/tcp/remote.go b/common/channel/tcp/remote.go
diff --git a/common/channel/websocket/local.go b/common/channel/websocket/local.go
diff --git a/common/channel/websocket/remote.go b/common/channel/websocket/remote.go
diff --git a/common/helper/chan.go b/common/helper/chan.go
diff --git a/common/helper/sni.go b/common/helper/sni.go
diff --git a/common/logger/ansi_color.go b/common/logger/ansi_color.go
diff --git a/common/logger/color_console_posix.go b/common/logger/color_console_posix.go
diff --git a/common/logger/color_console_windows.go b/common/logger/color_console_windows.go
diff --git a/common/mux/const.go b/common/mux/const.go
diff --git a/common/mux/http2.go b/common/mux/http2.go
diff --git a/common/mux/mux.go b/common/mux/mux.go
diff --git a/common/mux/mux_test.go b/common/mux/mux_test.go
diff --git a/common/mux/quic.go b/common/mux/quic.go
@@ -1,6 +1,7 @@
 package mux
 
 import (
+	"context"
 	"net"
 	"sync/atomic"
 	"time"
@@ -23,7 +24,7 @@ func (q *QUICMuxSession) CloseStream(stream MuxStream) error {
 }
 
 func (q *QUICMuxSession) OpenStream() (MuxStream, error) {
-	s, err := q.OpenStreamSync()
+	s, err := q.OpenStreamSync(context.Background())
 	if nil != err {
 		return nil, err
 	}
@@ -32,7 +33,7 @@ func (q *QUICMuxSession) OpenStream() (MuxStream, error) {
 }
 
 func (q *QUICMuxSession) AcceptStream() (MuxStream, error) {
-	s, err := q.Session.AcceptStream()
+	s, err := q.Session.AcceptStream(context.Background())
 	if nil != err {
 		return nil, err
 	}
@@ -45,7 +46,7 @@ func (q *QUICMuxSession) NumStreams() int {
 
 func (q *QUICMuxSession) Close() error {
 	q.streamCounter = 0
-	return q.Session.Close()
+	return q.Session.CloseWithError(0, "")
 }
 func (s *QUICMuxSession) RemoteAddr() net.Addr {
 	return nil

diff --git a/common/mux/ws.go b/common/mux/ws.go
diff --git a/go.mod b/go.mod
@@ -0,0 +1,36 @@
+module gsnova
+
+go 1.15
+
+require (
+	github.com/NebulousLabs/go-upnp v0.0.0-20181203152547-b32978b8ccbf
+	github.com/boltdb/bolt v1.3.1 // indirect
+	github.com/dsnet/compress v0.0.1
+	github.com/fsnotify/fsnotify v1.4.9
+	github.com/golang/snappy v0.0.2
+	github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c
+	github.com/google/easypki v1.1.0
+	github.com/gorilla/websocket v1.4.2
+	github.com/juju/ratelimit v1.0.1
+	github.com/klauspost/reedsolomon v1.9.11 // indirect
+	github.com/lucas-clemente/quic-go v0.19.3
+	github.com/miekg/dns v1.1.38
+	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.4.0 // indirect
+	github.com/vmihailenco/msgpack v4.0.4+incompatible
+	github.com/xtaci/kcp-go v5.4.20+incompatible
+	github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
+	github.com/yinqiwen/fdns v0.0.0-20171017112320-12371043eaab
+	github.com/yinqiwen/gotoolkit v0.0.0-20200524133648-3980351e079f
+	github.com/yinqiwen/gsnova v0.0.0
+	github.com/yinqiwen/pmux v0.0.0-20180811072835-da2f176b9f7a
+	gitlab.com/NebulousLabs/fastrand v0.0.0-20181126182046-603482d69e40 // indirect
+	gitlab.com/NebulousLabs/go-upnp v0.0.0-20181011194642-3a71999ed0d3 // indirect
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
+	golang.org/x/net v0.0.0-20210119194325-5f4716e94777
+	golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
+	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
+)
+
+replace github.com/yinqiwen/gsnova v0.0.0 => ./
diff --git a/local/transparent_other.go b/local/transparent_other.go
diff --git a/local/transparent_unix.go b/local/transparent_unix.go
diff --git a/main.go b/main.go
diff --git a/remote/proxy.go b/remote/proxy.go
diff --git a/remote/web.go b/remote/web.go