From 1fd59a1677b2e2625db725bce0a6f6059fd73ec1 Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Sat, 8 Jan 2022 15:05:55 +0800 Subject: [PATCH] chore: move some packages to pkg folder --- .goreleaser.yml | 5 +++-- config.go | 2 +- dns/client.go | 4 ++-- dns/server.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- main.go | 2 +- {log => pkg/log}/log.go | 0 {pool => pkg/pool}/buffer.go | 0 {pool => pkg/pool}/bufreader.go | 0 {pool => pkg/pool}/bytesbuffer.go | 0 {proxy/protocol => pkg}/smux/LICENSE | 0 {proxy/protocol => pkg}/smux/frame.go | 0 {proxy/protocol => pkg}/smux/mux.go | 0 {proxy/protocol => pkg}/smux/mux_test.go | 0 {proxy/protocol => pkg}/smux/session.go | 2 +- {proxy/protocol => pkg}/smux/session_test.go | 0 {proxy/protocol => pkg}/smux/shaper.go | 0 {proxy/protocol => pkg}/smux/shaper_test.go | 0 {proxy/protocol => pkg}/smux/stream.go | 2 +- pkg/sockopt/bind_linux.go | 16 ++++++++++++++++ pkg/sockopt/bind_others.go | 11 +++++++++++ {proxy/protocol => pkg}/socks/socks.go | 0 proxy/bind_linux.go | 14 -------------- proxy/bind_others.go | 8 -------- proxy/conn.go | 2 +- proxy/direct.go | 14 ++++++++++---- proxy/http/client.go | 4 ++-- proxy/http/http.go | 2 +- proxy/http/request.go | 2 +- proxy/http/server.go | 4 ++-- proxy/kcp/kcp.go | 2 +- proxy/mixed/mixed.go | 2 +- proxy/obfs/http.go | 2 +- proxy/obfs/obfs.go | 2 +- proxy/obfs/tls.go | 2 +- proxy/pxyproto/server.go | 2 +- proxy/redir/redir_linux.go | 2 +- proxy/smux/client.go | 5 ++--- proxy/smux/server.go | 5 ++--- proxy/socks4/socks4.go | 4 ++-- proxy/socks5/client.go | 6 +++--- proxy/socks5/packet.go | 4 ++-- proxy/socks5/server.go | 6 +++--- proxy/socks5/socks5.go | 2 +- proxy/ss/cipher/internal/shadowaead/stream.go | 2 +- proxy/ss/cipher/internal/shadowstream/stream.go | 2 +- proxy/ss/client.go | 4 ++-- proxy/ss/packet.go | 4 ++-- proxy/ss/server.go | 6 +++--- proxy/ss/ss.go | 2 +- proxy/ssh/ssh.go | 2 +- proxy/ssr/internal/cipher/cipher.go | 2 +- proxy/ssr/internal/client.go | 2 +- proxy/ssr/ssr.go | 4 ++-- proxy/tcp/tcp.go | 2 +- proxy/tls/tls.go | 2 +- proxy/tproxy/server.go | 4 ++-- proxy/trojan/client.go | 6 +++--- proxy/trojan/packet.go | 4 ++-- proxy/trojan/server.go | 6 +++--- proxy/udp/udp.go | 4 ++-- proxy/unix/server.go | 4 ++-- proxy/unix/unix.go | 2 +- proxy/vless/addr.go | 2 +- proxy/vless/client.go | 4 ++-- proxy/vless/packet.go | 2 +- proxy/vless/server.go | 4 ++-- proxy/vmess/aead.go | 2 +- proxy/vmess/client.go | 2 +- proxy/vmess/user.go | 2 +- proxy/vmess/vmess.go | 2 +- proxy/ws/client.go | 2 +- proxy/ws/frame.go | 2 +- proxy/ws/server.go | 4 ++-- proxy/ws/ws.go | 2 +- rule/check.go | 2 +- rule/forward.go | 2 +- rule/group.go | 2 +- service/dhcpd/cilent_linux.go | 2 +- service/dhcpd/dhcpd.go | 2 +- service/service.go | 2 +- 82 files changed, 133 insertions(+), 123 deletions(-) rename {log => pkg/log}/log.go (100%) rename {pool => pkg/pool}/buffer.go (100%) rename {pool => pkg/pool}/bufreader.go (100%) rename {pool => pkg/pool}/bytesbuffer.go (100%) rename {proxy/protocol => pkg}/smux/LICENSE (100%) rename {proxy/protocol => pkg}/smux/frame.go (100%) rename {proxy/protocol => pkg}/smux/mux.go (100%) rename {proxy/protocol => pkg}/smux/mux_test.go (100%) rename {proxy/protocol => pkg}/smux/session.go (99%) rename {proxy/protocol => pkg}/smux/session_test.go (100%) rename {proxy/protocol => pkg}/smux/shaper.go (100%) rename {proxy/protocol => pkg}/smux/shaper_test.go (100%) rename {proxy/protocol => pkg}/smux/stream.go (99%) create mode 100644 pkg/sockopt/bind_linux.go create mode 100644 pkg/sockopt/bind_others.go rename {proxy/protocol => pkg}/socks/socks.go (100%) delete mode 100644 proxy/bind_linux.go delete mode 100644 proxy/bind_others.go diff --git a/.goreleaser.yml b/.goreleaser.yml index df6d13e..42514a6 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -23,7 +23,7 @@ builds: env: - CGO_ENABLED=0 # GOOS list to build for. - # For more info refer to: https://golang.org/doc/install/source#environment + # For more info refer to: https://go.dev/doc/install/source#environment # Defaults are darwin and linux. goos: - windows @@ -39,6 +39,7 @@ builds: - mipsle - mips64 - mips64le + - riscv64 goarm: - 6 - 7 @@ -53,7 +54,7 @@ archives: - default name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}" replacements: - darwin: mac + darwin: macos wrap_in_directory: true format: tar.gz format_overrides: diff --git a/config.go b/config.go index d7a31a9..646ce86 100644 --- a/config.go +++ b/config.go @@ -8,7 +8,7 @@ import ( "github.com/nadoo/conflag" "github.com/nadoo/glider/dns" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" "github.com/nadoo/glider/rule" ) diff --git a/dns/client.go b/dns/client.go index 94fff0b..d58ac12 100644 --- a/dns/client.go +++ b/dns/client.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/dns/server.go b/dns/server.go index 329deb7..350de9e 100644 --- a/dns/server.go +++ b/dns/server.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/go.mod b/go.mod index 8176bfd..c9b8b05 100644 --- a/go.mod +++ b/go.mod @@ -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-20210528151154-e40b768296a7 // indirect - golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect + golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d // indirect ) // Replace dependency modules with local developing copy diff --git a/go.sum b/go.sum index 26f07f5..f672d7e 100644 --- a/go.sum +++ b/go.sum @@ -130,8 +130,8 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R 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-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d h1:62NvYBuaanGXR2ZOfwDFkhhl6X1DUgf8qg3GuQvxZsE= +golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= 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= diff --git a/main.go b/main.go index 0e98ae2..063719e 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( "github.com/nadoo/glider/dns" "github.com/nadoo/glider/ipset" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" "github.com/nadoo/glider/rule" "github.com/nadoo/glider/service" diff --git a/log/log.go b/pkg/log/log.go similarity index 100% rename from log/log.go rename to pkg/log/log.go diff --git a/pool/buffer.go b/pkg/pool/buffer.go similarity index 100% rename from pool/buffer.go rename to pkg/pool/buffer.go diff --git a/pool/bufreader.go b/pkg/pool/bufreader.go similarity index 100% rename from pool/bufreader.go rename to pkg/pool/bufreader.go diff --git a/pool/bytesbuffer.go b/pkg/pool/bytesbuffer.go similarity index 100% rename from pool/bytesbuffer.go rename to pkg/pool/bytesbuffer.go diff --git a/proxy/protocol/smux/LICENSE b/pkg/smux/LICENSE similarity index 100% rename from proxy/protocol/smux/LICENSE rename to pkg/smux/LICENSE diff --git a/proxy/protocol/smux/frame.go b/pkg/smux/frame.go similarity index 100% rename from proxy/protocol/smux/frame.go rename to pkg/smux/frame.go diff --git a/proxy/protocol/smux/mux.go b/pkg/smux/mux.go similarity index 100% rename from proxy/protocol/smux/mux.go rename to pkg/smux/mux.go diff --git a/proxy/protocol/smux/mux_test.go b/pkg/smux/mux_test.go similarity index 100% rename from proxy/protocol/smux/mux_test.go rename to pkg/smux/mux_test.go diff --git a/proxy/protocol/smux/session.go b/pkg/smux/session.go similarity index 99% rename from proxy/protocol/smux/session.go rename to pkg/smux/session.go index 9b9654e..7873f99 100644 --- a/proxy/protocol/smux/session.go +++ b/pkg/smux/session.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) const ( diff --git a/proxy/protocol/smux/session_test.go b/pkg/smux/session_test.go similarity index 100% rename from proxy/protocol/smux/session_test.go rename to pkg/smux/session_test.go diff --git a/proxy/protocol/smux/shaper.go b/pkg/smux/shaper.go similarity index 100% rename from proxy/protocol/smux/shaper.go rename to pkg/smux/shaper.go diff --git a/proxy/protocol/smux/shaper_test.go b/pkg/smux/shaper_test.go similarity index 100% rename from proxy/protocol/smux/shaper_test.go rename to pkg/smux/shaper_test.go diff --git a/proxy/protocol/smux/stream.go b/pkg/smux/stream.go similarity index 99% rename from proxy/protocol/smux/stream.go rename to pkg/smux/stream.go index 969ce8a..231f741 100644 --- a/proxy/protocol/smux/stream.go +++ b/pkg/smux/stream.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) // Stream implements net.Conn diff --git a/pkg/sockopt/bind_linux.go b/pkg/sockopt/bind_linux.go new file mode 100644 index 0000000..ed9e067 --- /dev/null +++ b/pkg/sockopt/bind_linux.go @@ -0,0 +1,16 @@ +package sockopt + +import ( + "net" + "syscall" + + "golang.org/x/sys/unix" +) + +func BindControl(iface *net.Interface) func(network, address string, c syscall.RawConn) error { + return func(network, address string, c syscall.RawConn) error { + return c.Control(func(fd uintptr) { + unix.BindToDevice(int(fd), iface.Name) + }) + } +} diff --git a/pkg/sockopt/bind_others.go b/pkg/sockopt/bind_others.go new file mode 100644 index 0000000..ad42ffb --- /dev/null +++ b/pkg/sockopt/bind_others.go @@ -0,0 +1,11 @@ +//go:build !linux +// +build !linux + +package sockopt + +import ( + "net" + "syscall" +) + +func BindControl(iface *net.Interface) func(string, string, syscall.RawConn) error { return nil } diff --git a/proxy/protocol/socks/socks.go b/pkg/socks/socks.go similarity index 100% rename from proxy/protocol/socks/socks.go rename to pkg/socks/socks.go diff --git a/proxy/bind_linux.go b/proxy/bind_linux.go deleted file mode 100644 index dab7734..0000000 --- a/proxy/bind_linux.go +++ /dev/null @@ -1,14 +0,0 @@ -package proxy - -import ( - "net" - "syscall" -) - -func bind(dialer *net.Dialer, iface *net.Interface) { - dialer.Control = func(network, address string, c syscall.RawConn) error { - return c.Control(func(fd uintptr) { - syscall.BindToDevice(int(fd), iface.Name) - }) - } -} diff --git a/proxy/bind_others.go b/proxy/bind_others.go deleted file mode 100644 index c77ec29..0000000 --- a/proxy/bind_others.go +++ /dev/null @@ -1,8 +0,0 @@ -//go:build !linux -// +build !linux - -package proxy - -import "net" - -func bind(dialer *net.Dialer, iface *net.Interface) {} diff --git a/proxy/conn.go b/proxy/conn.go index 36afbc7..edf0b9e 100644 --- a/proxy/conn.go +++ b/proxy/conn.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) var ( diff --git a/proxy/direct.go b/proxy/direct.go index 1f97cce..a3fd276 100644 --- a/proxy/direct.go +++ b/proxy/direct.go @@ -1,11 +1,13 @@ package proxy import ( + "context" "errors" "net" "time" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/sockopt" ) // Direct proxy. @@ -86,7 +88,7 @@ func (d *Direct) dial(network, addr string, localIP net.IP) (net.Conn, error) { dialer := &net.Dialer{LocalAddr: la, Timeout: d.dialTimeout} if d.iface != nil { - bind(dialer, d.iface) + dialer.Control = sockopt.BindControl(d.iface) } c, err := dialer.Dial(network, addr) @@ -107,13 +109,17 @@ func (d *Direct) dial(network, addr string, localIP net.IP) (net.Conn, error) { // DialUDP connects to the given address. func (d *Direct) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) { - // TODO: support specifying local interface var la string if d.ip != nil { la = net.JoinHostPort(d.ip.String(), "0") } - pc, err := net.ListenPacket(network, la) + lc := &net.ListenConfig{} + if d.iface != nil { + lc.Control = sockopt.BindControl(d.iface) + } + + pc, err := lc.ListenPacket(context.Background(), network, la) if err != nil { log.F("ListenPacket error: %s", err) return nil, nil, err diff --git a/proxy/http/client.go b/proxy/http/client.go index 25f862d..c724059 100644 --- a/proxy/http/client.go +++ b/proxy/http/client.go @@ -6,8 +6,8 @@ import ( "net" "net/textproto" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/http/http.go b/proxy/http/http.go index e157a77..6d15886 100644 --- a/proxy/http/http.go +++ b/proxy/http/http.go @@ -11,7 +11,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/http/request.go b/proxy/http/request.go index e5576b8..84f3fe4 100644 --- a/proxy/http/request.go +++ b/proxy/http/request.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" ) // Methods are http methods from rfc. diff --git a/proxy/http/server.go b/proxy/http/server.go index 0613bbe..fe06a30 100644 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/kcp/kcp.go b/proxy/kcp/kcp.go index d73496a..a0b46e9 100644 --- a/proxy/kcp/kcp.go +++ b/proxy/kcp/kcp.go @@ -12,7 +12,7 @@ import ( kcp "github.com/xtaci/kcp-go/v5" "golang.org/x/crypto/pbkdf2" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/mixed/mixed.go b/proxy/mixed/mixed.go index 199dbeb..6a0e52e 100644 --- a/proxy/mixed/mixed.go +++ b/proxy/mixed/mixed.go @@ -4,7 +4,7 @@ import ( "net" "net/url" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" "github.com/nadoo/glider/proxy/http" "github.com/nadoo/glider/proxy/socks5" diff --git a/proxy/obfs/http.go b/proxy/obfs/http.go index 6f8388c..3672d1c 100644 --- a/proxy/obfs/http.go +++ b/proxy/obfs/http.go @@ -7,7 +7,7 @@ import ( "io" "net" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) // HTTPObfs struct diff --git a/proxy/obfs/obfs.go b/proxy/obfs/obfs.go index 003ea61..21d1d38 100644 --- a/proxy/obfs/obfs.go +++ b/proxy/obfs/obfs.go @@ -6,7 +6,7 @@ import ( "net" "net/url" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/obfs/tls.go b/proxy/obfs/tls.go index ff516ff..42b0da0 100644 --- a/proxy/obfs/tls.go +++ b/proxy/obfs/tls.go @@ -17,7 +17,7 @@ import ( "net" "time" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) const ( diff --git a/proxy/pxyproto/server.go b/proxy/pxyproto/server.go index d36f311..db44bad 100644 --- a/proxy/pxyproto/server.go +++ b/proxy/pxyproto/server.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/redir/redir_linux.go b/proxy/redir/redir_linux.go index 240f4d8..6d1c06f 100644 --- a/proxy/redir/redir_linux.go +++ b/proxy/redir/redir_linux.go @@ -7,7 +7,7 @@ import ( "syscall" "unsafe" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/smux/client.go b/proxy/smux/client.go index 457a44b..3174671 100644 --- a/proxy/smux/client.go +++ b/proxy/smux/client.go @@ -6,10 +6,9 @@ import ( "net/url" "sync" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/smux" "github.com/nadoo/glider/proxy" - - "github.com/nadoo/glider/proxy/protocol/smux" ) // SmuxClient struct. diff --git a/proxy/smux/server.go b/proxy/smux/server.go index bf08469..159425f 100644 --- a/proxy/smux/server.go +++ b/proxy/smux/server.go @@ -5,10 +5,9 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/smux" "github.com/nadoo/glider/proxy" - - "github.com/nadoo/glider/proxy/protocol/smux" ) // SmuxServer struct. diff --git a/proxy/socks4/socks4.go b/proxy/socks4/socks4.go index 488c186..61222c3 100644 --- a/proxy/socks4/socks4.go +++ b/proxy/socks4/socks4.go @@ -11,8 +11,8 @@ import ( "net/url" "strconv" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/socks5/client.go b/proxy/socks5/client.go index ddc39ac..f3926de 100644 --- a/proxy/socks5/client.go +++ b/proxy/socks5/client.go @@ -6,10 +6,10 @@ import ( "net" "strconv" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" + "github.com/nadoo/glider/pkg/socks" "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/proxy/protocol/socks" ) // NewSocks5Dialer returns a socks5 proxy dialer. diff --git a/proxy/socks5/packet.go b/proxy/socks5/packet.go index bd7bd9a..75c26ee 100644 --- a/proxy/socks5/packet.go +++ b/proxy/socks5/packet.go @@ -4,8 +4,8 @@ import ( "errors" "net" - "github.com/nadoo/glider/pool" - "github.com/nadoo/glider/proxy/protocol/socks" + "github.com/nadoo/glider/pkg/pool" + "github.com/nadoo/glider/pkg/socks" ) // PktConn . diff --git a/proxy/socks5/server.go b/proxy/socks5/server.go index 8c73746..6906022 100644 --- a/proxy/socks5/server.go +++ b/proxy/socks5/server.go @@ -8,10 +8,10 @@ import ( "sync" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" + "github.com/nadoo/glider/pkg/socks" "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/proxy/protocol/socks" ) var nm sync.Map diff --git a/proxy/socks5/socks5.go b/proxy/socks5/socks5.go index 39ca63a..f190e58 100644 --- a/proxy/socks5/socks5.go +++ b/proxy/socks5/socks5.go @@ -12,7 +12,7 @@ package socks5 import ( "net/url" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/ss/cipher/internal/shadowaead/stream.go b/proxy/ss/cipher/internal/shadowaead/stream.go index db1cf20..53a0192 100644 --- a/proxy/ss/cipher/internal/shadowaead/stream.go +++ b/proxy/ss/cipher/internal/shadowaead/stream.go @@ -10,7 +10,7 @@ import ( "encoding/binary" "io" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) const ( diff --git a/proxy/ss/cipher/internal/shadowstream/stream.go b/proxy/ss/cipher/internal/shadowstream/stream.go index f02f8dc..6d5dde8 100644 --- a/proxy/ss/cipher/internal/shadowstream/stream.go +++ b/proxy/ss/cipher/internal/shadowstream/stream.go @@ -4,7 +4,7 @@ import ( "crypto/cipher" "io" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) const bufSize = 32 * 1024 diff --git a/proxy/ss/client.go b/proxy/ss/client.go index 4996f77..5ea2240 100644 --- a/proxy/ss/client.go +++ b/proxy/ss/client.go @@ -4,9 +4,9 @@ import ( "errors" "net" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/socks" "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/proxy/protocol/socks" ) // NewSSDialer returns a ss proxy dialer. diff --git a/proxy/ss/packet.go b/proxy/ss/packet.go index 416c4cb..ae71da2 100644 --- a/proxy/ss/packet.go +++ b/proxy/ss/packet.go @@ -4,8 +4,8 @@ import ( "errors" "net" - "github.com/nadoo/glider/pool" - "github.com/nadoo/glider/proxy/protocol/socks" + "github.com/nadoo/glider/pkg/pool" + "github.com/nadoo/glider/pkg/socks" ) // PktConn . diff --git a/proxy/ss/server.go b/proxy/ss/server.go index f1fb05f..5369912 100644 --- a/proxy/ss/server.go +++ b/proxy/ss/server.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" + "github.com/nadoo/glider/pkg/socks" "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/proxy/protocol/socks" ) var nm sync.Map diff --git a/proxy/ss/ss.go b/proxy/ss/ss.go index 374c9a8..71351cf 100644 --- a/proxy/ss/ss.go +++ b/proxy/ss/ss.go @@ -3,7 +3,7 @@ package ss import ( "net/url" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" "github.com/nadoo/glider/proxy/ss/cipher" ) diff --git a/proxy/ssh/ssh.go b/proxy/ssh/ssh.go index 0bc9053..697806d 100644 --- a/proxy/ssh/ssh.go +++ b/proxy/ssh/ssh.go @@ -10,7 +10,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/ssr/internal/cipher/cipher.go b/proxy/ssr/internal/cipher/cipher.go index eab92f0..0e79f02 100644 --- a/proxy/ssr/internal/cipher/cipher.go +++ b/proxy/ssr/internal/cipher/cipher.go @@ -18,7 +18,7 @@ import ( "golang.org/x/crypto/cast5" "golang.org/x/crypto/salsa20/salsa" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy/ssr/internal/tools" ) diff --git a/proxy/ssr/internal/client.go b/proxy/ssr/internal/client.go index 4236150..0fd3eab 100644 --- a/proxy/ssr/internal/client.go +++ b/proxy/ssr/internal/client.go @@ -12,7 +12,7 @@ import ( "net" "time" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" "github.com/nadoo/glider/proxy/ssr/internal/cipher" "github.com/nadoo/glider/proxy/ssr/internal/obfs" diff --git a/proxy/ssr/ssr.go b/proxy/ssr/ssr.go index 33ee3be..8ddf2b6 100644 --- a/proxy/ssr/ssr.go +++ b/proxy/ssr/ssr.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/socks" "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/proxy/protocol/socks" "github.com/nadoo/glider/proxy/ssr/internal" "github.com/nadoo/glider/proxy/ssr/internal/cipher" diff --git a/proxy/tcp/tcp.go b/proxy/tcp/tcp.go index 781bcb1..397ec46 100644 --- a/proxy/tcp/tcp.go +++ b/proxy/tcp/tcp.go @@ -5,7 +5,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/tls/tls.go b/proxy/tls/tls.go index 977c268..9a053de 100644 --- a/proxy/tls/tls.go +++ b/proxy/tls/tls.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/tproxy/server.go b/proxy/tproxy/server.go index 13a58f2..5f4aec4 100644 --- a/proxy/tproxy/server.go +++ b/proxy/tproxy/server.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/trojan/client.go b/proxy/trojan/client.go index 49bc8c5..8e22a6e 100644 --- a/proxy/trojan/client.go +++ b/proxy/trojan/client.go @@ -7,10 +7,10 @@ import ( "net" "os" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" + "github.com/nadoo/glider/pkg/socks" "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/proxy/protocol/socks" ) // NewClearTextDialer returns a trojan cleartext proxy dialer. diff --git a/proxy/trojan/packet.go b/proxy/trojan/packet.go index 348b6dd..39a2d2e 100644 --- a/proxy/trojan/packet.go +++ b/proxy/trojan/packet.go @@ -6,8 +6,8 @@ import ( "io" "net" - "github.com/nadoo/glider/pool" - "github.com/nadoo/glider/proxy/protocol/socks" + "github.com/nadoo/glider/pkg/pool" + "github.com/nadoo/glider/pkg/socks" ) // PktConn is a udp Packet.Conn. diff --git a/proxy/trojan/server.go b/proxy/trojan/server.go index 9ad1f1c..d195c7d 100644 --- a/proxy/trojan/server.go +++ b/proxy/trojan/server.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" + "github.com/nadoo/glider/pkg/socks" "github.com/nadoo/glider/proxy" - "github.com/nadoo/glider/proxy/protocol/socks" ) // NewClearTextServer returns a trojan cleartext proxy server. diff --git a/proxy/udp/udp.go b/proxy/udp/udp.go index f69b149..72447d7 100644 --- a/proxy/udp/udp.go +++ b/proxy/udp/udp.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/unix/server.go b/proxy/unix/server.go index fedc385..d35ccf4 100644 --- a/proxy/unix/server.go +++ b/proxy/unix/server.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/unix/unix.go b/proxy/unix/unix.go index ed21ba1..aee57bd 100644 --- a/proxy/unix/unix.go +++ b/proxy/unix/unix.go @@ -4,7 +4,7 @@ import ( "net" "net/url" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/vless/addr.go b/proxy/vless/addr.go index fbf8b4c..1276906 100644 --- a/proxy/vless/addr.go +++ b/proxy/vless/addr.go @@ -6,7 +6,7 @@ import ( "net" "strconv" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) // Atyp is vless addr type. diff --git a/proxy/vless/client.go b/proxy/vless/client.go index 5417fb4..74eead2 100644 --- a/proxy/vless/client.go +++ b/proxy/vless/client.go @@ -6,8 +6,8 @@ import ( "io" "net" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/vless/packet.go b/proxy/vless/packet.go index 9e2aa12..51b8192 100644 --- a/proxy/vless/packet.go +++ b/proxy/vless/packet.go @@ -6,7 +6,7 @@ import ( "io" "net" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) // PktConn is a udp Packet.Conn. diff --git a/proxy/vless/server.go b/proxy/vless/server.go index 48cb191..0b60af6 100644 --- a/proxy/vless/server.go +++ b/proxy/vless/server.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/vmess/aead.go b/proxy/vmess/aead.go index b97609a..acd6b0e 100644 --- a/proxy/vmess/aead.go +++ b/proxy/vmess/aead.go @@ -12,7 +12,7 @@ import ( "io" "net" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) type aeadWriter struct { diff --git a/proxy/vmess/client.go b/proxy/vmess/client.go index 412e3d8..273fbdb 100644 --- a/proxy/vmess/client.go +++ b/proxy/vmess/client.go @@ -19,7 +19,7 @@ import ( "golang.org/x/crypto/chacha20poly1305" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) // Request Options diff --git a/proxy/vmess/user.go b/proxy/vmess/user.go index 441f4e9..bcd06de 100644 --- a/proxy/vmess/user.go +++ b/proxy/vmess/user.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) // User of vmess client. diff --git a/proxy/vmess/vmess.go b/proxy/vmess/vmess.go index 929cdde..a41a305 100644 --- a/proxy/vmess/vmess.go +++ b/proxy/vmess/vmess.go @@ -5,7 +5,7 @@ import ( "net/url" "strconv" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/ws/client.go b/proxy/ws/client.go index 5c7c10b..0c5bdd7 100644 --- a/proxy/ws/client.go +++ b/proxy/ws/client.go @@ -10,7 +10,7 @@ import ( "net/textproto" "os" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/ws/frame.go b/proxy/ws/frame.go index b38a66e..02e2d83 100644 --- a/proxy/ws/frame.go +++ b/proxy/ws/frame.go @@ -28,7 +28,7 @@ import ( "math/rand" "net" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" ) const ( diff --git a/proxy/ws/server.go b/proxy/ws/server.go index aa12c6e..5ffedfd 100644 --- a/proxy/ws/server.go +++ b/proxy/ws/server.go @@ -9,8 +9,8 @@ import ( "net/textproto" "strings" - "github.com/nadoo/glider/log" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/log" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/ws/ws.go b/proxy/ws/ws.go index 3063c82..7de14d0 100644 --- a/proxy/ws/ws.go +++ b/proxy/ws/ws.go @@ -10,7 +10,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/rule/check.go b/rule/check.go index e4c9e24..7457f0c 100644 --- a/rule/check.go +++ b/rule/check.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/pkg/pool" "github.com/nadoo/glider/proxy" ) diff --git a/rule/forward.go b/rule/forward.go index 39d1e75..a7d350e 100644 --- a/rule/forward.go +++ b/rule/forward.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/rule/group.go b/rule/group.go index d6e9f7b..bb046bf 100644 --- a/rule/group.go +++ b/rule/group.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/proxy" ) diff --git a/service/dhcpd/cilent_linux.go b/service/dhcpd/cilent_linux.go index 0fb6ede..18556c7 100644 --- a/service/dhcpd/cilent_linux.go +++ b/service/dhcpd/cilent_linux.go @@ -6,7 +6,7 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4/nclient4" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" ) func existsServer(iface string) (exists bool) { diff --git a/service/dhcpd/dhcpd.go b/service/dhcpd/dhcpd.go index 0e2a48b..eefa484 100644 --- a/service/dhcpd/dhcpd.go +++ b/service/dhcpd/dhcpd.go @@ -10,7 +10,7 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4" "github.com/insomniacslk/dhcp/dhcpv4/server4" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" "github.com/nadoo/glider/service" ) diff --git a/service/service.go b/service/service.go index 28bb6b2..6d14e44 100644 --- a/service/service.go +++ b/service/service.go @@ -3,7 +3,7 @@ package service import ( "strings" - "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pkg/log" ) // Service is a server that can be run.