From a7fddd1d7c06b3a2e1fd52f56cb409fcfc52def4 Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Mon, 14 Mar 2022 17:54:29 +0800 Subject: [PATCH] refactor common/util --- pkg/chain/route.go | 2 +- pkg/{internal => common}/util/udp/conn.go | 0 pkg/{internal => common}/util/udp/listener.go | 0 pkg/{internal => common}/util/udp/pool.go | 0 pkg/connector/socks/v5/bind.go | 4 ++-- pkg/connector/socks/v5/listener.go | 2 +- pkg/handler/socks/v5/mbind.go | 2 +- pkg/{common => internal}/util/mux/mux.go | 0 pkg/listener/udp/listener.go | 2 +- 9 files changed, 6 insertions(+), 6 deletions(-) rename pkg/{internal => common}/util/udp/conn.go (100%) rename pkg/{internal => common}/util/udp/listener.go (100%) rename pkg/{internal => common}/util/udp/pool.go (100%) rename pkg/{common => internal}/util/mux/mux.go (100%) diff --git a/pkg/chain/route.go b/pkg/chain/route.go index 3d81935..033d4e9 100644 --- a/pkg/chain/route.go +++ b/pkg/chain/route.go @@ -8,8 +8,8 @@ import ( "time" "github.com/go-gost/gost/v3/pkg/common/net/dialer" + "github.com/go-gost/gost/v3/pkg/common/util/udp" "github.com/go-gost/gost/v3/pkg/connector" - "github.com/go-gost/gost/v3/pkg/internal/util/udp" "github.com/go-gost/gost/v3/pkg/logger" ) diff --git a/pkg/internal/util/udp/conn.go b/pkg/common/util/udp/conn.go similarity index 100% rename from pkg/internal/util/udp/conn.go rename to pkg/common/util/udp/conn.go diff --git a/pkg/internal/util/udp/listener.go b/pkg/common/util/udp/listener.go similarity index 100% rename from pkg/internal/util/udp/listener.go rename to pkg/common/util/udp/listener.go diff --git a/pkg/internal/util/udp/pool.go b/pkg/common/util/udp/pool.go similarity index 100% rename from pkg/internal/util/udp/pool.go rename to pkg/common/util/udp/pool.go diff --git a/pkg/connector/socks/v5/bind.go b/pkg/connector/socks/v5/bind.go index 056224c..89714d3 100644 --- a/pkg/connector/socks/v5/bind.go +++ b/pkg/connector/socks/v5/bind.go @@ -6,10 +6,10 @@ import ( "net" "github.com/go-gost/gosocks5" - "github.com/go-gost/gost/v3/pkg/common/util/mux" + "github.com/go-gost/gost/v3/pkg/common/util/udp" "github.com/go-gost/gost/v3/pkg/connector" + "github.com/go-gost/gost/v3/pkg/internal/util/mux" "github.com/go-gost/gost/v3/pkg/internal/util/socks" - "github.com/go-gost/gost/v3/pkg/internal/util/udp" "github.com/go-gost/gost/v3/pkg/logger" ) diff --git a/pkg/connector/socks/v5/listener.go b/pkg/connector/socks/v5/listener.go index 8881075..6409a40 100644 --- a/pkg/connector/socks/v5/listener.go +++ b/pkg/connector/socks/v5/listener.go @@ -5,7 +5,7 @@ import ( "net" "github.com/go-gost/gosocks5" - "github.com/go-gost/gost/v3/pkg/common/util/mux" + "github.com/go-gost/gost/v3/pkg/internal/util/mux" "github.com/go-gost/gost/v3/pkg/logger" ) diff --git a/pkg/handler/socks/v5/mbind.go b/pkg/handler/socks/v5/mbind.go index 36a8fb8..c2e0eb9 100644 --- a/pkg/handler/socks/v5/mbind.go +++ b/pkg/handler/socks/v5/mbind.go @@ -8,7 +8,7 @@ import ( "github.com/go-gost/gosocks5" netpkg "github.com/go-gost/gost/v3/pkg/common/net" - "github.com/go-gost/gost/v3/pkg/common/util/mux" + "github.com/go-gost/gost/v3/pkg/internal/util/mux" "github.com/go-gost/gost/v3/pkg/logger" ) diff --git a/pkg/common/util/mux/mux.go b/pkg/internal/util/mux/mux.go similarity index 100% rename from pkg/common/util/mux/mux.go rename to pkg/internal/util/mux/mux.go diff --git a/pkg/listener/udp/listener.go b/pkg/listener/udp/listener.go index b9f2476..3e8e199 100644 --- a/pkg/listener/udp/listener.go +++ b/pkg/listener/udp/listener.go @@ -4,7 +4,7 @@ import ( "net" "github.com/go-gost/gost/v3/pkg/common/metrics" - "github.com/go-gost/gost/v3/pkg/internal/util/udp" + "github.com/go-gost/gost/v3/pkg/common/util/udp" "github.com/go-gost/gost/v3/pkg/listener" "github.com/go-gost/gost/v3/pkg/logger" md "github.com/go-gost/gost/v3/pkg/metadata"