From 36947bcbd9f3af9d20a3e81cb80f0cc6e8930cf7 Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Wed, 16 Mar 2022 20:06:34 +0800 Subject: [PATCH] fix imports --- connector/http2/connector.go | 8 ++++---- connector/http2/metadata.go | 2 +- connector/relay/bind.go | 6 +++--- connector/relay/connector.go | 6 +++--- connector/relay/listener.go | 2 +- connector/relay/metadata.go | 2 +- connector/sni/connector.go | 6 +++--- connector/sni/metadata.go | 2 +- connector/ss/connector.go | 8 ++++---- connector/ss/metadata.go | 2 +- connector/ss/udp/connector.go | 6 +++--- connector/ss/udp/metadata.go | 2 +- connector/sshd/connector.go | 6 +++--- dialer/ftcp/dialer.go | 8 ++++---- dialer/ftcp/metadata.go | 2 +- dialer/grpc/dialer.go | 6 +++--- dialer/grpc/metadata.go | 2 +- dialer/http2/conn.go | 2 +- dialer/http2/dialer.go | 10 +++++----- dialer/http2/h2/dialer.go | 8 ++++---- dialer/http2/h2/metadata.go | 2 +- dialer/http2/metadata.go | 2 +- dialer/http3/dialer.go | 6 +++--- dialer/http3/metadata.go | 2 +- dialer/icmp/dialer.go | 8 ++++---- dialer/icmp/metadata.go | 2 +- dialer/kcp/dialer.go | 8 ++++---- dialer/kcp/metadata.go | 2 +- dialer/mtls/dialer.go | 8 ++++---- dialer/mtls/metadata.go | 2 +- dialer/mws/dialer.go | 6 +++--- dialer/mws/metadata.go | 2 +- dialer/obfs/http/conn.go | 2 +- dialer/obfs/http/dialer.go | 8 ++++---- dialer/obfs/http/metadata.go | 2 +- dialer/obfs/tls/dialer.go | 8 ++++---- dialer/obfs/tls/metadata.go | 2 +- dialer/pht/dialer.go | 8 ++++---- dialer/pht/metadata.go | 2 +- dialer/quic/dialer.go | 8 ++++---- dialer/quic/metadata.go | 2 +- dialer/ssh/dialer.go | 8 ++++---- dialer/ssh/metadata.go | 2 +- dialer/sshd/dialer.go | 6 +++--- dialer/sshd/metadata.go | 2 +- dialer/ws/dialer.go | 6 +++--- dialer/ws/metadata.go | 2 +- go.mod | 8 +++----- go.sum | 23 +++++++---------------- handler/dns/handler.go | 18 +++++++++--------- handler/dns/metadata.go | 2 +- handler/http2/handler.go | 12 ++++++------ handler/http2/metadata.go | 2 +- handler/redirect/handler.go | 10 +++++----- handler/redirect/metadata.go | 2 +- handler/relay/bind.go | 6 +++--- handler/relay/connect.go | 4 ++-- handler/relay/forward.go | 4 ++-- handler/relay/handler.go | 8 ++++---- handler/relay/metadata.go | 2 +- handler/sni/handler.go | 12 ++++++------ handler/sni/metadata.go | 2 +- handler/ss/handler.go | 10 +++++----- handler/ss/metadata.go | 2 +- handler/ss/udp/handler.go | 12 ++++++------ handler/ss/udp/metadata.go | 2 +- handler/sshd/handler.go | 12 ++++++------ handler/sshd/metadata.go | 2 +- handler/tap/handler.go | 12 ++++++------ handler/tap/metadata.go | 2 +- handler/tun/handler.go | 12 ++++++------ handler/tun/metadata.go | 2 +- internal/util/grpc/proto/gost.proto | 2 +- internal/util/icmp/conn.go | 4 ++-- internal/util/pht/client.go | 2 +- internal/util/pht/conn.go | 2 +- internal/util/pht/server.go | 4 ++-- internal/util/relay/conn.go | 2 +- internal/util/ss/conn.go | 2 +- internal/util/ssh/ssh.go | 2 +- listener/dns/listener.go | 8 ++++---- listener/dns/metadata.go | 2 +- listener/ftcp/listener.go | 8 ++++---- listener/grpc/listener.go | 10 +++++----- listener/grpc/metadata.go | 2 +- listener/grpc/server.go | 2 +- listener/http2/conn.go | 2 +- listener/http2/h2/listener.go | 10 +++++----- listener/http2/h2/metadata.go | 2 +- listener/http2/listener.go | 10 +++++----- listener/http2/metadata.go | 2 +- listener/http3/listener.go | 8 ++++---- listener/http3/metadata.go | 2 +- listener/icmp/listener.go | 10 +++++----- listener/icmp/metadata.go | 2 +- listener/kcp/listener.go | 10 +++++----- listener/kcp/metadata.go | 2 +- listener/mtls/listener.go | 10 +++++----- listener/mtls/metadata.go | 2 +- listener/mws/listener.go | 10 +++++----- listener/mws/metadata.go | 2 +- listener/obfs/http/conn.go | 2 +- listener/obfs/http/listener.go | 10 +++++----- listener/obfs/http/metadata.go | 2 +- listener/obfs/tls/listener.go | 10 +++++----- listener/obfs/tls/metadata.go | 2 +- listener/pht/listener.go | 8 ++++---- listener/pht/metadata.go | 2 +- listener/quic/listener.go | 8 ++++---- listener/quic/metadata.go | 2 +- listener/redirect/udp/conn.go | 2 +- listener/redirect/udp/listener.go | 8 ++++---- listener/redirect/udp/listener_linux.go | 2 +- listener/redirect/udp/metadata.go | 2 +- listener/ssh/listener.go | 10 +++++----- listener/ssh/metadata.go | 4 ++-- listener/sshd/listener.go | 10 +++++----- listener/sshd/metadata.go | 4 ++-- listener/tap/conn.go | 2 +- listener/tap/listener.go | 8 ++++---- listener/tap/metadata.go | 2 +- listener/tun/conn.go | 2 +- listener/tun/listener.go | 10 +++++----- listener/tun/metadata.go | 2 +- listener/ws/listener.go | 10 +++++----- listener/ws/metadata.go | 2 +- 126 files changed, 324 insertions(+), 335 deletions(-) diff --git a/connector/http2/connector.go b/connector/http2/connector.go index 737c31e..5f49d5f 100644 --- a/connector/http2/connector.go +++ b/connector/http2/connector.go @@ -12,10 +12,10 @@ import ( "net/url" "time" - "github.com/go-gost/gost/v3/pkg/connector" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/connector" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ) func init() { diff --git a/connector/http2/metadata.go b/connector/http2/metadata.go index 3937cb6..13f0bff 100644 --- a/connector/http2/metadata.go +++ b/connector/http2/metadata.go @@ -3,7 +3,7 @@ package http2 import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/connector/relay/bind.go b/connector/relay/bind.go index e74b6f2..a8df615 100644 --- a/connector/relay/bind.go +++ b/connector/relay/bind.go @@ -6,9 +6,9 @@ import ( "net" "strconv" - "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/logger" + "github.com/go-gost/core/common/util/udp" + "github.com/go-gost/core/connector" + "github.com/go-gost/core/logger" "github.com/go-gost/relay" "github.com/go-gost/x/internal/util/mux" relay_util "github.com/go-gost/x/internal/util/relay" diff --git a/connector/relay/connector.go b/connector/relay/connector.go index ee7de80..351f726 100644 --- a/connector/relay/connector.go +++ b/connector/relay/connector.go @@ -6,9 +6,9 @@ import ( "net" "time" - "github.com/go-gost/gost/v3/pkg/connector" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/connector" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/go-gost/relay" relay_util "github.com/go-gost/x/internal/util/relay" ) diff --git a/connector/relay/listener.go b/connector/relay/listener.go index 199d445..d6b1cbd 100644 --- a/connector/relay/listener.go +++ b/connector/relay/listener.go @@ -5,7 +5,7 @@ import ( "net" "strconv" - "github.com/go-gost/gost/v3/pkg/logger" + "github.com/go-gost/core/logger" "github.com/go-gost/relay" "github.com/go-gost/x/internal/util/mux" ) diff --git a/connector/relay/metadata.go b/connector/relay/metadata.go index ac93fbb..0982a95 100644 --- a/connector/relay/metadata.go +++ b/connector/relay/metadata.go @@ -3,7 +3,7 @@ package relay import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/connector/sni/connector.go b/connector/sni/connector.go index 33e0ba2..636724f 100644 --- a/connector/sni/connector.go +++ b/connector/sni/connector.go @@ -4,9 +4,9 @@ import ( "context" "net" - "github.com/go-gost/gost/v3/pkg/connector" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/connector" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ) func init() { diff --git a/connector/sni/metadata.go b/connector/sni/metadata.go index 5d26c1f..5c49c1a 100644 --- a/connector/sni/metadata.go +++ b/connector/sni/metadata.go @@ -3,7 +3,7 @@ package sni import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/connector/ss/connector.go b/connector/ss/connector.go index b0472fa..a3cfade 100644 --- a/connector/ss/connector.go +++ b/connector/ss/connector.go @@ -6,11 +6,11 @@ import ( "net" "time" + "github.com/go-gost/core/common/bufpool" + "github.com/go-gost/core/connector" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/go-gost/gosocks5" - "github.com/go-gost/gost/v3/pkg/common/bufpool" - "github.com/go-gost/gost/v3/pkg/connector" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" "github.com/go-gost/x/internal/util/ss" "github.com/shadowsocks/go-shadowsocks2/core" ) diff --git a/connector/ss/metadata.go b/connector/ss/metadata.go index 1191106..7b0adb6 100644 --- a/connector/ss/metadata.go +++ b/connector/ss/metadata.go @@ -3,7 +3,7 @@ package ss import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/connector/ss/udp/connector.go b/connector/ss/udp/connector.go index db307f7..f36e00d 100644 --- a/connector/ss/udp/connector.go +++ b/connector/ss/udp/connector.go @@ -6,9 +6,9 @@ import ( "net" "time" - "github.com/go-gost/gost/v3/pkg/connector" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/connector" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/go-gost/x/internal/util/relay" "github.com/go-gost/x/internal/util/ss" "github.com/shadowsocks/go-shadowsocks2/core" diff --git a/connector/ss/udp/metadata.go b/connector/ss/udp/metadata.go index 8ac7604..6cd1e1a 100644 --- a/connector/ss/udp/metadata.go +++ b/connector/ss/udp/metadata.go @@ -4,7 +4,7 @@ import ( "math" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/connector/sshd/connector.go b/connector/sshd/connector.go index 28f55aa..b8ffe79 100644 --- a/connector/sshd/connector.go +++ b/connector/sshd/connector.go @@ -5,9 +5,9 @@ import ( "errors" "net" - "github.com/go-gost/gost/v3/pkg/connector" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/connector" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ssh_util "github.com/go-gost/x/internal/util/ssh" ) diff --git a/dialer/ftcp/dialer.go b/dialer/ftcp/dialer.go index c4bde48..6e75978 100644 --- a/dialer/ftcp/dialer.go +++ b/dialer/ftcp/dialer.go @@ -4,10 +4,10 @@ import ( "context" "net" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/xtaci/tcpraw" ) diff --git a/dialer/ftcp/metadata.go b/dialer/ftcp/metadata.go index d4157e8..a8e51d2 100644 --- a/dialer/ftcp/metadata.go +++ b/dialer/ftcp/metadata.go @@ -3,7 +3,7 @@ package ftcp import ( "time" - md "github.com/go-gost/gost/v3/pkg/metadata" + md "github.com/go-gost/core/metadata" ) const ( diff --git a/dialer/grpc/dialer.go b/dialer/grpc/dialer.go index 4b37b7f..acdafd0 100644 --- a/dialer/grpc/dialer.go +++ b/dialer/grpc/dialer.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" pb "github.com/go-gost/x/internal/util/grpc/proto" "google.golang.org/grpc" "google.golang.org/grpc/backoff" diff --git a/dialer/grpc/metadata.go b/dialer/grpc/metadata.go index 43dee9a..bf7f4ec 100644 --- a/dialer/grpc/metadata.go +++ b/dialer/grpc/metadata.go @@ -1,7 +1,7 @@ package grpc import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/dialer/http2/conn.go b/dialer/http2/conn.go index 5399b27..76a95cc 100644 --- a/dialer/http2/conn.go +++ b/dialer/http2/conn.go @@ -5,7 +5,7 @@ import ( "net" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) // a dummy HTTP2 client conn used by HTTP2 client connector diff --git a/dialer/http2/dialer.go b/dialer/http2/dialer.go index c682584..eb73be6 100644 --- a/dialer/http2/dialer.go +++ b/dialer/http2/dialer.go @@ -7,11 +7,11 @@ import ( "sync" "time" - net_dialer "github.com/go-gost/gost/v3/pkg/common/net/dialer" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + net_dialer "github.com/go-gost/core/common/net/dialer" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ) func init() { diff --git a/dialer/http2/h2/dialer.go b/dialer/http2/h2/dialer.go index d046dd6..da0944c 100644 --- a/dialer/http2/h2/dialer.go +++ b/dialer/http2/h2/dialer.go @@ -12,10 +12,10 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "golang.org/x/net/http2" ) diff --git a/dialer/http2/h2/metadata.go b/dialer/http2/h2/metadata.go index c757797..1cba21c 100644 --- a/dialer/http2/h2/metadata.go +++ b/dialer/http2/h2/metadata.go @@ -1,7 +1,7 @@ package h2 import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/dialer/http2/metadata.go b/dialer/http2/metadata.go index 675e175..413d8af 100644 --- a/dialer/http2/metadata.go +++ b/dialer/http2/metadata.go @@ -1,7 +1,7 @@ package http2 import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/dialer/http3/dialer.go b/dialer/http3/dialer.go index 4f80461..3274c6b 100644 --- a/dialer/http3/dialer.go +++ b/dialer/http3/dialer.go @@ -7,9 +7,9 @@ import ( "net/http" "sync" - "github.com/go-gost/gost/v3/pkg/dialer" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" pht_util "github.com/go-gost/x/internal/util/pht" "github.com/lucas-clemente/quic-go" "github.com/lucas-clemente/quic-go/http3" diff --git a/dialer/http3/metadata.go b/dialer/http3/metadata.go index 6293f90..00d7360 100644 --- a/dialer/http3/metadata.go +++ b/dialer/http3/metadata.go @@ -4,7 +4,7 @@ import ( "strings" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/dialer/icmp/dialer.go b/dialer/icmp/dialer.go index c694c87..7946457 100644 --- a/dialer/icmp/dialer.go +++ b/dialer/icmp/dialer.go @@ -8,10 +8,10 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" icmp_pkg "github.com/go-gost/x/internal/util/icmp" "github.com/lucas-clemente/quic-go" "golang.org/x/net/icmp" diff --git a/dialer/icmp/metadata.go b/dialer/icmp/metadata.go index 78c3c38..f728e8d 100644 --- a/dialer/icmp/metadata.go +++ b/dialer/icmp/metadata.go @@ -3,7 +3,7 @@ package quic import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/dialer/kcp/dialer.go b/dialer/kcp/dialer.go index eee0bf5..2a64da7 100644 --- a/dialer/kcp/dialer.go +++ b/dialer/kcp/dialer.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" kcp_util "github.com/go-gost/x/internal/util/kcp" "github.com/xtaci/kcp-go/v5" "github.com/xtaci/smux" diff --git a/dialer/kcp/metadata.go b/dialer/kcp/metadata.go index 8406acf..1d37190 100644 --- a/dialer/kcp/metadata.go +++ b/dialer/kcp/metadata.go @@ -4,7 +4,7 @@ import ( "encoding/json" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" kcp_util "github.com/go-gost/x/internal/util/kcp" ) diff --git a/dialer/mtls/dialer.go b/dialer/mtls/dialer.go index 64f5ec8..8fe73e3 100644 --- a/dialer/mtls/dialer.go +++ b/dialer/mtls/dialer.go @@ -8,10 +8,10 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/xtaci/smux" ) diff --git a/dialer/mtls/metadata.go b/dialer/mtls/metadata.go index 0eb98dc..1eb2be7 100644 --- a/dialer/mtls/metadata.go +++ b/dialer/mtls/metadata.go @@ -3,7 +3,7 @@ package mtls import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/dialer/mws/dialer.go b/dialer/mws/dialer.go index 4773033..dd77b94 100644 --- a/dialer/mws/dialer.go +++ b/dialer/mws/dialer.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ws_util "github.com/go-gost/x/internal/util/ws" "github.com/gorilla/websocket" "github.com/xtaci/smux" diff --git a/dialer/mws/metadata.go b/dialer/mws/metadata.go index 7ed3928..b6f36fb 100644 --- a/dialer/mws/metadata.go +++ b/dialer/mws/metadata.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/dialer/obfs/http/conn.go b/dialer/obfs/http/conn.go index 5b10745..6916d74 100644 --- a/dialer/obfs/http/conn.go +++ b/dialer/obfs/http/conn.go @@ -12,7 +12,7 @@ import ( "net/url" "sync" - "github.com/go-gost/gost/v3/pkg/logger" + "github.com/go-gost/core/logger" ) type obfsHTTPConn struct { diff --git a/dialer/obfs/http/dialer.go b/dialer/obfs/http/dialer.go index ac10d7d..f277807 100644 --- a/dialer/obfs/http/dialer.go +++ b/dialer/obfs/http/dialer.go @@ -4,10 +4,10 @@ import ( "context" "net" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ) func init() { diff --git a/dialer/obfs/http/metadata.go b/dialer/obfs/http/metadata.go index ab824e6..a2eb889 100644 --- a/dialer/obfs/http/metadata.go +++ b/dialer/obfs/http/metadata.go @@ -3,7 +3,7 @@ package http import ( "net/http" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/dialer/obfs/tls/dialer.go b/dialer/obfs/tls/dialer.go index b75c74d..3fa4767 100644 --- a/dialer/obfs/tls/dialer.go +++ b/dialer/obfs/tls/dialer.go @@ -4,10 +4,10 @@ import ( "context" "net" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ) func init() { diff --git a/dialer/obfs/tls/metadata.go b/dialer/obfs/tls/metadata.go index 0f34ee6..720922a 100644 --- a/dialer/obfs/tls/metadata.go +++ b/dialer/obfs/tls/metadata.go @@ -1,7 +1,7 @@ package tls import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/dialer/pht/dialer.go b/dialer/pht/dialer.go index 7268d3c..95a98ea 100644 --- a/dialer/pht/dialer.go +++ b/dialer/pht/dialer.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" pht_util "github.com/go-gost/x/internal/util/pht" ) diff --git a/dialer/pht/metadata.go b/dialer/pht/metadata.go index ad29190..f5ec5ed 100644 --- a/dialer/pht/metadata.go +++ b/dialer/pht/metadata.go @@ -4,7 +4,7 @@ import ( "strings" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/dialer/quic/dialer.go b/dialer/quic/dialer.go index 0c98a70..eaf86e4 100644 --- a/dialer/quic/dialer.go +++ b/dialer/quic/dialer.go @@ -6,10 +6,10 @@ import ( "net" "sync" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" quic_util "github.com/go-gost/x/internal/util/quic" "github.com/lucas-clemente/quic-go" ) diff --git a/dialer/quic/metadata.go b/dialer/quic/metadata.go index 7d3773a..b941e8b 100644 --- a/dialer/quic/metadata.go +++ b/dialer/quic/metadata.go @@ -3,7 +3,7 @@ package quic import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/dialer/ssh/dialer.go b/dialer/ssh/dialer.go index 863f5f9..2f1f5fc 100644 --- a/dialer/ssh/dialer.go +++ b/dialer/ssh/dialer.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ssh_util "github.com/go-gost/x/internal/util/ssh" "golang.org/x/crypto/ssh" ) diff --git a/dialer/ssh/metadata.go b/dialer/ssh/metadata.go index 0c67ef7..a8fefa5 100644 --- a/dialer/ssh/metadata.go +++ b/dialer/ssh/metadata.go @@ -6,7 +6,7 @@ import ( "strings" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" "golang.org/x/crypto/ssh" ) diff --git a/dialer/sshd/dialer.go b/dialer/sshd/dialer.go index 2d94d05..e619f55 100644 --- a/dialer/sshd/dialer.go +++ b/dialer/sshd/dialer.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ssh_util "github.com/go-gost/x/internal/util/ssh" "golang.org/x/crypto/ssh" ) diff --git a/dialer/sshd/metadata.go b/dialer/sshd/metadata.go index 0f66a0c..1961334 100644 --- a/dialer/sshd/metadata.go +++ b/dialer/sshd/metadata.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" "golang.org/x/crypto/ssh" ) diff --git a/dialer/ws/dialer.go b/dialer/ws/dialer.go index e410afb..60669ec 100644 --- a/dialer/ws/dialer.go +++ b/dialer/ws/dialer.go @@ -6,9 +6,9 @@ import ( "net/url" "time" - "github.com/go-gost/gost/v3/pkg/dialer" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/dialer" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ws_util "github.com/go-gost/x/internal/util/ws" "github.com/gorilla/websocket" ) diff --git a/dialer/ws/metadata.go b/dialer/ws/metadata.go index a625214..b28a35c 100644 --- a/dialer/ws/metadata.go +++ b/dialer/ws/metadata.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/go.mod b/go.mod index 6dd94c3..e92052b 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,9 @@ go 1.18 require ( github.com/LiamHaworth/go-tproxy v0.0.0-20190726054950-ef7efd7f24ed github.com/docker/libcontainer v2.2.1+incompatible + github.com/go-gost/core v0.0.0-20220316114029-7db81fcfeb66 github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 - github.com/go-gost/gost v0.0.0-20220312160816-bfc1f8472cc2 - github.com/go-gost/gost/v3 v3.0.0-alpha.3.0.20220315024338-20e7528b2588 - github.com/go-gost/metrics v0.0.0-20220314135054-2263ae431a5f + github.com/go-gost/metrics v0.0.0-20220316114656-e95ab1c62ea8 github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e github.com/golang/snappy v0.0.4 @@ -61,11 +60,10 @@ require ( github.com/templexxx/xorsimd v0.4.1 // indirect github.com/tjfoc/gmsm v1.3.2 // indirect golang.org/x/mod v0.5.1 // indirect - golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect + golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.9 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/go.sum b/go.sum index c4dd5d6..e91ad7a 100644 --- a/go.sum +++ b/go.sum @@ -104,20 +104,12 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gost/core v0.0.0-20220316114029-7db81fcfeb66 h1:c2xJRqXxys5FSi66dK5xSxuz8IeoYy2N+uOPse4OooE= +github.com/go-gost/core v0.0.0-20220316114029-7db81fcfeb66/go.mod h1:WyaY3XWXX0SHgao6DP8/YnSnzyMTJEWdyzegDWNSQFY= github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 h1:A95M6UWcfZgOuJkQ7QLfG0Hs5peWIUSysCDNz4pfe04= github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09/go.mod h1:1G6I7HP7VFVxveGkoK8mnprnJqSqJjdcASKsdUn4Pp4= -github.com/go-gost/gost v0.0.0-20220312160816-bfc1f8472cc2 h1:yTxlvQ99SsSylNHv7A7v739k0gKbW9sqquXPlJX/EGE= -github.com/go-gost/gost v0.0.0-20220312160816-bfc1f8472cc2/go.mod h1:d7OMWKlZWgWarOEqYEsicSOjplSPMpoOpC8wCqMkBjI= -github.com/go-gost/gost/v3 v3.0.0-alpha.3.0.20220314122048-c282e69ffdc6 h1:epQ9Sv+Y6mhqTS/IKKOBQgIIw6JBbbet7ZmdH/8bgfM= -github.com/go-gost/gost/v3 v3.0.0-alpha.3.0.20220314122048-c282e69ffdc6/go.mod h1:Hv/IAKyc+9uEGQT5DPWsnqgAFEp4Or7uOxFawr6ghjM= -github.com/go-gost/gost/v3 v3.0.0-alpha.3.0.20220314141206-42f72adde0ee h1:p+KM6ZUggiPnxa9l9lP+bsGjO52smX73wPeHlf5xR+E= -github.com/go-gost/gost/v3 v3.0.0-alpha.3.0.20220314141206-42f72adde0ee/go.mod h1:hq4/YM+Vki2ODyhMCk59IwvFJks1sAYhHGnivz+6Ono= -github.com/go-gost/gost/v3 v3.0.0-alpha.3.0.20220315022357-2e40afe53584 h1:TfVYWYW0Oyg5ojvWFVO/Vux6Ht9wt7x1HDOv09nsS1Q= -github.com/go-gost/gost/v3 v3.0.0-alpha.3.0.20220315022357-2e40afe53584/go.mod h1:S4iyROMDN6+OvvrALvHyoV/lBswp7ExC1DS5go7woLM= -github.com/go-gost/gost/v3 v3.0.0-alpha.3.0.20220315024338-20e7528b2588 h1:2RxUmbtz1Rz0qfzxmmfGqo61EhnY4L908LFW4nTQT1I= -github.com/go-gost/gost/v3 v3.0.0-alpha.3.0.20220315024338-20e7528b2588/go.mod h1:S4iyROMDN6+OvvrALvHyoV/lBswp7ExC1DS5go7woLM= -github.com/go-gost/metrics v0.0.0-20220314135054-2263ae431a5f h1:gNquUvOvPXUpq4Xk7ed7motbVN5t0HMqImf96k+pzlU= -github.com/go-gost/metrics v0.0.0-20220314135054-2263ae431a5f/go.mod h1:Ac2Pigx5GMJEznkP9wLdBJ36+rYwWiJPqWk7lrg3FKg= +github.com/go-gost/metrics v0.0.0-20220316114656-e95ab1c62ea8 h1:X9PolYxy/7rSWY+AFP75rdfXoLlNdFemjL9/RduuuVA= +github.com/go-gost/metrics v0.0.0-20220316114656-e95ab1c62ea8/go.mod h1:Ac2Pigx5GMJEznkP9wLdBJ36+rYwWiJPqWk7lrg3FKg= github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 h1:itaaJhQJ19kUXEB4Igb0EbY8m+1Py2AaNNSBds/9gk4= github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8= github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e h1:73NGqAs22ey3wJkIYVD/ACEoovuIuOlEzQTEoqrO5+U= @@ -177,8 +169,8 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -554,8 +546,8 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng= -golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 h1:A9i04dxx7Cribqbs8jf3FQLogkL/CV2YN7hj9KWJCkc= +golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -742,7 +734,6 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/handler/dns/handler.go b/handler/dns/handler.go index 00a2213..8d2be54 100644 --- a/handler/dns/handler.go +++ b/handler/dns/handler.go @@ -10,15 +10,15 @@ import ( "strings" "time" - "github.com/go-gost/gost/v3/pkg/chain" - "github.com/go-gost/gost/v3/pkg/common/bufpool" - resolver_util "github.com/go-gost/gost/v3/pkg/common/util/resolver" - "github.com/go-gost/gost/v3/pkg/handler" - "github.com/go-gost/gost/v3/pkg/hosts" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" - "github.com/go-gost/gost/v3/pkg/resolver/exchanger" + "github.com/go-gost/core/chain" + "github.com/go-gost/core/common/bufpool" + resolver_util "github.com/go-gost/core/common/util/resolver" + "github.com/go-gost/core/handler" + "github.com/go-gost/core/hosts" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" + "github.com/go-gost/core/resolver/exchanger" "github.com/miekg/dns" ) diff --git a/handler/dns/metadata.go b/handler/dns/metadata.go index 73a045f..bd641db 100644 --- a/handler/dns/metadata.go +++ b/handler/dns/metadata.go @@ -4,7 +4,7 @@ import ( "net" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/handler/http2/handler.go b/handler/http2/handler.go index bb426cc..217cb4a 100644 --- a/handler/http2/handler.go +++ b/handler/http2/handler.go @@ -18,12 +18,12 @@ import ( "strings" "time" - "github.com/go-gost/gost/v3/pkg/chain" - netpkg "github.com/go-gost/gost/v3/pkg/common/net" - "github.com/go-gost/gost/v3/pkg/handler" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/chain" + netpkg "github.com/go-gost/core/common/net" + "github.com/go-gost/core/handler" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ) func init() { diff --git a/handler/http2/metadata.go b/handler/http2/metadata.go index 5ce2845..3679514 100644 --- a/handler/http2/metadata.go +++ b/handler/http2/metadata.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/handler/redirect/handler.go b/handler/redirect/handler.go index 263e239..05bfe17 100644 --- a/handler/redirect/handler.go +++ b/handler/redirect/handler.go @@ -6,11 +6,11 @@ import ( "net" "time" - "github.com/go-gost/gost/v3/pkg/chain" - netpkg "github.com/go-gost/gost/v3/pkg/common/net" - "github.com/go-gost/gost/v3/pkg/handler" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/chain" + netpkg "github.com/go-gost/core/common/net" + "github.com/go-gost/core/handler" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ) func init() { diff --git a/handler/redirect/metadata.go b/handler/redirect/metadata.go index 96fb93f..bf40998 100644 --- a/handler/redirect/metadata.go +++ b/handler/redirect/metadata.go @@ -1,7 +1,7 @@ package redirect import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/handler/relay/bind.go b/handler/relay/bind.go index 940da6d..0f79b2b 100644 --- a/handler/relay/bind.go +++ b/handler/relay/bind.go @@ -6,9 +6,9 @@ import ( "net" "time" - netpkg "github.com/go-gost/gost/v3/pkg/common/net" - net_relay "github.com/go-gost/gost/v3/pkg/common/net/relay" - "github.com/go-gost/gost/v3/pkg/logger" + netpkg "github.com/go-gost/core/common/net" + net_relay "github.com/go-gost/core/common/net/relay" + "github.com/go-gost/core/logger" "github.com/go-gost/relay" "github.com/go-gost/x/internal/util/mux" relay_util "github.com/go-gost/x/internal/util/relay" diff --git a/handler/relay/connect.go b/handler/relay/connect.go index 7fedad5..cd326aa 100644 --- a/handler/relay/connect.go +++ b/handler/relay/connect.go @@ -7,8 +7,8 @@ import ( "net" "time" - netpkg "github.com/go-gost/gost/v3/pkg/common/net" - "github.com/go-gost/gost/v3/pkg/logger" + netpkg "github.com/go-gost/core/common/net" + "github.com/go-gost/core/logger" "github.com/go-gost/relay" ) diff --git a/handler/relay/forward.go b/handler/relay/forward.go index 472bcd1..03bd91f 100644 --- a/handler/relay/forward.go +++ b/handler/relay/forward.go @@ -7,8 +7,8 @@ import ( "net" "time" - netpkg "github.com/go-gost/gost/v3/pkg/common/net" - "github.com/go-gost/gost/v3/pkg/logger" + netpkg "github.com/go-gost/core/common/net" + "github.com/go-gost/core/logger" "github.com/go-gost/relay" ) diff --git a/handler/relay/handler.go b/handler/relay/handler.go index 9087b10..51db3d0 100644 --- a/handler/relay/handler.go +++ b/handler/relay/handler.go @@ -7,10 +7,10 @@ import ( "strconv" "time" - "github.com/go-gost/gost/v3/pkg/chain" - "github.com/go-gost/gost/v3/pkg/handler" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/chain" + "github.com/go-gost/core/handler" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/go-gost/relay" ) diff --git a/handler/relay/metadata.go b/handler/relay/metadata.go index e56d070..d926cab 100644 --- a/handler/relay/metadata.go +++ b/handler/relay/metadata.go @@ -4,7 +4,7 @@ import ( "math" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/handler/sni/handler.go b/handler/sni/handler.go index dfd3a2b..3fc344e 100644 --- a/handler/sni/handler.go +++ b/handler/sni/handler.go @@ -11,12 +11,12 @@ import ( "net" "time" - "github.com/go-gost/gost/v3/pkg/chain" - "github.com/go-gost/gost/v3/pkg/common/bufpool" - netpkg "github.com/go-gost/gost/v3/pkg/common/net" - "github.com/go-gost/gost/v3/pkg/handler" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/chain" + "github.com/go-gost/core/common/bufpool" + netpkg "github.com/go-gost/core/common/net" + "github.com/go-gost/core/handler" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" dissector "github.com/go-gost/tls-dissector" ) diff --git a/handler/sni/metadata.go b/handler/sni/metadata.go index c50f576..3759d7d 100644 --- a/handler/sni/metadata.go +++ b/handler/sni/metadata.go @@ -3,7 +3,7 @@ package sni import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/handler/ss/handler.go b/handler/ss/handler.go index c04ece0..0c72477 100644 --- a/handler/ss/handler.go +++ b/handler/ss/handler.go @@ -7,12 +7,12 @@ import ( "net" "time" + "github.com/go-gost/core/chain" + netpkg "github.com/go-gost/core/common/net" + "github.com/go-gost/core/handler" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/go-gost/gosocks5" - "github.com/go-gost/gost/v3/pkg/chain" - netpkg "github.com/go-gost/gost/v3/pkg/common/net" - "github.com/go-gost/gost/v3/pkg/handler" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" "github.com/go-gost/x/internal/util/ss" "github.com/shadowsocks/go-shadowsocks2/core" ) diff --git a/handler/ss/metadata.go b/handler/ss/metadata.go index 6aa31f9..035e85e 100644 --- a/handler/ss/metadata.go +++ b/handler/ss/metadata.go @@ -3,7 +3,7 @@ package ss import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/handler/ss/udp/handler.go b/handler/ss/udp/handler.go index b986512..1a755ee 100644 --- a/handler/ss/udp/handler.go +++ b/handler/ss/udp/handler.go @@ -6,12 +6,12 @@ import ( "net" "time" - "github.com/go-gost/gost/v3/pkg/chain" - "github.com/go-gost/gost/v3/pkg/common/bufpool" - "github.com/go-gost/gost/v3/pkg/handler" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/chain" + "github.com/go-gost/core/common/bufpool" + "github.com/go-gost/core/handler" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/go-gost/x/internal/util/relay" "github.com/go-gost/x/internal/util/ss" "github.com/shadowsocks/go-shadowsocks2/core" diff --git a/handler/ss/udp/metadata.go b/handler/ss/udp/metadata.go index 532c74c..ea827e8 100644 --- a/handler/ss/udp/metadata.go +++ b/handler/ss/udp/metadata.go @@ -4,7 +4,7 @@ import ( "math" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/handler/sshd/handler.go b/handler/sshd/handler.go index fca384b..6dfa0c0 100644 --- a/handler/sshd/handler.go +++ b/handler/sshd/handler.go @@ -9,12 +9,12 @@ import ( "strconv" "time" - "github.com/go-gost/gost/v3/pkg/chain" - netpkg "github.com/go-gost/gost/v3/pkg/common/net" - "github.com/go-gost/gost/v3/pkg/handler" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/chain" + netpkg "github.com/go-gost/core/common/net" + "github.com/go-gost/core/handler" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" sshd_util "github.com/go-gost/x/internal/util/sshd" "golang.org/x/crypto/ssh" ) diff --git a/handler/sshd/metadata.go b/handler/sshd/metadata.go index 8c7eef2..5042352 100644 --- a/handler/sshd/metadata.go +++ b/handler/sshd/metadata.go @@ -1,7 +1,7 @@ package ssh import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/handler/tap/handler.go b/handler/tap/handler.go index 3eb9d51..a54b8af 100644 --- a/handler/tap/handler.go +++ b/handler/tap/handler.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/chain" - "github.com/go-gost/gost/v3/pkg/common/bufpool" - "github.com/go-gost/gost/v3/pkg/handler" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/chain" + "github.com/go-gost/core/common/bufpool" + "github.com/go-gost/core/handler" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/go-gost/x/internal/util/ss" tap_util "github.com/go-gost/x/internal/util/tap" "github.com/shadowsocks/go-shadowsocks2/core" diff --git a/handler/tap/metadata.go b/handler/tap/metadata.go index 9153b5d..9410964 100644 --- a/handler/tap/metadata.go +++ b/handler/tap/metadata.go @@ -1,7 +1,7 @@ package tap import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/handler/tun/handler.go b/handler/tun/handler.go index 4515400..0266106 100644 --- a/handler/tun/handler.go +++ b/handler/tun/handler.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/chain" - "github.com/go-gost/gost/v3/pkg/common/bufpool" - "github.com/go-gost/gost/v3/pkg/handler" - "github.com/go-gost/gost/v3/pkg/logger" - md "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/chain" + "github.com/go-gost/core/common/bufpool" + "github.com/go-gost/core/handler" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" "github.com/go-gost/x/internal/util/ss" tun_util "github.com/go-gost/x/internal/util/tun" "github.com/shadowsocks/go-shadowsocks2/core" diff --git a/handler/tun/metadata.go b/handler/tun/metadata.go index c5329eb..8afb4dd 100644 --- a/handler/tun/metadata.go +++ b/handler/tun/metadata.go @@ -1,7 +1,7 @@ package tun import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/internal/util/grpc/proto/gost.proto b/internal/util/grpc/proto/gost.proto index 9af1713..f477458 100644 --- a/internal/util/grpc/proto/gost.proto +++ b/internal/util/grpc/proto/gost.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/go-gost/gost/v3/pkg/common/util/grpc/proto"; +option go_package = "github.com/go-gost/core/common/util/grpc/proto"; message Chunk { bytes data = 1; diff --git a/internal/util/icmp/conn.go b/internal/util/icmp/conn.go index 9d39132..d782e5c 100644 --- a/internal/util/icmp/conn.go +++ b/internal/util/icmp/conn.go @@ -8,8 +8,8 @@ import ( "net" "sync/atomic" - "github.com/go-gost/gost/v3/pkg/common/bufpool" - "github.com/go-gost/gost/v3/pkg/logger" + "github.com/go-gost/core/common/bufpool" + "github.com/go-gost/core/logger" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" ) diff --git a/internal/util/pht/client.go b/internal/util/pht/client.go index 7c25423..b57eb35 100644 --- a/internal/util/pht/client.go +++ b/internal/util/pht/client.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/go-gost/gost/v3/pkg/logger" + "github.com/go-gost/core/logger" ) type Client struct { diff --git a/internal/util/pht/conn.go b/internal/util/pht/conn.go index c1ac10c..592d77e 100644 --- a/internal/util/pht/conn.go +++ b/internal/util/pht/conn.go @@ -10,7 +10,7 @@ import ( "net/http/httputil" "time" - "github.com/go-gost/gost/v3/pkg/logger" + "github.com/go-gost/core/logger" ) type clientConn struct { diff --git a/internal/util/pht/server.go b/internal/util/pht/server.go index 9933c70..b66cb91 100644 --- a/internal/util/pht/server.go +++ b/internal/util/pht/server.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/common/bufpool" - "github.com/go-gost/gost/v3/pkg/logger" + "github.com/go-gost/core/common/bufpool" + "github.com/go-gost/core/logger" "github.com/lucas-clemente/quic-go" "github.com/lucas-clemente/quic-go/http3" "github.com/rs/xid" diff --git a/internal/util/relay/conn.go b/internal/util/relay/conn.go index 4b97e29..8d4c671 100644 --- a/internal/util/relay/conn.go +++ b/internal/util/relay/conn.go @@ -4,8 +4,8 @@ import ( "bytes" "net" + "github.com/go-gost/core/common/bufpool" "github.com/go-gost/gosocks5" - "github.com/go-gost/gost/v3/pkg/common/bufpool" ) type udpTunConn struct { diff --git a/internal/util/ss/conn.go b/internal/util/ss/conn.go index 8bc2785..84035f3 100644 --- a/internal/util/ss/conn.go +++ b/internal/util/ss/conn.go @@ -4,8 +4,8 @@ import ( "bytes" "net" + "github.com/go-gost/core/common/bufpool" "github.com/go-gost/gosocks5" - "github.com/go-gost/gost/v3/pkg/common/bufpool" ) var ( diff --git a/internal/util/ssh/ssh.go b/internal/util/ssh/ssh.go index 28ca2b6..6290dbe 100644 --- a/internal/util/ssh/ssh.go +++ b/internal/util/ssh/ssh.go @@ -5,7 +5,7 @@ import ( "fmt" "io/ioutil" - "github.com/go-gost/gost/v3/pkg/auth" + "github.com/go-gost/core/auth" "golang.org/x/crypto/ssh" ) diff --git a/listener/dns/listener.go b/listener/dns/listener.go index 2e942f0..9a21e3c 100644 --- a/listener/dns/listener.go +++ b/listener/dns/listener.go @@ -9,10 +9,10 @@ import ( "net/http" "strings" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" "github.com/miekg/dns" ) diff --git a/listener/dns/metadata.go b/listener/dns/metadata.go index 538faf7..c61c064 100644 --- a/listener/dns/metadata.go +++ b/listener/dns/metadata.go @@ -3,7 +3,7 @@ package dns import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/ftcp/listener.go b/listener/ftcp/listener.go index 158ed54..9fe1fb6 100644 --- a/listener/ftcp/listener.go +++ b/listener/ftcp/listener.go @@ -5,10 +5,10 @@ import ( "sync" "sync/atomic" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" "github.com/xtaci/tcpraw" ) diff --git a/listener/grpc/listener.go b/listener/grpc/listener.go index da70d87..0cb053a 100644 --- a/listener/grpc/listener.go +++ b/listener/grpc/listener.go @@ -3,11 +3,11 @@ package grpc import ( "net" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" pb "github.com/go-gost/x/internal/util/grpc/proto" "google.golang.org/grpc" diff --git a/listener/grpc/metadata.go b/listener/grpc/metadata.go index 6c0e6d4..4164c5e 100644 --- a/listener/grpc/metadata.go +++ b/listener/grpc/metadata.go @@ -1,7 +1,7 @@ package grpc import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/grpc/server.go b/listener/grpc/server.go index 4ab6524..18cec57 100644 --- a/listener/grpc/server.go +++ b/listener/grpc/server.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/go-gost/gost/v3/pkg/logger" + "github.com/go-gost/core/logger" pb "github.com/go-gost/x/internal/util/grpc/proto" "google.golang.org/grpc/peer" ) diff --git a/listener/http2/conn.go b/listener/http2/conn.go index d1ab68d..4e090e0 100644 --- a/listener/http2/conn.go +++ b/listener/http2/conn.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) // a dummy HTTP2 server conn used by HTTP2 handler diff --git a/listener/http2/h2/listener.go b/listener/http2/h2/listener.go index 4fccf34..43226fe 100644 --- a/listener/http2/h2/listener.go +++ b/listener/http2/h2/listener.go @@ -7,11 +7,11 @@ import ( "net/http" "net/http/httputil" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" diff --git a/listener/http2/h2/metadata.go b/listener/http2/h2/metadata.go index 3c8ced4..33f32df 100644 --- a/listener/http2/h2/metadata.go +++ b/listener/http2/h2/metadata.go @@ -1,7 +1,7 @@ package h2 import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/http2/listener.go b/listener/http2/listener.go index 1ea3614..6098bb1 100644 --- a/listener/http2/listener.go +++ b/listener/http2/listener.go @@ -5,11 +5,11 @@ import ( "net" "net/http" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" "golang.org/x/net/http2" ) diff --git a/listener/http2/metadata.go b/listener/http2/metadata.go index 97f2661..095d7b7 100644 --- a/listener/http2/metadata.go +++ b/listener/http2/metadata.go @@ -1,7 +1,7 @@ package http2 import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/http3/listener.go b/listener/http3/listener.go index ed21dfe..961f298 100644 --- a/listener/http3/listener.go +++ b/listener/http3/listener.go @@ -3,10 +3,10 @@ package http3 import ( "net" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" pht_util "github.com/go-gost/x/internal/util/pht" "github.com/lucas-clemente/quic-go" diff --git a/listener/http3/metadata.go b/listener/http3/metadata.go index e2da944..ed04874 100644 --- a/listener/http3/metadata.go +++ b/listener/http3/metadata.go @@ -3,7 +3,7 @@ package http3 import ( "strings" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/icmp/listener.go b/listener/icmp/listener.go index 1be761f..7216e6e 100644 --- a/listener/icmp/listener.go +++ b/listener/icmp/listener.go @@ -4,11 +4,11 @@ import ( "context" "net" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" icmp_pkg "github.com/go-gost/x/internal/util/icmp" "github.com/lucas-clemente/quic-go" diff --git a/listener/icmp/metadata.go b/listener/icmp/metadata.go index c39ce53..7e53cf5 100644 --- a/listener/icmp/metadata.go +++ b/listener/icmp/metadata.go @@ -3,7 +3,7 @@ package quic import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/kcp/listener.go b/listener/kcp/listener.go index 18017d8..b02606c 100644 --- a/listener/kcp/listener.go +++ b/listener/kcp/listener.go @@ -4,11 +4,11 @@ import ( "net" "time" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" kcp_util "github.com/go-gost/x/internal/util/kcp" "github.com/xtaci/kcp-go/v5" diff --git a/listener/kcp/metadata.go b/listener/kcp/metadata.go index 60b8bed..454a696 100644 --- a/listener/kcp/metadata.go +++ b/listener/kcp/metadata.go @@ -3,7 +3,7 @@ package kcp import ( "encoding/json" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" kcp_util "github.com/go-gost/x/internal/util/kcp" ) diff --git a/listener/mtls/listener.go b/listener/mtls/listener.go index 50c24c6..ca59056 100644 --- a/listener/mtls/listener.go +++ b/listener/mtls/listener.go @@ -4,11 +4,11 @@ import ( "crypto/tls" "net" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" "github.com/xtaci/smux" ) diff --git a/listener/mtls/metadata.go b/listener/mtls/metadata.go index 23b25c1..72bd80d 100644 --- a/listener/mtls/metadata.go +++ b/listener/mtls/metadata.go @@ -3,7 +3,7 @@ package mtls import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/mws/listener.go b/listener/mws/listener.go index 11c15ca..738ecc7 100644 --- a/listener/mws/listener.go +++ b/listener/mws/listener.go @@ -6,11 +6,11 @@ import ( "net/http" "net/http/httputil" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" ws_util "github.com/go-gost/x/internal/util/ws" "github.com/gorilla/websocket" diff --git a/listener/mws/metadata.go b/listener/mws/metadata.go index e88861b..084d7bd 100644 --- a/listener/mws/metadata.go +++ b/listener/mws/metadata.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/obfs/http/conn.go b/listener/obfs/http/conn.go index a5c632b..e0d7a55 100644 --- a/listener/obfs/http/conn.go +++ b/listener/obfs/http/conn.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/logger" + "github.com/go-gost/core/logger" ) type obfsHTTPConn struct { diff --git a/listener/obfs/http/listener.go b/listener/obfs/http/listener.go index 9628175..4e3d8b8 100644 --- a/listener/obfs/http/listener.go +++ b/listener/obfs/http/listener.go @@ -3,11 +3,11 @@ package http import ( "net" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" ) diff --git a/listener/obfs/http/metadata.go b/listener/obfs/http/metadata.go index 61012a6..67900eb 100644 --- a/listener/obfs/http/metadata.go +++ b/listener/obfs/http/metadata.go @@ -3,7 +3,7 @@ package http import ( "net/http" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/listener/obfs/tls/listener.go b/listener/obfs/tls/listener.go index 3c8579f..21eeef6 100644 --- a/listener/obfs/tls/listener.go +++ b/listener/obfs/tls/listener.go @@ -3,11 +3,11 @@ package tls import ( "net" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" ) diff --git a/listener/obfs/tls/metadata.go b/listener/obfs/tls/metadata.go index b4ee45b..db6d115 100644 --- a/listener/obfs/tls/metadata.go +++ b/listener/obfs/tls/metadata.go @@ -1,7 +1,7 @@ package tls import ( - md "github.com/go-gost/gost/v3/pkg/metadata" + md "github.com/go-gost/core/metadata" ) type metadata struct { diff --git a/listener/pht/listener.go b/listener/pht/listener.go index a8309f3..42c2be8 100644 --- a/listener/pht/listener.go +++ b/listener/pht/listener.go @@ -5,10 +5,10 @@ package pht import ( "net" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" pht_util "github.com/go-gost/x/internal/util/pht" ) diff --git a/listener/pht/metadata.go b/listener/pht/metadata.go index 301529b..98c82dd 100644 --- a/listener/pht/metadata.go +++ b/listener/pht/metadata.go @@ -3,7 +3,7 @@ package pht import ( "strings" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/quic/listener.go b/listener/quic/listener.go index fc0cbec..6aabcec 100644 --- a/listener/quic/listener.go +++ b/listener/quic/listener.go @@ -4,10 +4,10 @@ import ( "context" "net" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" quic_util "github.com/go-gost/x/internal/util/quic" "github.com/lucas-clemente/quic-go" diff --git a/listener/quic/metadata.go b/listener/quic/metadata.go index fc88cd7..8342e17 100644 --- a/listener/quic/metadata.go +++ b/listener/quic/metadata.go @@ -3,7 +3,7 @@ package quic import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/redirect/udp/conn.go b/listener/redirect/udp/conn.go index 2780d3c..152fa65 100644 --- a/listener/redirect/udp/conn.go +++ b/listener/redirect/udp/conn.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/go-gost/gost/v3/pkg/common/bufpool" + "github.com/go-gost/core/common/bufpool" ) type redirConn struct { diff --git a/listener/redirect/udp/listener.go b/listener/redirect/udp/listener.go index 613dc89..57a066c 100644 --- a/listener/redirect/udp/listener.go +++ b/listener/redirect/udp/listener.go @@ -3,10 +3,10 @@ package udp import ( "net" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" ) func init() { diff --git a/listener/redirect/udp/listener_linux.go b/listener/redirect/udp/listener_linux.go index 042e003..a434ff9 100644 --- a/listener/redirect/udp/listener_linux.go +++ b/listener/redirect/udp/listener_linux.go @@ -4,7 +4,7 @@ import ( "net" "github.com/LiamHaworth/go-tproxy" - "github.com/go-gost/gost/v3/pkg/common/bufpool" + "github.com/go-gost/core/common/bufpool" ) func (l *redirectListener) listenUDP(addr *net.UDPAddr) (*net.UDPConn, error) { diff --git a/listener/redirect/udp/metadata.go b/listener/redirect/udp/metadata.go index a30fe0a..17e4e35 100644 --- a/listener/redirect/udp/metadata.go +++ b/listener/redirect/udp/metadata.go @@ -3,7 +3,7 @@ package udp import ( "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const ( diff --git a/listener/ssh/listener.go b/listener/ssh/listener.go index ed7f871..20691b3 100644 --- a/listener/ssh/listener.go +++ b/listener/ssh/listener.go @@ -5,11 +5,11 @@ import ( "net" "time" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" ssh_util "github.com/go-gost/x/internal/util/ssh" "golang.org/x/crypto/ssh" diff --git a/listener/ssh/metadata.go b/listener/ssh/metadata.go index 6921e4e..50a5b5a 100644 --- a/listener/ssh/metadata.go +++ b/listener/ssh/metadata.go @@ -3,8 +3,8 @@ package ssh import ( "io/ioutil" - tls_util "github.com/go-gost/gost/v3/pkg/common/util/tls" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + tls_util "github.com/go-gost/core/common/util/tls" + mdata "github.com/go-gost/core/metadata" ssh_util "github.com/go-gost/x/internal/util/ssh" "golang.org/x/crypto/ssh" ) diff --git a/listener/sshd/listener.go b/listener/sshd/listener.go index 7b4ebf2..39a2858 100644 --- a/listener/sshd/listener.go +++ b/listener/sshd/listener.go @@ -7,11 +7,11 @@ import ( "strconv" "time" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" ssh_util "github.com/go-gost/x/internal/util/ssh" sshd_util "github.com/go-gost/x/internal/util/sshd" diff --git a/listener/sshd/metadata.go b/listener/sshd/metadata.go index 5c11e10..bb7ef38 100644 --- a/listener/sshd/metadata.go +++ b/listener/sshd/metadata.go @@ -3,8 +3,8 @@ package ssh import ( "io/ioutil" - tls_util "github.com/go-gost/gost/v3/pkg/common/util/tls" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + tls_util "github.com/go-gost/core/common/util/tls" + mdata "github.com/go-gost/core/metadata" ssh_util "github.com/go-gost/x/internal/util/ssh" "golang.org/x/crypto/ssh" ) diff --git a/listener/tap/conn.go b/listener/tap/conn.go index 7eb78ab..97057ed 100644 --- a/listener/tap/conn.go +++ b/listener/tap/conn.go @@ -5,7 +5,7 @@ import ( "net" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" "github.com/songgao/water" ) diff --git a/listener/tap/listener.go b/listener/tap/listener.go index 6024649..9a3eeb8 100644 --- a/listener/tap/listener.go +++ b/listener/tap/listener.go @@ -3,10 +3,10 @@ package tap import ( "net" - "github.com/go-gost/gost/v3/pkg/listener" - "github.com/go-gost/gost/v3/pkg/logger" - mdata "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + mdata "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" ) diff --git a/listener/tap/metadata.go b/listener/tap/metadata.go index 08d5381..6dd04c5 100644 --- a/listener/tap/metadata.go +++ b/listener/tap/metadata.go @@ -1,7 +1,7 @@ package tap import ( - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" tap_util "github.com/go-gost/x/internal/util/tap" ) diff --git a/listener/tun/conn.go b/listener/tun/conn.go index 756e63a..65429c9 100644 --- a/listener/tun/conn.go +++ b/listener/tun/conn.go @@ -5,7 +5,7 @@ import ( "net" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" "github.com/songgao/water" ) diff --git a/listener/tun/listener.go b/listener/tun/listener.go index 64ba4d6..c962b19 100644 --- a/listener/tun/listener.go +++ b/listener/tun/listener.go @@ -3,11 +3,11 @@ package tun import ( "net" - "github.com/go-gost/gost/pkg/common/metrics" - "github.com/go-gost/gost/v3/pkg/listener" - "github.com/go-gost/gost/v3/pkg/logger" - mdata "github.com/go-gost/gost/v3/pkg/metadata" - "github.com/go-gost/gost/v3/pkg/registry" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + mdata "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" + metrics "github.com/go-gost/metrics/wrapper" ) func init() { diff --git a/listener/tun/metadata.go b/listener/tun/metadata.go index 8418b4a..6a4c64a 100644 --- a/listener/tun/metadata.go +++ b/listener/tun/metadata.go @@ -4,7 +4,7 @@ import ( "net" "strings" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" tun_util "github.com/go-gost/x/internal/util/tun" ) diff --git a/listener/ws/listener.go b/listener/ws/listener.go index ce51993..d064d78 100644 --- a/listener/ws/listener.go +++ b/listener/ws/listener.go @@ -6,11 +6,11 @@ import ( "net/http" "net/http/httputil" - admission "github.com/go-gost/gost/v3/pkg/admission/wrapper" - "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" - "github.com/go-gost/gost/v3/pkg/registry" + admission "github.com/go-gost/core/admission/wrapper" + "github.com/go-gost/core/listener" + "github.com/go-gost/core/logger" + md "github.com/go-gost/core/metadata" + "github.com/go-gost/core/registry" metrics "github.com/go-gost/metrics/wrapper" ws_util "github.com/go-gost/x/internal/util/ws" "github.com/gorilla/websocket" diff --git a/listener/ws/metadata.go b/listener/ws/metadata.go index c0f60bd..f4deb29 100644 --- a/listener/ws/metadata.go +++ b/listener/ws/metadata.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - mdata "github.com/go-gost/gost/v3/pkg/metadata" + mdata "github.com/go-gost/core/metadata" ) const (