diff --git a/README.md b/README.md index 7a7f430..de23eff 100644 --- a/README.md +++ b/README.md @@ -411,7 +411,7 @@ Examples: - note: `dhcpd-failover` only serves requests when there's no other dhcp server exists in lan - detect interval: 1min -## Linux Service +## Linux Daemon - systemd: [https://github.com/nadoo/glider/blob/master/systemd/](https://github.com/nadoo/glider/blob/master/systemd/) diff --git a/go.mod b/go.mod index 936dba2..9f4167b 100644 --- a/go.mod +++ b/go.mod @@ -11,13 +11,13 @@ require ( github.com/nadoo/conflag v0.3.1 github.com/nadoo/ipset v0.5.0 github.com/xtaci/kcp-go/v5 v5.6.1 - golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd - golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 + golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 + golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb ) require ( github.com/ebfe/rc2 v0.0.0-20131011165748-24b9757f5521 // indirect - github.com/klauspost/cpuid/v2 v2.0.11 // indirect + github.com/klauspost/cpuid/v2 v2.0.12 // indirect github.com/klauspost/reedsolomon v1.9.16 // indirect github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 // indirect github.com/mdlayher/raw v0.1.0 // indirect @@ -26,7 +26,7 @@ require ( github.com/templexxx/xorsimd v0.4.1 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect - golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect + golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect ) // Replace dependency modules with local developing copy diff --git a/go.sum b/go.sum index 3d22332..b459451 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/klauspost/cpuid v1.2.4/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.0.11 h1:i2lw1Pm7Yi/4O6XCSyJWqEHI2MDw2FzUK6o/D21xn2A= -github.com/klauspost/cpuid/v2 v2.0.11/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= +github.com/klauspost/cpuid/v2 v2.0.12 h1:p9dKCg8i4gmOxtv35DvrYoWqYzQrvEVdjQ762Y0OqZE= +github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= github.com/klauspost/reedsolomon v1.9.9/go.mod h1:O7yFFHiQwDR6b2t63KPUpccPtNdp5ADgh1gg4fd12wo= github.com/klauspost/reedsolomon v1.9.16 h1:mR0AwphBwqFv/I3B9AHtNKvzuowI1vrj8/3UX4XRmHA= github.com/klauspost/reedsolomon v1.9.16/go.mod h1:eqPAcE7xar5CIzcdfwydOEdcmchAKAP/qs14y4GCBOk= @@ -111,8 +111,8 @@ golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38= -golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 h1:tkVvjkPTB7pnW3jnid7kNyAMPVWllTNOf/qKDze4p9o= +golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -136,8 +136,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220403103023-749bd193bc2b h1:vI32FkLJNAWtGD4BwkThwEy6XS7ZLLMHkSkYfF8M0W0= +golang.org/x/net v0.0.0-20220403103023-749bd193bc2b/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -164,8 +164,8 @@ golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 h1:A9i04dxx7Cribqbs8jf3FQLogkL/CV2YN7hj9KWJCkc= -golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb h1:PVGECzEo9Y3uOidtkHGdd347NjLtITfJFO9BxFpmRoo= +golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/proxy/server.go b/proxy/server.go index 8889e4c..89079fc 100644 --- a/proxy/server.go +++ b/proxy/server.go @@ -34,7 +34,7 @@ func RegisterServer(name string, c ServerCreator) { } // ServerFromURL calls the registered creator to create proxy servers. -// dialer is the default upstream dialer so cannot be nil, we can use Default when calling this function. +// proxy can not be nil. func ServerFromURL(s string, proxy Proxy) (Server, error) { if proxy == nil { return nil, errors.New("ServerFromURL: dialer cannot be nil") diff --git a/proxy/ss/cipher/cipher.go b/proxy/ss/cipher/cipher.go index f25ee9c..30c462c 100644 --- a/proxy/ss/cipher/cipher.go +++ b/proxy/ss/cipher/cipher.go @@ -6,8 +6,8 @@ import ( "net" "strings" - "github.com/nadoo/glider/proxy/ss/cipher/internal/shadowaead" - "github.com/nadoo/glider/proxy/ss/cipher/internal/shadowstream" + "github.com/nadoo/glider/proxy/ss/cipher/shadowaead" + "github.com/nadoo/glider/proxy/ss/cipher/shadowstream" ) // Cipher interface. diff --git a/proxy/ss/cipher/internal/shadowaead/cipher.go b/proxy/ss/cipher/shadowaead/cipher.go similarity index 100% rename from proxy/ss/cipher/internal/shadowaead/cipher.go rename to proxy/ss/cipher/shadowaead/cipher.go diff --git a/proxy/ss/cipher/internal/shadowaead/conn.go b/proxy/ss/cipher/shadowaead/conn.go similarity index 100% rename from proxy/ss/cipher/internal/shadowaead/conn.go rename to proxy/ss/cipher/shadowaead/conn.go diff --git a/proxy/ss/cipher/internal/shadowaead/packet.go b/proxy/ss/cipher/shadowaead/packet.go similarity index 100% rename from proxy/ss/cipher/internal/shadowaead/packet.go rename to proxy/ss/cipher/shadowaead/packet.go diff --git a/proxy/ss/cipher/internal/shadowaead/stream.go b/proxy/ss/cipher/shadowaead/stream.go similarity index 99% rename from proxy/ss/cipher/internal/shadowaead/stream.go rename to proxy/ss/cipher/shadowaead/stream.go index 53a0192..6925dda 100644 --- a/proxy/ss/cipher/internal/shadowaead/stream.go +++ b/proxy/ss/cipher/shadowaead/stream.go @@ -25,7 +25,6 @@ type writer struct { io.Writer cipher.AEAD nonce [32]byte - buf []byte } // NewWriter wraps an io.Writer with AEAD encryption. diff --git a/proxy/ss/cipher/internal/shadowstream/cipher.go b/proxy/ss/cipher/shadowstream/cipher.go similarity index 100% rename from proxy/ss/cipher/internal/shadowstream/cipher.go rename to proxy/ss/cipher/shadowstream/cipher.go diff --git a/proxy/ss/cipher/internal/shadowstream/conn.go b/proxy/ss/cipher/shadowstream/conn.go similarity index 100% rename from proxy/ss/cipher/internal/shadowstream/conn.go rename to proxy/ss/cipher/shadowstream/conn.go diff --git a/proxy/ss/cipher/internal/shadowstream/packet.go b/proxy/ss/cipher/shadowstream/packet.go similarity index 100% rename from proxy/ss/cipher/internal/shadowstream/packet.go rename to proxy/ss/cipher/shadowstream/packet.go diff --git a/proxy/ss/cipher/internal/shadowstream/stream.go b/proxy/ss/cipher/shadowstream/stream.go similarity index 100% rename from proxy/ss/cipher/internal/shadowstream/stream.go rename to proxy/ss/cipher/shadowstream/stream.go