From edfca215c54953f30e5f953c2400cb6a869c3d29 Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Thu, 1 Oct 2020 22:49:14 +0800 Subject: [PATCH] general: restructure package, move socks to proxy --- config.go | 2 +- dns/cache.go | 2 +- dns/client.go | 4 ++-- dns/server.go | 4 ++-- {common/log => log}/log.go | 0 main.go | 2 +- {common/pool => pool}/buffer.go | 0 {common/pool => pool}/writebuf.go | 0 proxy/conn.go | 2 +- proxy/direct.go | 2 +- 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/redir/redir_linux.go | 4 ++-- {common => proxy}/socks/socks.go | 0 proxy/socks4/socks4.go | 4 ++-- proxy/socks5/packet.go | 6 +++--- proxy/socks5/socks5.go | 6 +++--- proxy/ss/packet.go | 4 ++-- proxy/ss/ss.go | 6 +++--- proxy/ssh/ssh.go | 2 +- proxy/ssr/ssr.go | 4 ++-- proxy/tcptun/tcptun.go | 2 +- proxy/tls/tls.go | 2 +- proxy/trojan/packet.go | 4 ++-- proxy/trojan/trojan.go | 6 +++--- proxy/udptun/udptun.go | 2 +- proxy/unix/unix.go | 2 +- proxy/uottun/uottun.go | 2 +- proxy/vless/client.go | 2 +- proxy/vmess/chunk.go | 2 +- proxy/vmess/client.go | 2 +- proxy/vmess/user.go | 2 +- proxy/vmess/vmess.go | 2 +- proxy/ws/client.go | 2 +- proxy/ws/ws.go | 2 +- rule/forward.go | 2 +- rule/group.go | 2 +- rule/proxy.go | 2 +- service/dhcpd/dhcpd.go | 2 +- service/service.go | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) rename {common/log => log}/log.go (100%) rename {common/pool => pool}/buffer.go (100%) rename {common/pool => pool}/writebuf.go (100%) rename {common => proxy}/socks/socks.go (100%) diff --git a/config.go b/config.go index 65ddd9a..a29171f 100644 --- a/config.go +++ b/config.go @@ -7,8 +7,8 @@ import ( "github.com/nadoo/conflag" - "github.com/nadoo/glider/common/log" "github.com/nadoo/glider/dns" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/rule" ) diff --git a/dns/cache.go b/dns/cache.go index a172034..329ff05 100644 --- a/dns/cache.go +++ b/dns/cache.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/pool" ) // LongTTL is 50 years duration in seconds, used for none-expired items. diff --git a/dns/client.go b/dns/client.go index fc7c9fb..7e5e5f7 100644 --- a/dns/client.go +++ b/dns/client.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" ) diff --git a/dns/server.go b/dns/server.go index 6acf529..c44e63b 100644 --- a/dns/server.go +++ b/dns/server.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" ) diff --git a/common/log/log.go b/log/log.go similarity index 100% rename from common/log/log.go rename to log/log.go diff --git a/main.go b/main.go index a2d2d43..7045a6c 100644 --- a/main.go +++ b/main.go @@ -9,9 +9,9 @@ import ( "syscall" "time" - "github.com/nadoo/glider/common/log" "github.com/nadoo/glider/dns" "github.com/nadoo/glider/ipset" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" "github.com/nadoo/glider/rule" "github.com/nadoo/glider/service" diff --git a/common/pool/buffer.go b/pool/buffer.go similarity index 100% rename from common/pool/buffer.go rename to pool/buffer.go diff --git a/common/pool/writebuf.go b/pool/writebuf.go similarity index 100% rename from common/pool/writebuf.go rename to pool/writebuf.go diff --git a/proxy/conn.go b/proxy/conn.go index 4e64a40..e59a146 100644 --- a/proxy/conn.go +++ b/proxy/conn.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/pool" ) const ( diff --git a/proxy/direct.go b/proxy/direct.go index 81b60e3..969283e 100644 --- a/proxy/direct.go +++ b/proxy/direct.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" ) // Direct proxy. diff --git a/proxy/http/client.go b/proxy/http/client.go index da44e7e..5a07039 100644 --- a/proxy/http/client.go +++ b/proxy/http/client.go @@ -6,8 +6,8 @@ import ( "net" "net/textproto" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/http/http.go b/proxy/http/http.go index eeef7c5..e157a77 100644 --- a/proxy/http/http.go +++ b/proxy/http/http.go @@ -11,7 +11,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/http/request.go b/proxy/http/request.go index 26b4090..b7f3331 100644 --- a/proxy/http/request.go +++ b/proxy/http/request.go @@ -8,7 +8,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" ) // Methods are http methods from rfc. diff --git a/proxy/http/server.go b/proxy/http/server.go index 1c6abd6..5fc420e 100644 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/kcp/kcp.go b/proxy/kcp/kcp.go index 6e45a8b..0ce6ed2 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/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/mixed/mixed.go b/proxy/mixed/mixed.go index e53908c..ba12fbc 100644 --- a/proxy/mixed/mixed.go +++ b/proxy/mixed/mixed.go @@ -5,7 +5,7 @@ import ( "net" "net/url" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/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 5aa9690..9d5eb26 100644 --- a/proxy/obfs/http.go +++ b/proxy/obfs/http.go @@ -7,7 +7,7 @@ import ( "io" "net" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/pool" ) // HTTPObfs struct diff --git a/proxy/obfs/obfs.go b/proxy/obfs/obfs.go index cd0f390..8a8a4af 100644 --- a/proxy/obfs/obfs.go +++ b/proxy/obfs/obfs.go @@ -6,7 +6,7 @@ import ( "net" "net/url" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/obfs/tls.go b/proxy/obfs/tls.go index 2d2b6c2..f25ff50 100644 --- a/proxy/obfs/tls.go +++ b/proxy/obfs/tls.go @@ -18,7 +18,7 @@ import ( "net" "time" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/pool" ) const ( diff --git a/proxy/redir/redir_linux.go b/proxy/redir/redir_linux.go index 92ccc21..a5f4e28 100644 --- a/proxy/redir/redir_linux.go +++ b/proxy/redir/redir_linux.go @@ -11,9 +11,9 @@ import ( "syscall" "unsafe" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/socks" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" + "github.com/nadoo/glider/proxy/socks" ) const ( diff --git a/common/socks/socks.go b/proxy/socks/socks.go similarity index 100% rename from common/socks/socks.go rename to proxy/socks/socks.go diff --git a/proxy/socks4/socks4.go b/proxy/socks4/socks4.go index 7a269c5..df7d718 100644 --- a/proxy/socks4/socks4.go +++ b/proxy/socks4/socks4.go @@ -11,8 +11,8 @@ import ( "net/url" "strconv" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/socks5/packet.go b/proxy/socks5/packet.go index 593429f..67b0e88 100644 --- a/proxy/socks5/packet.go +++ b/proxy/socks5/packet.go @@ -4,9 +4,9 @@ import ( "errors" "net" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/pool" - "github.com/nadoo/glider/common/socks" + "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/proxy/socks" ) // PktConn . diff --git a/proxy/socks5/socks5.go b/proxy/socks5/socks5.go index 2f14f5a..de1d532 100644 --- a/proxy/socks5/socks5.go +++ b/proxy/socks5/socks5.go @@ -19,10 +19,10 @@ import ( "sync" "time" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/pool" - "github.com/nadoo/glider/common/socks" + "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" + "github.com/nadoo/glider/proxy/socks" ) // Version is socks5 version number. diff --git a/proxy/ss/packet.go b/proxy/ss/packet.go index 27d4ad4..cb59369 100644 --- a/proxy/ss/packet.go +++ b/proxy/ss/packet.go @@ -4,8 +4,8 @@ import ( "errors" "net" - "github.com/nadoo/glider/common/pool" - "github.com/nadoo/glider/common/socks" + "github.com/nadoo/glider/pool" + "github.com/nadoo/glider/proxy/socks" ) // PktConn . diff --git a/proxy/ss/ss.go b/proxy/ss/ss.go index de45b1e..5a53efa 100644 --- a/proxy/ss/ss.go +++ b/proxy/ss/ss.go @@ -10,10 +10,10 @@ import ( "github.com/nadoo/go-shadowsocks2/core" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/pool" - "github.com/nadoo/glider/common/socks" + "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" + "github.com/nadoo/glider/proxy/socks" ) // SS is a base ss struct. diff --git a/proxy/ssh/ssh.go b/proxy/ssh/ssh.go index ba7bce0..d030635 100644 --- a/proxy/ssh/ssh.go +++ b/proxy/ssh/ssh.go @@ -9,7 +9,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/ssr/ssr.go b/proxy/ssr/ssr.go index d06df37..4797fde 100644 --- a/proxy/ssr/ssr.go +++ b/proxy/ssr/ssr.go @@ -13,9 +13,9 @@ import ( ssrinfo "github.com/mzz2017/shadowsocksR/ssr" "github.com/mzz2017/shadowsocksR/streamCipher" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/socks" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" + "github.com/nadoo/glider/proxy/socks" ) func init() { diff --git a/proxy/tcptun/tcptun.go b/proxy/tcptun/tcptun.go index 2db3927..013a78d 100644 --- a/proxy/tcptun/tcptun.go +++ b/proxy/tcptun/tcptun.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/tls/tls.go b/proxy/tls/tls.go index a20af1f..471b461 100644 --- a/proxy/tls/tls.go +++ b/proxy/tls/tls.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/trojan/packet.go b/proxy/trojan/packet.go index 09d284f..309623d 100644 --- a/proxy/trojan/packet.go +++ b/proxy/trojan/packet.go @@ -6,9 +6,9 @@ import ( "io" "net" - "github.com/nadoo/glider/common/pool" - "github.com/nadoo/glider/common/socks" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" + "github.com/nadoo/glider/proxy/socks" ) // PktConn . diff --git a/proxy/trojan/trojan.go b/proxy/trojan/trojan.go index 8978f1e..b8c8d38 100644 --- a/proxy/trojan/trojan.go +++ b/proxy/trojan/trojan.go @@ -11,10 +11,10 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" - "github.com/nadoo/glider/common/pool" - "github.com/nadoo/glider/common/socks" + "github.com/nadoo/glider/log" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" + "github.com/nadoo/glider/proxy/socks" ) // Trojan is a base trojan struct diff --git a/proxy/udptun/udptun.go b/proxy/udptun/udptun.go index 9b1c778..e974829 100644 --- a/proxy/udptun/udptun.go +++ b/proxy/udptun/udptun.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/unix/unix.go b/proxy/unix/unix.go index c38fdce..027305e 100644 --- a/proxy/unix/unix.go +++ b/proxy/unix/unix.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/uottun/uottun.go b/proxy/uottun/uottun.go index 4f3699c..cce2ccb 100644 --- a/proxy/uottun/uottun.go +++ b/proxy/uottun/uottun.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/vless/client.go b/proxy/vless/client.go index 4fe1fc4..e4233a3 100644 --- a/proxy/vless/client.go +++ b/proxy/vless/client.go @@ -9,7 +9,7 @@ import ( "net" "strings" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/pool" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/vmess/chunk.go b/proxy/vmess/chunk.go index 0f6ec7a..797df17 100644 --- a/proxy/vmess/chunk.go +++ b/proxy/vmess/chunk.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "io" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/pool" ) const ( diff --git a/proxy/vmess/client.go b/proxy/vmess/client.go index 370cde1..e4a4e23 100644 --- a/proxy/vmess/client.go +++ b/proxy/vmess/client.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/pool" "golang.org/x/crypto/chacha20poly1305" ) diff --git a/proxy/vmess/user.go b/proxy/vmess/user.go index 957355a..60379b5 100644 --- a/proxy/vmess/user.go +++ b/proxy/vmess/user.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/pool" ) // User of vmess client. diff --git a/proxy/vmess/vmess.go b/proxy/vmess/vmess.go index c3d6c93..12de8d7 100644 --- a/proxy/vmess/vmess.go +++ b/proxy/vmess/vmess.go @@ -6,7 +6,7 @@ import ( "net/url" "strconv" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/proxy/ws/client.go b/proxy/ws/client.go index 3fe861b..aa88b46 100644 --- a/proxy/ws/client.go +++ b/proxy/ws/client.go @@ -11,7 +11,7 @@ import ( "net/textproto" "strings" - "github.com/nadoo/glider/common/pool" + "github.com/nadoo/glider/pool" ) var keyGUID = []byte("258EAFA5-E914-47DA-95CA-C5AB0DC85B11") diff --git a/proxy/ws/ws.go b/proxy/ws/ws.go index e798659..8523d31 100644 --- a/proxy/ws/ws.go +++ b/proxy/ws/ws.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/rule/forward.go b/rule/forward.go index a857d5e..76273cf 100644 --- a/rule/forward.go +++ b/rule/forward.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/rule/group.go b/rule/group.go index 8320933..c2dcbd7 100644 --- a/rule/group.go +++ b/rule/group.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/rule/proxy.go b/rule/proxy.go index 47c3c4b..a70e19b 100644 --- a/rule/proxy.go +++ b/rule/proxy.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/proxy" ) diff --git a/service/dhcpd/dhcpd.go b/service/dhcpd/dhcpd.go index 9429091..4600edd 100644 --- a/service/dhcpd/dhcpd.go +++ b/service/dhcpd/dhcpd.go @@ -10,7 +10,7 @@ import ( "github.com/insomniacslk/dhcp/dhcpv4/nclient4" "github.com/insomniacslk/dhcp/dhcpv4/server4" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" "github.com/nadoo/glider/service" ) diff --git a/service/service.go b/service/service.go index c8baf23..28bb6b2 100644 --- a/service/service.go +++ b/service/service.go @@ -3,7 +3,7 @@ package service import ( "strings" - "github.com/nadoo/glider/common/log" + "github.com/nadoo/glider/log" ) // Service is a server that can be run.