From fd000c66179960aaf9cfc2e5af72c37b9efab321 Mon Sep 17 00:00:00 2001 From: xjasonlyu Date: Mon, 31 Jan 2022 16:03:10 +0800 Subject: [PATCH] Refactor: standalone metadata module --- {constant => metadata}/metadata.go | 2 +- proxy/base.go | 2 +- proxy/direct.go | 2 +- proxy/http.go | 2 +- proxy/proxy.go | 2 +- proxy/reject.go | 2 +- proxy/shadowsocks.go | 2 +- proxy/socks4.go | 2 +- proxy/socks5.go | 2 +- tunnel/statistic/tracker.go | 2 +- tunnel/tcp.go | 2 +- tunnel/udp.go | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename {constant => metadata}/metadata.go (99%) diff --git a/constant/metadata.go b/metadata/metadata.go similarity index 99% rename from constant/metadata.go rename to metadata/metadata.go index 997a331..d30231b 100755 --- a/constant/metadata.go +++ b/metadata/metadata.go @@ -1,4 +1,4 @@ -package constant +package metadata import ( "bytes" diff --git a/proxy/base.go b/proxy/base.go index bafbdc9..90b19ee 100755 --- a/proxy/base.go +++ b/proxy/base.go @@ -5,7 +5,7 @@ import ( "errors" "net" - M "github.com/xjasonlyu/tun2socks/v2/constant" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy/proto" ) diff --git a/proxy/direct.go b/proxy/direct.go index 1a23f32..b32c6a8 100755 --- a/proxy/direct.go +++ b/proxy/direct.go @@ -5,7 +5,7 @@ import ( "net" "github.com/xjasonlyu/tun2socks/v2/component/dialer" - M "github.com/xjasonlyu/tun2socks/v2/constant" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy/proto" ) diff --git a/proxy/http.go b/proxy/http.go index e694d2a..8acdfed 100644 --- a/proxy/http.go +++ b/proxy/http.go @@ -14,7 +14,7 @@ import ( "net/url" "github.com/xjasonlyu/tun2socks/v2/component/dialer" - M "github.com/xjasonlyu/tun2socks/v2/constant" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy/proto" ) diff --git a/proxy/proxy.go b/proxy/proxy.go index e525136..27cafc7 100755 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -6,7 +6,7 @@ import ( "net" "time" - M "github.com/xjasonlyu/tun2socks/v2/constant" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy/proto" ) diff --git a/proxy/reject.go b/proxy/reject.go index df8f852..3509a71 100644 --- a/proxy/reject.go +++ b/proxy/reject.go @@ -6,7 +6,7 @@ import ( "net" "time" - M "github.com/xjasonlyu/tun2socks/v2/constant" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy/proto" ) diff --git a/proxy/shadowsocks.go b/proxy/shadowsocks.go index 7296aa9..bdea185 100755 --- a/proxy/shadowsocks.go +++ b/proxy/shadowsocks.go @@ -8,7 +8,7 @@ import ( "github.com/xjasonlyu/tun2socks/v2/component/dialer" obfs "github.com/xjasonlyu/tun2socks/v2/component/simple-obfs" - M "github.com/xjasonlyu/tun2socks/v2/constant" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy/proto" "github.com/xjasonlyu/tun2socks/v2/transport/socks5" diff --git a/proxy/socks4.go b/proxy/socks4.go index 4a56254..8ddd363 100644 --- a/proxy/socks4.go +++ b/proxy/socks4.go @@ -6,7 +6,7 @@ import ( "net" "github.com/xjasonlyu/tun2socks/v2/component/dialer" - M "github.com/xjasonlyu/tun2socks/v2/constant" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy/proto" "github.com/xjasonlyu/tun2socks/v2/transport/socks4" ) diff --git a/proxy/socks5.go b/proxy/socks5.go index 0301f2b..d1bed8b 100755 --- a/proxy/socks5.go +++ b/proxy/socks5.go @@ -8,7 +8,7 @@ import ( "net" "github.com/xjasonlyu/tun2socks/v2/component/dialer" - M "github.com/xjasonlyu/tun2socks/v2/constant" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy/proto" "github.com/xjasonlyu/tun2socks/v2/transport/socks5" ) diff --git a/tunnel/statistic/tracker.go b/tunnel/statistic/tracker.go index a5d1283..3ad93dd 100755 --- a/tunnel/statistic/tracker.go +++ b/tunnel/statistic/tracker.go @@ -4,7 +4,7 @@ import ( "net" "time" - M "github.com/xjasonlyu/tun2socks/v2/constant" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/gofrs/uuid" "go.uber.org/atomic" diff --git a/tunnel/tcp.go b/tunnel/tcp.go index f6af101..b64af7e 100755 --- a/tunnel/tcp.go +++ b/tunnel/tcp.go @@ -7,9 +7,9 @@ import ( "time" "github.com/xjasonlyu/tun2socks/v2/common/pool" - M "github.com/xjasonlyu/tun2socks/v2/constant" "github.com/xjasonlyu/tun2socks/v2/core" "github.com/xjasonlyu/tun2socks/v2/log" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy" "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" ) diff --git a/tunnel/udp.go b/tunnel/udp.go index fa80e5b..f088cca 100755 --- a/tunnel/udp.go +++ b/tunnel/udp.go @@ -8,9 +8,9 @@ import ( "github.com/xjasonlyu/tun2socks/v2/common/pool" "github.com/xjasonlyu/tun2socks/v2/component/nat" - M "github.com/xjasonlyu/tun2socks/v2/constant" "github.com/xjasonlyu/tun2socks/v2/core" "github.com/xjasonlyu/tun2socks/v2/log" + M "github.com/xjasonlyu/tun2socks/v2/metadata" "github.com/xjasonlyu/tun2socks/v2/proxy" "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" )