fix issue ginuerzh#617

hktalent · Dec 6, 2020 · 4dae496 · 4dae496
1 parent b1492e6
commit 4dae496
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 103 deletions.
diff --git a/forward.go b/forward.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/ginuerzh/gosocks5"
 	"github.com/go-log/log"
-	smux "gopkg.in/xtaci/smux.v1"
+	smux "github.com/xtaci/smux"
 )
 
 type forwardConnector struct {

diff --git a/go.mod b/go.mod
@@ -1,50 +1,44 @@
 module github.com/ginuerzh/gost
 
-go 1.13
+go 1.15
 
 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/LiamHaworth/go-tproxy v0.0.0-20190726054950-ef7efd7f24ed
 	github.com/Yawning/chacha20 v0.0.0-20170904085104-e3b1f968fc63 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496
+	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
 	github.com/bifurcation/mint v0.0.0-20181105071958-a14404e9a861 // indirect
 	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/coreos/go-iptables v0.4.5 // indirect
-	github.com/dchest/siphash v1.2.1 // indirect
 	github.com/docker/libcontainer v2.2.1+incompatible
 	github.com/ginuerzh/gosocks4 v0.0.1
 	github.com/ginuerzh/gosocks5 v0.2.0
 	github.com/ginuerzh/tls-dissector v0.0.2-0.20200224064855-24ab2b3a3796
 	github.com/go-gost/relay v0.1.0
-	github.com/go-log/log v0.1.0
+	github.com/go-log/log v0.2.0
 	github.com/gobwas/glob v0.2.3
-	github.com/golang/mock v1.2.0 // indirect
-	github.com/google/gopacket v1.1.17 // indirect
-	github.com/gorilla/websocket v1.4.0 // indirect
-	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/reedsolomon v1.7.0 // indirect
+	github.com/google/gopacket v1.1.19 // indirect
+	github.com/gorilla/websocket v1.4.2
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/klauspost/compress v1.11.3
+	github.com/klauspost/reedsolomon v1.9.9 // 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.27
+	github.com/miekg/dns v1.1.35
 	github.com/milosgajdos83/tenus v0.0.0-20190415114537-1f3ed00ae7d8
-	github.com/onsi/ginkgo v1.7.0 // indirect
-	github.com/onsi/gomega v1.4.3 // indirect
-	github.com/pkg/errors v0.8.1 // indirect
-	github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735
-	github.com/shadowsocks/go-shadowsocks2 v0.1.1-0.20200220141918-07b789296fe6
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/ryanuber/go-glob v1.0.0
+	github.com/shadowsocks/go-shadowsocks2 v0.1.3
 	github.com/shadowsocks/shadowsocks-go v0.0.0-20170121203516-97a5c71f80ba
-	github.com/songgao/water v0.0.0-20190725173103-fd331bda3f4b
-	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
+	github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
+	github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
+	github.com/tjfoc/gmsm v1.3.2 // indirect
+	github.com/xtaci/kcp-go v5.4.20+incompatible
+	github.com/xtaci/smux v1.5.15
 	github.com/xtaci/tcpraw v1.2.25
-	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
+	golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d
 	golang.org/x/net v0.0.0-20190923162816-aa69164e4478
-	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
+	golang.org/x/text v0.3.4 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/kcp.go b/kcp.go
@@ -16,8 +16,8 @@ import (
 	"github.com/go-log/log"
 	"github.com/klauspost/compress/snappy"
 	"github.com/xtaci/tcpraw"
-	"gopkg.in/xtaci/kcp-go.v4"
-	"gopkg.in/xtaci/smux.v1"
+	"github.com/xtaci/kcp-go"
+	"github.com/xtaci/smux"
 )
 
 var (

diff --git a/mux.go b/mux.go
@@ -3,7 +3,7 @@ package gost
 import (
 	"net"
 
-	smux "gopkg.in/xtaci/smux.v1"
+	smux "github.com/xtaci/smux"
 )
 
 type muxStreamConn struct {

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

diff --git a/socks.go b/socks.go
@@ -16,7 +16,7 @@ import (
 	"github.com/ginuerzh/gosocks4"
 	"github.com/ginuerzh/gosocks5"
 	"github.com/go-log/log"
-	smux "gopkg.in/xtaci/smux.v1"
+	smux "github.com/xtaci/smux"
 )
 
 const (

diff --git a/tls.go b/tls.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-log/log"
 
-	smux "gopkg.in/xtaci/smux.v1"
+	smux "github.com/xtaci/smux"
 )
 
 type tlsTransporter struct {

diff --git a/ws.go b/ws.go
@@ -15,8 +15,8 @@ import (
 	"net/url"
 
 	"github.com/go-log/log"
-	"gopkg.in/gorilla/websocket.v1"
-	smux "gopkg.in/xtaci/smux.v1"
+	"github.com/gorilla/websocket"
+	smux "github.com/xtaci/smux"
 )
 
 const (