go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code refactor for common package

Browse Source
This commit is contained in:
ginuerzh 2021-11-15 13:09:45 +08:00
parent ce3d62759a
commit 2c0ce35b0b
40 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkg/internal/bufpool/pool.go → pkg/common/bufpool/pool.go
View File

0
pkg/internal/utils/kcp/kcp.go → pkg/common/util/kcp/kcp.go
View File

0
pkg/internal/utils/mux/mux.go → pkg/common/util/mux/mux.go
View File

0
pkg/internal/utils/quic/quic.go → pkg/common/util/quic/quic.go
View File

2
pkg/internal/utils/socks/conn.go → pkg/common/util/socks/conn.go
View File

@ -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 (

0
pkg/internal/utils/socks/socks.go → pkg/common/util/socks/socks.go
View File

2
pkg/internal/utils/ss/conn.go → pkg/common/util/ss/conn.go
View File

@ -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 (

0
pkg/internal/utils/ss/ss.go → pkg/common/util/ss/ss.go
View File

2
pkg/internal/utils/tcp.go → pkg/common/util/tcp.go
View File

@ -1,4 +1,4 @@
package utils
package util
import (
"net"

0
pkg/internal/utils/tls/tls.go → pkg/common/util/tls/tls.go
View File

0
pkg/internal/utils/ws/ws.go → pkg/common/util/ws/ws.go
View File

2
pkg/connector/socks/v5/connector.go
View File

@ -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"

2
pkg/connector/socks/v5/selector.go
View File

@ -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"
)

6
pkg/connector/ss/connector.go
View File

@ -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"

2
pkg/connector/ss/metadata.go
View File

@ -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"
)

2
pkg/handler/socks/v5/handler.go
View File

@ -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"

2
pkg/handler/socks/v5/mbind.go
View File

@ -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) {

2
pkg/handler/socks/v5/metadata.go
View File

@ -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"
)

2
pkg/handler/socks/v5/selector.go
View File

@ -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"
)

4
pkg/handler/socks/v5/udp.go
View File

@ -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) {

4
pkg/handler/socks/v5/udp_tun.go
View File

@ -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) {

2
pkg/handler/ss/handler.go
View File

@ -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"

2
pkg/handler/ss/metadata.go
View File

@ -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"
)

6
pkg/handler/ss/udp.go
View File

@ -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) {

2
pkg/handler/transport.go
View File

@ -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 {

8
pkg/listener/http2/h2/listener.go
View File

@ -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),

8
pkg/listener/http2/listener.go
View File

@ -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),

4
pkg/listener/kcp/listener.go
View File

@ -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)

4
pkg/listener/obfs/http/listener.go
View File

@ -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,
}

4
pkg/listener/obfs/tls/listener.go
View File

@ -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,
}

6
pkg/listener/quic/listener.go
View File

@ -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():

2
pkg/listener/rtcp/listener.go
View File

@ -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"

4
pkg/listener/rtcp/mux.go
View File

@ -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) {

4
pkg/listener/tcp/listener.go
View File

@ -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,
}

8
pkg/listener/tls/listener.go
View File

@ -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),

4
pkg/listener/tls/mux/listener.go
View File

@ -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),

2
pkg/listener/udp/conn.go
View File

@ -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"
)

2
pkg/listener/udp/listener.go
View File

@ -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"

8
pkg/listener/ws/listener.go
View File

@ -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")

8
pkg/listener/ws/mux/listener.go
View File

@ -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) {