fix imports

This commit is contained in:
ginuerzh
2022-03-16 20:06:34 +08:00
parent 506142fd0b
commit 36947bcbd9
126 changed files with 324 additions and 335 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
package grpc
import (
mdata "github.com/go-gost/gost/v3/pkg/metadata"
mdata "github.com/go-gost/core/metadata"
)
const (

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
package h2
import (
mdata "github.com/go-gost/gost/v3/pkg/metadata"
mdata "github.com/go-gost/core/metadata"
)
const (

View File

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

View File

@ -1,7 +1,7 @@
package http2
import (
mdata "github.com/go-gost/gost/v3/pkg/metadata"
mdata "github.com/go-gost/core/metadata"
)
const (

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -13,7 +13,7 @@ import (
"sync"
"time"
"github.com/go-gost/gost/v3/pkg/logger"
"github.com/go-gost/core/logger"
)
type obfsHTTPConn struct {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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