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

replace xnet.Transport by xnet.Pipe

Browse Source
This commit is contained in:
ginuerzh
2025-07-28 20:52:15 +08:00
parent 35a049fb03
commit 208d18125c
52 changed files with 468 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
handler/dns/handler.go
+1
View File
@@ -142,6 +142,7 @@ func (h *dnsHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
Network: conn.LocalAddr().Network(),
RemoteAddr: conn.RemoteAddr().String(),
LocalAddr: conn.LocalAddr().String(),
Host: conn.LocalAddr().String(),
Proto: "dns",
Time: start,
SID: string(ctxvalue.SidFromContext(ctx)),
handler/forward/local/handler.go
+2 -1
View File
@@ -252,7 +252,8 @@ func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn, opts ...hand
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), target.Addr)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), target.Addr)
handler/forward/remote/handler.go
+2 -1
View File
@@ -264,7 +264,8 @@ func (h *forwardHandler) Handle(ctx context.Context, conn net.Conn, opts ...hand
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), target.Addr)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), target.Addr)
handler/http/handler.go
+6 -3
View File
@@ -427,7 +427,8 @@ func (h *httpHandler) handleRequest(ctx context.Context, conn net.Conn, req *htt
start := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), addr)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(start),
}).Infof("%s >-< %s", conn.RemoteAddr(), addr)
@@ -703,7 +704,8 @@ func (h *httpHandler) handleUpgradeResponse(ctx context.Context, rw io.ReadWrite
return h.sniffingWebsocketFrame(ctx, rw, backConn, ro, log)
}
return xnet.Transport(rw, backConn)
// return xnet.Transport(rw, backConn)
return xnet.Pipe(ctx, rw, backConn)
}
func (h *httpHandler) sniffingWebsocketFrame(ctx context.Context, rw, cc io.ReadWriter, ro *xrecorder.HandlerRecorderObject, log logger.Logger) error {
@@ -901,7 +903,8 @@ func (h *httpHandler) authenticate(ctx context.Context, conn net.Conn, req *http
defer cc.Close()
req.Write(cc)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
return
case "file":
f, _ := os.Open(pr.Value)
handler/http2/handler.go
+2 -1
View File
@@ -315,7 +315,8 @@ func (h *http2Handler) roundTrip(ctx context.Context, w http.ResponseWriter, req
start := time.Now()
log.Infof("%s <-> %s", req.RemoteAddr, host)
xnet.Transport(rw, cc)
// xnet.Transport(rw, cc)
xnet.Pipe(ctx, rw, cc)
log.WithFields(map[string]any{
"duration": time.Since(start),
}).Infof("%s >-< %s", req.RemoteAddr, host)
handler/redirect/tcp/handler.go
+2 -1
View File
@@ -242,7 +242,8 @@ func (h *redirectHandler) Handle(ctx context.Context, conn net.Conn, opts ...han
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), dstAddr)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), dstAddr)
handler/redirect/udp/handler.go
+2 -1
View File
@@ -137,7 +137,8 @@ func (h *redirectHandler) Handle(ctx context.Context, conn net.Conn, opts ...han
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), dstAddr)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), dstAddr)
handler/relay/connect.go
+2 -1
View File
@@ -202,7 +202,8 @@ func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), address)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), address)
handler/relay/entrypoint.go
+2 -1
View File
@@ -113,7 +113,8 @@ func (h *tcpHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
t := time.Now()
log.Debugf("%s <-> %s", conn.RemoteAddr(), cc.RemoteAddr())
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{"duration": time.Since(t)}).
Debugf("%s >-< %s", conn.RemoteAddr(), cc.RemoteAddr())
return nil
handler/relay/forward.go
+2 -1
View File
@@ -122,7 +122,8 @@ func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network
t := time.Now()
log.Debugf("%s <-> %s", conn.RemoteAddr(), target.Addr)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Debugf("%s >-< %s", conn.RemoteAddr(), target.Addr)
handler/serial/handler.go
+4 -2
View File
@@ -101,7 +101,8 @@ func (h *serialHandler) Handle(ctx context.Context, conn net.Conn, opts ...handl
t := time.Now()
log.Infof("%s <-> %s", conn.LocalAddr(), "@")
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.LocalAddr(), "@")
@@ -130,7 +131,8 @@ func (h *serialHandler) forwardSerial(ctx context.Context, conn net.Conn, target
t := time.Now()
log.Infof("%s <-> %s", conn.LocalAddr(), target.Addr)
xnet.Transport(conn, port)
// xnet.Transport(conn, port)
xnet.Pipe(ctx, conn, port)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.LocalAddr(), target.Addr)
handler/sni/handler.go
+5 -7
View File
@@ -90,10 +90,10 @@ func (h *sniHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
}
log := h.options.Logger.WithFields(map[string]any{
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
"sid": ctxvalue.SidFromContext(ctx),
"client": ro.ClientIP,
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
"sid": ctxvalue.SidFromContext(ctx),
"client": ro.ClientIP,
"network": ro.Network,
})
log.Infof("%s <> %s", conn.RemoteAddr(), conn.LocalAddr())
@@ -134,9 +134,7 @@ func (h *sniHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
return cc, err
}
dialTLS := func(ctx context.Context, network, address string, cfg *tls.Config) (net.Conn, error) {
var buf bytes.Buffer
cc, err := h.options.Router.Dial(ctxvalue.ContextWithBuffer(ctx, &buf), "tcp", address)
ro.Route = buf.String()
cc, err := dial(ctx, network, address)
if err != nil {
return nil, err
}
handler/socks/v4/handler.go
+2 -1
View File
@@ -325,7 +325,8 @@ func (h *socks4Handler) handleConnect(ctx context.Context, conn net.Conn, req *g
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), ro.Host)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), ro.Host)
handler/socks/v5/bind.go
+4 -2
View File
@@ -132,7 +132,8 @@ func (h *socks5Handler) serveBind(ctx context.Context, conn net.Conn, ln net.Lis
defer close(errc)
defer pc1.Close()
errc <- xnet.Transport(conn, pc1)
// errc <- xnet.Transport(conn, pc1)
errc <- xnet.Pipe(ctx, conn, pc1)
}()
return errc
@@ -172,7 +173,8 @@ func (h *socks5Handler) serveBind(ctx context.Context, conn net.Conn, ln net.Lis
start := time.Now()
log.Debugf("%s <-> %s", rc.LocalAddr(), rc.RemoteAddr())
xnet.Transport(pc2, rc)
// xnet.Transport(pc2, rc)
xnet.Pipe(ctx, pc2, rc)
log.WithFields(map[string]any{"duration": time.Since(start)}).
Debugf("%s >-< %s", rc.LocalAddr(), rc.RemoteAddr())
handler/socks/v5/connect.go
+2 -1
View File
@@ -140,7 +140,8 @@ func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, networ
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), address)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), address)
handler/socks/v5/mbind.go
+2 -1
View File
@@ -162,7 +162,8 @@ func (h *socks5Handler) serveMuxBind(ctx context.Context, conn net.Conn, ln net.
t := time.Now()
log.Debugf("%s <-> %s", c.LocalAddr(), c.RemoteAddr())
xnet.Transport(sc, c)
// xnet.Transport(sc, c)
xnet.Pipe(ctx, sc, c)
log.WithFields(map[string]any{"duration": time.Since(t)}).
Debugf("%s >-< %s", c.LocalAddr(), c.RemoteAddr())
}(rc)
handler/ss/handler.go
+6 -5
View File
@@ -100,10 +100,10 @@ func (h *ssHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.H
}
log := h.options.Logger.WithFields(map[string]any{
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
"sid": ctxvalue.SidFromContext(ctx),
"client": ro.ClientIP,
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
"sid": ctxvalue.SidFromContext(ctx),
"client": ro.ClientIP,
"network": ro.Network,
})
log.Infof("%s <> %s", conn.RemoteAddr(), conn.LocalAddr())
@@ -231,7 +231,8 @@ func (h *ssHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.H
t := time.Now()
log.Infof("%s <-> %s", conn.RemoteAddr(), ro.Host)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), ro.Host)
handler/sshd/handler.go
+4 -2
View File
@@ -219,7 +219,8 @@ func (h *forwardHandler) handleDirectForward(ctx context.Context, conn *sshd_uti
t := time.Now()
log.Infof("%s <-> %s", cc.LocalAddr(), targetAddr)
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", cc.LocalAddr(), targetAddr)
@@ -321,7 +322,8 @@ func (h *forwardHandler) handleRemoteForward(ctx context.Context, conn *sshd_uti
t := time.Now()
log.Debugf("%s <-> %s", conn.LocalAddr(), conn.RemoteAddr())
xnet.Transport(ch, conn)
// xnet.Transport(ch, conn)
xnet.Pipe(ctx, ch, conn)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Debugf("%s >-< %s", conn.LocalAddr(), conn.RemoteAddr())
handler/tungo/handler.go
+13 -6
View File
@@ -20,6 +20,7 @@ import (
"github.com/go-gost/x/registry"
"github.com/xjasonlyu/tun2socks/v2/core"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"gvisor.dev/gvisor/pkg/tcpip/stack"
)
func init() {
@@ -33,6 +34,7 @@ type tungoHandler struct {
limiter traffic.TrafficLimiter
cancel context.CancelFunc
recorder recorder.RecorderObject
stack *stack.Stack
}
func NewHandler(opts ...handler.Option) handler.Handler {
@@ -110,12 +112,13 @@ func (h *tungoHandler) Handle(ctx context.Context, conn net.Conn, opts ...handle
tcpQueue: make(chan adapter.TCPConn),
udpQueue: make(chan adapter.UDPConn),
udpTimeout: h.md.udpTimeout,
procCancel: func() { /* nop */ },
procCancel: func() {},
sniffing: h.md.sniffing,
sniffingTimeout: h.md.sniffingTimeout,
sniffing: h.md.sniffing,
sniffingUDP: h.md.sniffingUDP,
sniffingTimeout: h.md.sniffingTimeout,
sniffingResponseTimeout: h.md.sniffingResponseTimeout,
sniffingFallback: h.md.sniffingFallback,
sniffingFallback: h.md.sniffingFallback,
recorder: h.recorder,
stats: h.stats,
@@ -133,9 +136,10 @@ func (h *tungoHandler) Handle(ctx context.Context, conn net.Conn, opts ...handle
if err != nil {
return err
}
defer stack.Close()
<-ctx.Done()
h.stack = stack
stack.Wait()
return nil
}
@@ -145,6 +149,9 @@ func (h *tungoHandler) Close() error {
if h.cancel != nil {
h.cancel()
}
if h.stack != nil {
h.stack.Close()
}
return nil
}
handler/tungo/metadata.go
+2
View File
@@ -11,6 +11,7 @@ type metadata struct {
udpTimeout time.Duration
sniffing bool
sniffingUDP bool
sniffingTimeout time.Duration
sniffingResponseTimeout time.Duration
sniffingFallback bool
@@ -26,6 +27,7 @@ func (h *tungoHandler) parseMetadata(md mdata.Metadata) (err error) {
h.md.udpTimeout = mdutil.GetDuration(md, "udpTimeout")
h.md.sniffing = mdutil.GetBool(md, "sniffing")
h.md.sniffingUDP = mdutil.GetBool(md, "sniffing.udp")
h.md.sniffingTimeout = mdutil.GetDuration(md, "sniffing.timeout")
h.md.sniffingResponseTimeout = mdutil.GetDuration(md, "sniffing.responseTimeout")
h.md.sniffingFallback = mdutil.GetBool(md, "sniffing.fallback")
handler/tungo/stack.go
+58 -11
View File
@@ -23,6 +23,7 @@ import (
xstats "github.com/go-gost/x/observer/stats"
stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
xrecorder "github.com/go-gost/x/recorder"
"github.com/miekg/dns"
"github.com/rs/xid"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
)
@@ -39,13 +40,14 @@ type transportHandler struct {
tcpQueue chan adapter.TCPConn
udpQueue chan adapter.UDPConn
// UDP session timeout.
udpTimeout time.Duration
procOnce sync.Once
procCancel context.CancelFunc
// UDP session timeout.
udpTimeout time.Duration
sniffing bool
sniffingUDP bool
sniffingTimeout time.Duration
sniffingResponseTimeout time.Duration
sniffingFallback bool
@@ -112,6 +114,7 @@ func (h *transportHandler) handleTCPConn(originConn adapter.TCPConn) {
Network: "tcp",
RemoteAddr: remoteAddr.String(),
Dst: dstAddr.String(),
Host: dstAddr.String(),
ClientIP: remoteAddr.String(),
Time: start,
SID: sid,
@@ -143,6 +146,9 @@ func (h *transportHandler) handleTCPConn(originConn adapter.TCPConn) {
ro.InputBytes = pStats.Get(stats.KindInputBytes)
ro.OutputBytes = pStats.Get(stats.KindOutputBytes)
ro.Duration = time.Since(start)
if err := ro.Record(ctx, h.recorder.Recorder); err != nil {
log.Errorf("record: %v", err)
}
log.WithFields(map[string]any{
"src": ro.Src,
@@ -174,7 +180,6 @@ func (h *transportHandler) handleTCPConn(originConn adapter.TCPConn) {
}
dial := func(ctx context.Context, network, address string) (net.Conn, error) {
log.Debugf("dial %s/%s", address, network)
var cc net.Conn
var err error
if address != "" {
@@ -257,7 +262,7 @@ func (h *transportHandler) handleTCPConn(originConn adapter.TCPConn) {
t := time.Now()
log.Infof("%s <-> %s", remoteAddr, dstAddr)
xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", remoteAddr, dstAddr)
@@ -284,9 +289,15 @@ func (h *transportHandler) handleUDPConn(uc adapter.UDPConn) {
Network: "udp",
RemoteAddr: remoteAddr.String(),
Dst: dstAddr.String(),
Host: dstAddr.String(),
ClientIP: remoteAddr.String(),
Time: start,
SID: sid,
}
if h, _, _ := net.SplitHostPort(ro.ClientIP); h != "" {
ro.ClientIP = h
}
log := h.opts.Logger.WithFields(map[string]any{
"network": ro.Network,
"remote": ro.RemoteAddr,
@@ -309,6 +320,9 @@ func (h *transportHandler) handleUDPConn(uc adapter.UDPConn) {
ro.InputBytes = pStats.Get(stats.KindInputBytes)
ro.OutputBytes = pStats.Get(stats.KindOutputBytes)
ro.Duration = time.Since(start)
if err := ro.Record(ctx, h.recorder.Recorder); err != nil {
log.Errorf("record: %v", err)
}
log.WithFields(map[string]any{
"src": ro.Src,
@@ -330,13 +344,13 @@ func (h *transportHandler) handleUDPConn(uc adapter.UDPConn) {
t := time.Now()
log.Infof("%s <-> %s", remoteAddr, dstAddr)
pipeData(conn, cc, h.udpTimeout)
pipePacketData(conn, cc, h.sniffingUDP, ro, h.udpTimeout)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", remoteAddr, dstAddr)
}
func pipeData(conn1, conn2 net.Conn, timeout time.Duration) {
func pipePacketData(conn1, conn2 net.Conn, sniffing bool, ro *xrecorder.HandlerRecorderObject, timeout time.Duration) {
if timeout <= 0 {
timeout = udpSessionTimeout
}
@@ -346,17 +360,18 @@ func pipeData(conn1, conn2 net.Conn, timeout time.Duration) {
go func() {
defer wg.Done()
copyData(conn1, conn2, timeout)
copyPacketData(conn1, conn2, sniffing, false, ro, timeout)
}()
go func() {
defer wg.Done()
copyData(conn2, conn1, timeout)
copyPacketData(conn2, conn1, sniffing, true, ro, timeout)
}()
wg.Wait()
}
func copyData(dst, src net.Conn, timeout time.Duration) error {
buf := make([]byte, math.MaxUint16)
func copyPacketData(dst, src net.Conn, sniffing bool, c2s bool, ro *xrecorder.HandlerRecorderObject, timeout time.Duration) error {
buf := make([]byte, math.MaxUint16/2)
isDNS := false
for {
src.SetReadDeadline(time.Now().Add(timeout))
@@ -369,9 +384,41 @@ func copyData(dst, src net.Conn, timeout time.Duration) error {
return err
}
if n == 0 {
return nil
}
if sniffing {
// try to sniff DNS msg.
{
msg := &dns.Msg{}
if msg.Unpack(buf[:n]) == nil && len(msg.Question) > 0 {
if c2s {
ro.Proto = "dns"
ro.DNS = &xrecorder.DNSRecorderObject{
ID: int(msg.Id),
Name: msg.Question[0].Name,
Class: dns.Class(msg.Question[0].Qclass).String(),
Type: dns.Type(msg.Question[0].Qtype).String(),
Question: msg.String(),
}
} else {
if ro.DNS != nil {
ro.DNS.Answer = msg.String()
}
}
isDNS = true
}
}
}
if _, err = dst.Write(buf[:n]); err != nil {
return err
}
dst.SetReadDeadline(time.Now().Add(timeout))
if isDNS {
return nil
}
}
}
handler/tunnel/connect.go
+2 -1
View File
@@ -116,7 +116,8 @@ func (h *tunnelHandler) handleConnect(ctx context.Context, req *relay.Request, c
t := time.Now()
log.Debugf("%s <-> %s", conn.RemoteAddr(), cc.RemoteAddr())
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Debugf("%s >-< %s", conn.RemoteAddr(), cc.RemoteAddr())
handler/tunnel/entrypoint.go
+6 -3
View File
@@ -435,7 +435,8 @@ func (ep *entrypoint) handleUpgradeResponse(ctx context.Context, rw io.ReadWrite
return ep.sniffingWebsocketFrame(ctx, rw, backConn, ro, log)
}
return xnet.Transport(rw, backConn)
// return xnet.Transport(rw, backConn)
return xnet.Pipe(ctx, rw, backConn)
}
func (ep *entrypoint) sniffingWebsocketFrame(ctx context.Context, rw, cc io.ReadWriter, ro *xrecorder.HandlerRecorderObject, log logger.Logger) error {
@@ -616,7 +617,8 @@ func (ep *entrypoint) HandleTLS(ctx context.Context, conn net.Conn, ro *xrecorde
return err
}
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
return err
}
@@ -698,7 +700,8 @@ func (ep *entrypoint) handleConnect(ctx context.Context, conn net.Conn, ro *xrec
t := time.Now()
log.Debugf("%s <-> %s", conn.RemoteAddr(), cc.RemoteAddr())
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Debugf("%s >-< %s", conn.RemoteAddr(), cc.RemoteAddr())
handler/unix/handler.go
+4 -2
View File
@@ -194,7 +194,8 @@ func (h *unixHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler
t := time.Now()
log.Infof("%s <-> %s", conn.LocalAddr(), "@")
xnet.Transport(conn, cc)
// xnet.Transport(conn, cc)
xnet.Pipe(ctx, conn, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.LocalAddr(), "@")
@@ -245,7 +246,8 @@ func (h *unixHandler) forwardUnix(ctx context.Context, conn net.Conn, target *ch
t := time.Now()
log.Infof("%s <-> %s", conn.LocalAddr(), target.Addr)
xnet.Transport(rw, cc)
// xnet.Transport(rw, cc)
xnet.Pipe(ctx, rw, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.LocalAddr(), target.Addr)
handler/unix/sniffing.go
+6 -4
View File
@@ -18,7 +18,7 @@ import (
dissector "github.com/go-gost/tls-dissector"
xbypass "github.com/go-gost/x/bypass"
xio "github.com/go-gost/x/internal/io"
netpkg "github.com/go-gost/x/internal/net"
xnet "github.com/go-gost/x/internal/net"
xhttp "github.com/go-gost/x/internal/net/http"
tls_util "github.com/go-gost/x/internal/util/tls"
xrecorder "github.com/go-gost/x/recorder"
@@ -199,13 +199,14 @@ func (h *unixHandler) httpRoundTrip(ctx context.Context, rw, cc io.ReadWriter, r
}
if req.Header.Get("Upgrade") == "websocket" {
netpkg.Transport(rw, cc)
// xnet.Transport(rw, cc)
xnet.Pipe(ctx, rw, cc)
}
return resp.Close, nil
}
func (h *unixHandler) handleTLS(_ context.Context, rw, cc io.ReadWriter, ro *xrecorder.HandlerRecorderObject, log logger.Logger) error {
func (h *unixHandler) handleTLS(ctx context.Context, rw, cc io.ReadWriter, ro *xrecorder.HandlerRecorderObject, log logger.Logger) error {
buf := new(bytes.Buffer)
clientHello, err := dissector.ParseClientHello(io.TeeReader(rw, buf))
@@ -250,7 +251,8 @@ func (h *unixHandler) handleTLS(_ context.Context, rw, cc io.ReadWriter, ro *xre
t := time.Now()
log.Infof("%s <-> %s", ro.RemoteAddr, ro.Host)
netpkg.Transport(rw, cc)
// xnet.Transport(rw, cc)
xnet.Pipe(ctx, rw, cc)
log.WithFields(map[string]any{
"duration": time.Since(t),
}).Infof("%s >-< %s", ro.RemoteAddr, ro.Host)