diff --git a/pkg/internal/bufpool/pool.go b/pkg/common/bufpool/pool.go similarity index 100% rename from pkg/internal/bufpool/pool.go rename to pkg/common/bufpool/pool.go diff --git a/pkg/internal/utils/kcp/kcp.go b/pkg/common/util/kcp/kcp.go similarity index 100% rename from pkg/internal/utils/kcp/kcp.go rename to pkg/common/util/kcp/kcp.go diff --git a/pkg/internal/utils/mux/mux.go b/pkg/common/util/mux/mux.go similarity index 100% rename from pkg/internal/utils/mux/mux.go rename to pkg/common/util/mux/mux.go diff --git a/pkg/internal/utils/quic/quic.go b/pkg/common/util/quic/quic.go similarity index 100% rename from pkg/internal/utils/quic/quic.go rename to pkg/common/util/quic/quic.go diff --git a/pkg/internal/utils/socks/conn.go b/pkg/common/util/socks/conn.go similarity index 98% rename from pkg/internal/utils/socks/conn.go rename to pkg/common/util/socks/conn.go index ba1adc2..06ef82b 100644 --- a/pkg/internal/utils/socks/conn.go +++ b/pkg/common/util/socks/conn.go @@ -5,7 +5,7 @@ import ( "net" "github.com/go-gost/gosocks5" - "github.com/go-gost/gost/pkg/internal/bufpool" + "github.com/go-gost/gost/pkg/common/bufpool" ) var ( diff --git a/pkg/internal/utils/socks/socks.go b/pkg/common/util/socks/socks.go similarity index 100% rename from pkg/internal/utils/socks/socks.go rename to pkg/common/util/socks/socks.go diff --git a/pkg/internal/utils/ss/conn.go b/pkg/common/util/ss/conn.go similarity index 97% rename from pkg/internal/utils/ss/conn.go rename to pkg/common/util/ss/conn.go index 8eeeb6c..7304146 100644 --- a/pkg/internal/utils/ss/conn.go +++ b/pkg/common/util/ss/conn.go @@ -5,7 +5,7 @@ import ( "net" "github.com/go-gost/gosocks5" - "github.com/go-gost/gost/pkg/internal/bufpool" + "github.com/go-gost/gost/pkg/common/bufpool" ) var ( diff --git a/pkg/internal/utils/ss/ss.go b/pkg/common/util/ss/ss.go similarity index 100% rename from pkg/internal/utils/ss/ss.go rename to pkg/common/util/ss/ss.go diff --git a/pkg/internal/utils/tcp.go b/pkg/common/util/tcp.go similarity index 97% rename from pkg/internal/utils/tcp.go rename to pkg/common/util/tcp.go index 140d228..b2298fb 100644 --- a/pkg/internal/utils/tcp.go +++ b/pkg/common/util/tcp.go @@ -1,4 +1,4 @@ -package utils +package util import ( "net" diff --git a/pkg/internal/utils/tls/tls.go b/pkg/common/util/tls/tls.go similarity index 100% rename from pkg/internal/utils/tls/tls.go rename to pkg/common/util/tls/tls.go diff --git a/pkg/internal/utils/ws/ws.go b/pkg/common/util/ws/ws.go similarity index 100% rename from pkg/internal/utils/ws/ws.go rename to pkg/common/util/ws/ws.go diff --git a/pkg/connector/socks/v5/connector.go b/pkg/connector/socks/v5/connector.go index a5dd0e8..6e8abf5 100644 --- a/pkg/connector/socks/v5/connector.go +++ b/pkg/connector/socks/v5/connector.go @@ -9,8 +9,8 @@ import ( "time" "github.com/go-gost/gosocks5" + "github.com/go-gost/gost/pkg/common/util/socks" "github.com/go-gost/gost/pkg/connector" - "github.com/go-gost/gost/pkg/internal/utils/socks" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" "github.com/go-gost/gost/pkg/registry" diff --git a/pkg/connector/socks/v5/selector.go b/pkg/connector/socks/v5/selector.go index f3a300f..37aee46 100644 --- a/pkg/connector/socks/v5/selector.go +++ b/pkg/connector/socks/v5/selector.go @@ -6,7 +6,7 @@ import ( "net/url" "github.com/go-gost/gosocks5" - "github.com/go-gost/gost/pkg/internal/utils/socks" + "github.com/go-gost/gost/pkg/common/util/socks" "github.com/go-gost/gost/pkg/logger" ) diff --git a/pkg/connector/ss/connector.go b/pkg/connector/ss/connector.go index 8081cda..803650f 100644 --- a/pkg/connector/ss/connector.go +++ b/pkg/connector/ss/connector.go @@ -8,10 +8,10 @@ import ( "time" "github.com/go-gost/gosocks5" + "github.com/go-gost/gost/pkg/common/bufpool" + "github.com/go-gost/gost/pkg/common/util/socks" + "github.com/go-gost/gost/pkg/common/util/ss" "github.com/go-gost/gost/pkg/connector" - "github.com/go-gost/gost/pkg/internal/bufpool" - "github.com/go-gost/gost/pkg/internal/utils/socks" - "github.com/go-gost/gost/pkg/internal/utils/ss" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" "github.com/go-gost/gost/pkg/registry" diff --git a/pkg/connector/ss/metadata.go b/pkg/connector/ss/metadata.go index 415d624..4157d06 100644 --- a/pkg/connector/ss/metadata.go +++ b/pkg/connector/ss/metadata.go @@ -3,7 +3,7 @@ package ss import ( "time" - "github.com/go-gost/gost/pkg/internal/utils/ss" + "github.com/go-gost/gost/pkg/common/util/ss" md "github.com/go-gost/gost/pkg/metadata" "github.com/shadowsocks/go-shadowsocks2/core" ) diff --git a/pkg/handler/socks/v5/handler.go b/pkg/handler/socks/v5/handler.go index 3015712..624d103 100644 --- a/pkg/handler/socks/v5/handler.go +++ b/pkg/handler/socks/v5/handler.go @@ -8,8 +8,8 @@ import ( "github.com/go-gost/gosocks5" "github.com/go-gost/gost/pkg/bypass" "github.com/go-gost/gost/pkg/chain" + "github.com/go-gost/gost/pkg/common/util/socks" "github.com/go-gost/gost/pkg/handler" - "github.com/go-gost/gost/pkg/internal/utils/socks" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" "github.com/go-gost/gost/pkg/registry" diff --git a/pkg/handler/socks/v5/mbind.go b/pkg/handler/socks/v5/mbind.go index ebdca9a..e2424ff 100644 --- a/pkg/handler/socks/v5/mbind.go +++ b/pkg/handler/socks/v5/mbind.go @@ -7,8 +7,8 @@ import ( "github.com/go-gost/gosocks5" "github.com/go-gost/gost/pkg/chain" + "github.com/go-gost/gost/pkg/common/util/mux" "github.com/go-gost/gost/pkg/handler" - "github.com/go-gost/gost/pkg/internal/utils/mux" ) func (h *socks5Handler) handleMuxBind(ctx context.Context, conn net.Conn, req *gosocks5.Request) { diff --git a/pkg/handler/socks/v5/metadata.go b/pkg/handler/socks/v5/metadata.go index 9036a62..6c2a03c 100644 --- a/pkg/handler/socks/v5/metadata.go +++ b/pkg/handler/socks/v5/metadata.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-gost/gost/pkg/auth" - util_tls "github.com/go-gost/gost/pkg/internal/utils/tls" + util_tls "github.com/go-gost/gost/pkg/common/util/tls" md "github.com/go-gost/gost/pkg/metadata" ) diff --git a/pkg/handler/socks/v5/selector.go b/pkg/handler/socks/v5/selector.go index e739e34..0499c28 100644 --- a/pkg/handler/socks/v5/selector.go +++ b/pkg/handler/socks/v5/selector.go @@ -6,7 +6,7 @@ import ( "github.com/go-gost/gosocks5" "github.com/go-gost/gost/pkg/auth" - "github.com/go-gost/gost/pkg/internal/utils/socks" + "github.com/go-gost/gost/pkg/common/util/socks" "github.com/go-gost/gost/pkg/logger" ) diff --git a/pkg/handler/socks/v5/udp.go b/pkg/handler/socks/v5/udp.go index 807d5d5..27a96af 100644 --- a/pkg/handler/socks/v5/udp.go +++ b/pkg/handler/socks/v5/udp.go @@ -10,8 +10,8 @@ import ( "github.com/go-gost/gosocks5" "github.com/go-gost/gost/pkg/chain" - "github.com/go-gost/gost/pkg/internal/bufpool" - "github.com/go-gost/gost/pkg/internal/utils/socks" + "github.com/go-gost/gost/pkg/common/bufpool" + "github.com/go-gost/gost/pkg/common/util/socks" ) func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, req *gosocks5.Request) { diff --git a/pkg/handler/socks/v5/udp_tun.go b/pkg/handler/socks/v5/udp_tun.go index abae6c6..58223bf 100644 --- a/pkg/handler/socks/v5/udp_tun.go +++ b/pkg/handler/socks/v5/udp_tun.go @@ -7,9 +7,9 @@ import ( "github.com/go-gost/gosocks5" "github.com/go-gost/gost/pkg/chain" + "github.com/go-gost/gost/pkg/common/bufpool" + "github.com/go-gost/gost/pkg/common/util/socks" "github.com/go-gost/gost/pkg/handler" - "github.com/go-gost/gost/pkg/internal/bufpool" - "github.com/go-gost/gost/pkg/internal/utils/socks" ) func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, req *gosocks5.Request) { diff --git a/pkg/handler/ss/handler.go b/pkg/handler/ss/handler.go index 00520f9..24762c4 100644 --- a/pkg/handler/ss/handler.go +++ b/pkg/handler/ss/handler.go @@ -11,8 +11,8 @@ import ( "github.com/go-gost/gosocks5" "github.com/go-gost/gost/pkg/bypass" "github.com/go-gost/gost/pkg/chain" + "github.com/go-gost/gost/pkg/common/util/ss" "github.com/go-gost/gost/pkg/handler" - "github.com/go-gost/gost/pkg/internal/utils/ss" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" "github.com/go-gost/gost/pkg/registry" diff --git a/pkg/handler/ss/metadata.go b/pkg/handler/ss/metadata.go index e31e9bc..697db63 100644 --- a/pkg/handler/ss/metadata.go +++ b/pkg/handler/ss/metadata.go @@ -3,7 +3,7 @@ package ss import ( "time" - "github.com/go-gost/gost/pkg/internal/utils/ss" + "github.com/go-gost/gost/pkg/common/util/ss" md "github.com/go-gost/gost/pkg/metadata" "github.com/shadowsocks/go-shadowsocks2/core" ) diff --git a/pkg/handler/ss/udp.go b/pkg/handler/ss/udp.go index 5f353a8..6cdbbc8 100644 --- a/pkg/handler/ss/udp.go +++ b/pkg/handler/ss/udp.go @@ -6,9 +6,9 @@ import ( "time" "github.com/go-gost/gost/pkg/chain" - "github.com/go-gost/gost/pkg/internal/bufpool" - "github.com/go-gost/gost/pkg/internal/utils/socks" - "github.com/go-gost/gost/pkg/internal/utils/ss" + "github.com/go-gost/gost/pkg/common/bufpool" + "github.com/go-gost/gost/pkg/common/util/socks" + "github.com/go-gost/gost/pkg/common/util/ss" ) func (h *ssHandler) handleUDP(ctx context.Context, raddr net.Addr, conn net.PacketConn) { diff --git a/pkg/handler/transport.go b/pkg/handler/transport.go index 89266ea..daea0f6 100644 --- a/pkg/handler/transport.go +++ b/pkg/handler/transport.go @@ -5,7 +5,7 @@ import ( "io" "net" - "github.com/go-gost/gost/pkg/internal/bufpool" + "github.com/go-gost/gost/pkg/common/bufpool" ) func Transport(rw1, rw2 io.ReadWriter) error { diff --git a/pkg/listener/http2/h2/listener.go b/pkg/listener/http2/h2/listener.go index 6cb44a5..4e11550 100644 --- a/pkg/listener/http2/h2/listener.go +++ b/pkg/listener/http2/h2/listener.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "github.com/go-gost/gost/pkg/internal/utils" - util_tls "github.com/go-gost/gost/pkg/internal/utils/tls" + "github.com/go-gost/gost/pkg/common/util" + tls_util "github.com/go-gost/gost/pkg/common/util/tls" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -50,7 +50,7 @@ func (l *h2Listener) Init(md md.Metadata) (err error) { if err != nil { return } - l.Listener = &utils.TCPKeepAliveListener{ + l.Listener = &util.TCPKeepAliveListener{ TCPListener: ln.(*net.TCPListener), KeepAlivePeriod: l.md.keepAlivePeriod, } @@ -174,7 +174,7 @@ func (l *h2Listener) upgrade(w http.ResponseWriter, r *http.Request) (*conn, err } func (l *h2Listener) parseMetadata(md md.Metadata) (err error) { - l.md.tlsConfig, err = util_tls.LoadTLSConfig( + l.md.tlsConfig, err = tls_util.LoadTLSConfig( md.GetString(certFile), md.GetString(keyFile), md.GetString(caFile), diff --git a/pkg/listener/http2/listener.go b/pkg/listener/http2/listener.go index 35dad9b..b4fa135 100644 --- a/pkg/listener/http2/listener.go +++ b/pkg/listener/http2/listener.go @@ -5,8 +5,8 @@ import ( "net" "net/http" - "github.com/go-gost/gost/pkg/internal/utils" - util_tls "github.com/go-gost/gost/pkg/internal/utils/tls" + "github.com/go-gost/gost/pkg/common/util" + tls_util "github.com/go-gost/gost/pkg/common/util/tls" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -60,7 +60,7 @@ func (l *http2Listener) Init(md md.Metadata) (err error) { l.addr = ln.Addr() ln = tls.NewListener( - &utils.TCPKeepAliveListener{ + &util.TCPKeepAliveListener{ TCPListener: ln.(*net.TCPListener), KeepAlivePeriod: l.md.keepAlivePeriod, }, @@ -127,7 +127,7 @@ func (l *http2Listener) handleFunc(w http.ResponseWriter, r *http.Request) { } func (l *http2Listener) parseMetadata(md md.Metadata) (err error) { - l.md.tlsConfig, err = util_tls.LoadTLSConfig( + l.md.tlsConfig, err = tls_util.LoadTLSConfig( md.GetString(certFile), md.GetString(keyFile), md.GetString(caFile), diff --git a/pkg/listener/kcp/listener.go b/pkg/listener/kcp/listener.go index 09b7c16..12b6b14 100644 --- a/pkg/listener/kcp/listener.go +++ b/pkg/listener/kcp/listener.go @@ -4,7 +4,7 @@ import ( "net" "time" - utils "github.com/go-gost/gost/pkg/internal/utils/kcp" + kcp_util "github.com/go-gost/gost/pkg/common/util/kcp" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -142,7 +142,7 @@ func (l *kcpListener) mux(conn net.Conn) { smuxConfig.KeepAliveInterval = time.Duration(l.md.config.KeepAlive) * time.Second if !l.md.config.NoComp { - conn = utils.KCPCompStreamConn(conn) + conn = kcp_util.KCPCompStreamConn(conn) } mux, err := smux.Server(conn, smuxConfig) diff --git a/pkg/listener/obfs/http/listener.go b/pkg/listener/obfs/http/listener.go index d1a97e3..f80054f 100644 --- a/pkg/listener/obfs/http/listener.go +++ b/pkg/listener/obfs/http/listener.go @@ -3,7 +3,7 @@ package http import ( "net" - "github.com/go-gost/gost/pkg/internal/utils" + "github.com/go-gost/gost/pkg/common/util" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -47,7 +47,7 @@ func (l *obfsListener) Init(md md.Metadata) (err error) { } if l.md.keepAlive { - l.Listener = &utils.TCPKeepAliveListener{ + l.Listener = &util.TCPKeepAliveListener{ TCPListener: ln, KeepAlivePeriod: l.md.keepAlivePeriod, } diff --git a/pkg/listener/obfs/tls/listener.go b/pkg/listener/obfs/tls/listener.go index 20a2973..29d7308 100644 --- a/pkg/listener/obfs/tls/listener.go +++ b/pkg/listener/obfs/tls/listener.go @@ -3,7 +3,7 @@ package tls import ( "net" - "github.com/go-gost/gost/pkg/internal/utils" + "github.com/go-gost/gost/pkg/common/util" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -47,7 +47,7 @@ func (l *obfsListener) Init(md md.Metadata) (err error) { } if l.md.keepAlive { - l.Listener = &utils.TCPKeepAliveListener{ + l.Listener = &util.TCPKeepAliveListener{ TCPListener: ln, KeepAlivePeriod: l.md.keepAlivePeriod, } diff --git a/pkg/listener/quic/listener.go b/pkg/listener/quic/listener.go index 3fbc8ed..84cbe81 100644 --- a/pkg/listener/quic/listener.go +++ b/pkg/listener/quic/listener.go @@ -4,7 +4,7 @@ import ( "context" "net" - utils "github.com/go-gost/gost/pkg/internal/utils/quic" + quic_util "github.com/go-gost/gost/pkg/common/util/quic" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -53,7 +53,7 @@ func (l *quicListener) Init(md md.Metadata) (err error) { } if l.md.cipherKey != nil { - conn = utils.QUICCipherConn(conn, l.md.cipherKey) + conn = quic_util.QUICCipherConn(conn, l.md.cipherKey) } config := &quic.Config{ @@ -120,7 +120,7 @@ func (l *quicListener) mux(ctx context.Context, session quic.Session) { return } - conn := utils.QUICConn(session, stream) + conn := quic_util.QUICConn(session, stream) select { case l.connChan <- conn: case <-stream.Context().Done(): diff --git a/pkg/listener/rtcp/listener.go b/pkg/listener/rtcp/listener.go index 565f2d8..827e2a5 100644 --- a/pkg/listener/rtcp/listener.go +++ b/pkg/listener/rtcp/listener.go @@ -9,7 +9,7 @@ import ( "github.com/go-gost/gosocks5" "github.com/go-gost/gost/pkg/chain" - "github.com/go-gost/gost/pkg/internal/utils/mux" + "github.com/go-gost/gost/pkg/common/util/mux" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" diff --git a/pkg/listener/rtcp/mux.go b/pkg/listener/rtcp/mux.go index 22a0b2b..8040b15 100644 --- a/pkg/listener/rtcp/mux.go +++ b/pkg/listener/rtcp/mux.go @@ -7,8 +7,8 @@ import ( "github.com/go-gost/gosocks5" "github.com/go-gost/gost/pkg/chain" - "github.com/go-gost/gost/pkg/internal/utils/mux" - "github.com/go-gost/gost/pkg/internal/utils/socks" + "github.com/go-gost/gost/pkg/common/util/mux" + "github.com/go-gost/gost/pkg/common/util/socks" ) func (l *rtcpListener) muxAccept() (net.Conn, error) { diff --git a/pkg/listener/tcp/listener.go b/pkg/listener/tcp/listener.go index d2f964b..2fd2368 100644 --- a/pkg/listener/tcp/listener.go +++ b/pkg/listener/tcp/listener.go @@ -3,7 +3,7 @@ package tcp import ( "net" - "github.com/go-gost/gost/pkg/internal/utils" + util "github.com/go-gost/gost/pkg/common/util" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -47,7 +47,7 @@ func (l *tcpListener) Init(md md.Metadata) (err error) { } if l.md.keepAlive { - l.Listener = &utils.TCPKeepAliveListener{ + l.Listener = &util.TCPKeepAliveListener{ TCPListener: ln, KeepAlivePeriod: l.md.keepAlivePeriod, } diff --git a/pkg/listener/tls/listener.go b/pkg/listener/tls/listener.go index 6e8fd84..ac9465b 100644 --- a/pkg/listener/tls/listener.go +++ b/pkg/listener/tls/listener.go @@ -4,8 +4,8 @@ import ( "crypto/tls" "net" - "github.com/go-gost/gost/pkg/internal/utils" - util_tls "github.com/go-gost/gost/pkg/internal/utils/tls" + "github.com/go-gost/gost/pkg/common/util" + tls_util "github.com/go-gost/gost/pkg/common/util/tls" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -45,7 +45,7 @@ func (l *tlsListener) Init(md md.Metadata) (err error) { } ln = tls.NewListener( - &utils.TCPKeepAliveListener{ + &util.TCPKeepAliveListener{ TCPListener: ln.(*net.TCPListener), KeepAlivePeriod: l.md.keepAlivePeriod, }, @@ -57,7 +57,7 @@ func (l *tlsListener) Init(md md.Metadata) (err error) { } func (l *tlsListener) parseMetadata(md md.Metadata) (err error) { - l.md.tlsConfig, err = util_tls.LoadTLSConfig( + l.md.tlsConfig, err = tls_util.LoadTLSConfig( md.GetString(certFile), md.GetString(keyFile), md.GetString(caFile), diff --git a/pkg/listener/tls/mux/listener.go b/pkg/listener/tls/mux/listener.go index 6571b9a..d7e17f6 100644 --- a/pkg/listener/tls/mux/listener.go +++ b/pkg/listener/tls/mux/listener.go @@ -4,7 +4,7 @@ import ( "crypto/tls" "net" - util_tls "github.com/go-gost/gost/pkg/internal/utils/tls" + tls_util "github.com/go-gost/gost/pkg/common/util/tls" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -127,7 +127,7 @@ func (l *mtlsListener) Accept() (conn net.Conn, err error) { } func (l *mtlsListener) parseMetadata(md md.Metadata) (err error) { - l.md.tlsConfig, err = util_tls.LoadTLSConfig( + l.md.tlsConfig, err = tls_util.LoadTLSConfig( md.GetString(certFile), md.GetString(keyFile), md.GetString(caFile), diff --git a/pkg/listener/udp/conn.go b/pkg/listener/udp/conn.go index eba1e6d..5c7f1f6 100644 --- a/pkg/listener/udp/conn.go +++ b/pkg/listener/udp/conn.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/go-gost/gost/pkg/internal/bufpool" + "github.com/go-gost/gost/pkg/common/bufpool" "github.com/go-gost/gost/pkg/logger" ) diff --git a/pkg/listener/udp/listener.go b/pkg/listener/udp/listener.go index 7f04000..89427b6 100644 --- a/pkg/listener/udp/listener.go +++ b/pkg/listener/udp/listener.go @@ -3,7 +3,7 @@ package udp import ( "net" - "github.com/go-gost/gost/pkg/internal/bufpool" + "github.com/go-gost/gost/pkg/common/bufpool" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" diff --git a/pkg/listener/ws/listener.go b/pkg/listener/ws/listener.go index 021ad2b..d8270f7 100644 --- a/pkg/listener/ws/listener.go +++ b/pkg/listener/ws/listener.go @@ -5,8 +5,8 @@ import ( "net" "net/http" - util_tls "github.com/go-gost/gost/pkg/internal/utils/tls" - "github.com/go-gost/gost/pkg/internal/utils/ws" + tls_util "github.com/go-gost/gost/pkg/common/util/tls" + ws_util "github.com/go-gost/gost/pkg/common/util/ws" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -116,7 +116,7 @@ func (l *wsListener) Addr() net.Addr { } func (l *wsListener) parseMetadata(md md.Metadata) (err error) { - l.md.tlsConfig, err = util_tls.LoadTLSConfig( + l.md.tlsConfig, err = tls_util.LoadTLSConfig( md.GetString(certFile), md.GetString(keyFile), md.GetString(caFile), @@ -136,7 +136,7 @@ func (l *wsListener) upgrade(w http.ResponseWriter, r *http.Request) { } select { - case l.connChan <- ws.WebsocketServerConn(conn): + case l.connChan <- ws_util.WebsocketServerConn(conn): default: conn.Close() l.logger.Warn("connection queue is full") diff --git a/pkg/listener/ws/mux/listener.go b/pkg/listener/ws/mux/listener.go index b4bd778..822c116 100644 --- a/pkg/listener/ws/mux/listener.go +++ b/pkg/listener/ws/mux/listener.go @@ -5,8 +5,8 @@ import ( "net" "net/http" - util_tls "github.com/go-gost/gost/pkg/internal/utils/tls" - "github.com/go-gost/gost/pkg/internal/utils/ws" + tls_util "github.com/go-gost/gost/pkg/common/util/tls" + ws_util "github.com/go-gost/gost/pkg/common/util/ws" "github.com/go-gost/gost/pkg/listener" "github.com/go-gost/gost/pkg/logger" md "github.com/go-gost/gost/pkg/metadata" @@ -112,7 +112,7 @@ func (l *mwsListener) Addr() net.Addr { } func (l *mwsListener) parseMetadata(md md.Metadata) (err error) { - l.md.tlsConfig, err = util_tls.LoadTLSConfig( + l.md.tlsConfig, err = tls_util.LoadTLSConfig( md.GetString(certFile), md.GetString(keyFile), md.GetString(caFile), @@ -131,7 +131,7 @@ func (l *mwsListener) upgrade(w http.ResponseWriter, r *http.Request) { return } - l.mux(ws.WebsocketServerConn(conn)) + l.mux(ws_util.WebsocketServerConn(conn)) } func (l *mwsListener) mux(conn net.Conn) {