From a7040af346ddf67e87385b3e6bb8d927a784a1b9 Mon Sep 17 00:00:00 2001 From: wwqgtxx Date: Mon, 23 Oct 2023 16:52:19 +0800 Subject: [PATCH] Android: patch --- component/dialer/patch.go | 10 ---------- listener/inner/tcp.go | 2 ++ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/component/dialer/patch.go b/component/dialer/patch.go index 02fab327..ad076df5 100644 --- a/component/dialer/patch.go +++ b/component/dialer/patch.go @@ -7,20 +7,10 @@ import ( "syscall" ) -type TunnelDialer func(context context.Context, network, address string) (net.Conn, error) type SocketControl func(network, address string, conn syscall.RawConn) error -var DefaultTunnelDialer TunnelDialer var DefaultSocketHook SocketControl -func DialTunnelContext(ctx context.Context, network, address string) (net.Conn, error) { - if dialer := DefaultTunnelDialer; dialer != nil { - return dialer(ctx, network, address) - } - - return DialContext(ctx, network, address) -} - func dialContextHooked(ctx context.Context, network string, destination netip.Addr, port string) (net.Conn, error) { dialer := &net.Dialer{ Control: DefaultSocketHook, diff --git a/listener/inner/tcp.go b/listener/inner/tcp.go index 8973c431..653d0c86 100644 --- a/listener/inner/tcp.go +++ b/listener/inner/tcp.go @@ -27,6 +27,8 @@ func HandleTcp(address string) (conn net.Conn, err error) { metadata.Type = C.INNER metadata.DNSMode = C.DNSNormal metadata.Process = C.ClashName + metadata.RawSrcAddr = conn1.RemoteAddr() + metadata.RawDstAddr = conn1.LocalAddr() if h, port, err := net.SplitHostPort(address); err == nil { if port, err := strconv.ParseUint(port, 10, 16); err == nil { metadata.DstPort = uint16(port)