Update outline-ss-server to v1.3.0

Jigsaw-Code · Oct 7, 2020 · 11e6e39 · 11e6e39
1 parent 29f620b
commit 11e6e39
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 95 deletions.
diff --git a/go.mod b/go.mod
@@ -5,12 +5,9 @@ go 1.15
 require (
 	github.com/Jigsaw-Code/choir v1.0.1
 	github.com/Jigsaw-Code/getsni v0.0.0-20190807203514-efe2dbf35d1f
-	github.com/Jigsaw-Code/outline-ss-server v1.2.1
+	github.com/Jigsaw-Code/outline-ss-server v1.3.0
 	github.com/eycorsican/go-tun2socks v1.16.11
 	github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 // indirect
-	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
-	golang.org/x/mobile v0.0.0-20200801112145-973feb4309de // indirect
-	golang.org/x/net v0.0.0-20200904194848-62affa334b73
-	golang.org/x/sys v0.0.0-20200909081042-eff7692f9009
-	google.golang.org/protobuf v1.25.0 // indirect
+	golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0
+	golang.org/x/sys v0.0.0-20201007165808-a893ed343c85
 )
diff --git a/go.sum b/go.sum
diff --git a/outline/shadowsocks/connectivity.go b/outline/shadowsocks/connectivity.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	oss "github.com/Jigsaw-Code/outline-go-tun2socks/shadowsocks"
-	"github.com/Jigsaw-Code/outline-ss-server/shadowsocks"
+	shadowsocks "github.com/Jigsaw-Code/outline-ss-server/client"
 )
 
 // Outline error codes. Must be kept in sync with definitions in outline-client/cordova-plugin-outline/outlinePlugin.js

diff --git a/shadowsocks/connectivity.go b/shadowsocks/connectivity.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-ss-server/shadowsocks"
+	shadowsocks "github.com/Jigsaw-Code/outline-ss-server/client"
 )
 
 // TODO: make these values configurable by exposing a struct with the connectivity methods.

diff --git a/shadowsocks/connectivity_test.go b/shadowsocks/connectivity_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	onet "github.com/Jigsaw-Code/outline-ss-server/net"
-	"github.com/Jigsaw-Code/outline-ss-server/shadowsocks"
+	shadowsocks "github.com/Jigsaw-Code/outline-ss-server/client"
 )
 
 func TestCheckUDPConnectivityWithDNS_Success(t *testing.T) {

diff --git a/shadowsocks/tcp.go b/shadowsocks/tcp.go
@@ -4,7 +4,7 @@ import (
 	"net"
 
 	onet "github.com/Jigsaw-Code/outline-ss-server/net"
-	"github.com/Jigsaw-Code/outline-ss-server/shadowsocks"
+	shadowsocks "github.com/Jigsaw-Code/outline-ss-server/client"
 	"github.com/eycorsican/go-tun2socks/core"
 )
 

diff --git a/shadowsocks/udp.go b/shadowsocks/udp.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-ss-server/shadowsocks"
+	shadowsocks "github.com/Jigsaw-Code/outline-ss-server/client"
 	"github.com/eycorsican/go-tun2socks/core"
 )
 

diff --git a/tunnel/outline.go b/tunnel/outline.go
@@ -24,7 +24,7 @@ import (
 	"github.com/eycorsican/go-tun2socks/proxy/dnsfallback"
 
 	oss "github.com/Jigsaw-Code/outline-go-tun2socks/shadowsocks"
-	"github.com/Jigsaw-Code/outline-ss-server/shadowsocks"
+	shadowsocks "github.com/Jigsaw-Code/outline-ss-server/client"
 )
 
 // OutlineTunnel represents a tunnel from a TUN device to a server.