diff --git a/client/client.go b/client/client.go index 5c9e5c45..b623c7da 100644 --- a/client/client.go +++ b/client/client.go @@ -20,8 +20,8 @@ import ( "fmt" "net" - "github.com/Jigsaw-Code/outline-internal-sdk/transport" - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" onet "github.com/Jigsaw-Code/outline-ss-server/net" ) diff --git a/client/salt.go b/client/salt.go index fce17128..527362ce 100644 --- a/client/salt.go +++ b/client/salt.go @@ -15,7 +15,7 @@ package client import ( - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" ) // Deprecated: Prefer github.com/Jigsaw-Code/outline-ss-server/shadowsocks/client.NewPrefixSaltGenerator diff --git a/cmd/outline-ss-server/main.go b/cmd/outline-ss-server/main.go index 9a940b66..748003ec 100644 --- a/cmd/outline-ss-server/main.go +++ b/cmd/outline-ss-server/main.go @@ -26,8 +26,8 @@ import ( "syscall" "time" - "github.com/Jigsaw-Code/outline-internal-sdk/transport" - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" "github.com/Jigsaw-Code/outline-ss-server/ipinfo" "github.com/Jigsaw-Code/outline-ss-server/service" "github.com/op/go-logging" diff --git a/go.mod b/go.mod index 0573c622..f3a47d53 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/Jigsaw-Code/outline-ss-server require ( - github.com/Jigsaw-Code/outline-internal-sdk v0.0.0-20230522235223-1b323ea1d667 + github.com/Jigsaw-Code/outline-sdk v0.0.2 github.com/goreleaser/goreleaser v1.18.2 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/oschwald/geoip2-golang v1.8.0 diff --git a/go.sum b/go.sum index 032e615f..dca4828b 100644 --- a/go.sum +++ b/go.sum @@ -508,8 +508,8 @@ github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.2/go.mod h1:uqoR4sJc63p7ugW8a/vsEspOsNuehbi7ptS2CHCyOnY= github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/Jigsaw-Code/outline-internal-sdk v0.0.0-20230522235223-1b323ea1d667 h1:msZNpaFAjRTvVi5q2yW1PJ4MmU4/7anob2IZYtDZQJw= -github.com/Jigsaw-Code/outline-internal-sdk v0.0.0-20230522235223-1b323ea1d667/go.mod h1:vxtE3esaFy5UG6TnipLyWx0esUQBy9LBXHLQx+SoER8= +github.com/Jigsaw-Code/outline-sdk v0.0.2 h1:uCuyJMaWj57IYEG/Hdml8YMdk9chU60ZkSxJXBhyGHU= +github.com/Jigsaw-Code/outline-sdk v0.0.2/go.mod h1:hhlKz0+r9wSDFT8usvN8Zv/BFToCIFAUn1P2Qk8G2CM= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= diff --git a/internal/integration_test/integration_test.go b/internal/integration_test/integration_test.go index 22eb27b6..ecb5ee2b 100644 --- a/internal/integration_test/integration_test.go +++ b/internal/integration_test/integration_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/Jigsaw-Code/outline-internal-sdk/transport" - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" "github.com/Jigsaw-Code/outline-ss-server/ipinfo" onet "github.com/Jigsaw-Code/outline-ss-server/net" "github.com/Jigsaw-Code/outline-ss-server/service" diff --git a/net/stream.go b/net/stream.go index 7c01b892..9d2e0359 100644 --- a/net/stream.go +++ b/net/stream.go @@ -17,7 +17,7 @@ package net import ( "io" - "github.com/Jigsaw-Code/outline-internal-sdk/transport" + "github.com/Jigsaw-Code/outline-sdk/transport" ) type DuplexConn = transport.StreamConn diff --git a/service/cipher_list.go b/service/cipher_list.go index 6fe2c75e..cadcc40b 100644 --- a/service/cipher_list.go +++ b/service/cipher_list.go @@ -19,7 +19,7 @@ import ( "net" "sync" - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" ) // Don't add a tag if it would reduce the salt entropy below this amount. diff --git a/service/cipher_list_testing.go b/service/cipher_list_testing.go index 6b69b3a4..a77427ed 100644 --- a/service/cipher_list_testing.go +++ b/service/cipher_list_testing.go @@ -18,7 +18,7 @@ import ( "container/list" "fmt" - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" ) // MakeTestCiphers creates a CipherList containing one fresh AEAD cipher diff --git a/service/metrics/metrics.go b/service/metrics/metrics.go index f11bda5b..667b41bc 100644 --- a/service/metrics/metrics.go +++ b/service/metrics/metrics.go @@ -17,7 +17,7 @@ package metrics import ( "io" - "github.com/Jigsaw-Code/outline-internal-sdk/transport" + "github.com/Jigsaw-Code/outline-sdk/transport" ) type ProxyMetrics struct { diff --git a/service/tcp.go b/service/tcp.go index 021f6ae0..d295931b 100644 --- a/service/tcp.go +++ b/service/tcp.go @@ -26,8 +26,8 @@ import ( "syscall" "time" - "github.com/Jigsaw-Code/outline-internal-sdk/transport" - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" "github.com/Jigsaw-Code/outline-ss-server/ipinfo" onet "github.com/Jigsaw-Code/outline-ss-server/net" "github.com/Jigsaw-Code/outline-ss-server/service/metrics" diff --git a/service/tcp_test.go b/service/tcp_test.go index 5018c26d..1f381111 100644 --- a/service/tcp_test.go +++ b/service/tcp_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/Jigsaw-Code/outline-internal-sdk/transport" - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" "github.com/Jigsaw-Code/outline-ss-server/ipinfo" onet "github.com/Jigsaw-Code/outline-ss-server/net" "github.com/Jigsaw-Code/outline-ss-server/service/metrics" diff --git a/service/udp.go b/service/udp.go index 0c028b15..4138ed81 100644 --- a/service/udp.go +++ b/service/udp.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" "github.com/Jigsaw-Code/outline-ss-server/ipinfo" onet "github.com/Jigsaw-Code/outline-ss-server/net" logging "github.com/op/go-logging" diff --git a/service/udp_test.go b/service/udp_test.go index bb4e99e8..27756e3d 100644 --- a/service/udp_test.go +++ b/service/udp_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks" + "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" "github.com/Jigsaw-Code/outline-ss-server/ipinfo" onet "github.com/Jigsaw-Code/outline-ss-server/net" logging "github.com/op/go-logging"