From ad7275d7777b82d9009833a5d21f1185d079bb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Wed, 21 May 2025 12:07:20 +0800 Subject: [PATCH] test --- go.mod | 4 ++-- go.sum | 4 ++-- route/network.go | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8baeac69..2eed460f 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,7 @@ require ( github.com/cretz/bine v0.2.0 github.com/go-chi/chi/v5 v5.2.1 github.com/go-chi/render v1.0.3 + github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 github.com/gofrs/uuid/v5 v5.3.2 github.com/insomniacslk/dhcp v0.0.0-20250417080101-5f8cf70e8c5f github.com/libdns/alidns v1.0.4-libdns.v1.beta1 @@ -27,7 +28,7 @@ require ( github.com/sagernet/gomobile v0.1.6 github.com/sagernet/gvisor v0.0.0-20250325023245-7a9c0f5725fb github.com/sagernet/quic-go v0.51.0-beta.5 - github.com/sagernet/sing v0.6.10-0.20250520114755-0e0545dd92c4 + github.com/sagernet/sing v0.6.10-0.20250521033217-30d675ea099b github.com/sagernet/sing-mux v0.3.2 github.com/sagernet/sing-quic v0.4.1-0.20250511050139-d459f561c9c3 github.com/sagernet/sing-shadowsocks v0.2.7 @@ -78,7 +79,6 @@ require ( github.com/go-ole/go-ole v1.3.0 // indirect github.com/gobwas/httphead v0.1.0 // indirect github.com/gobwas/pool v0.2.1 // indirect - github.com/godbus/dbus/v5 v5.1.1-0.20230522191255-76236955d466 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/btree v1.1.3 // indirect github.com/google/go-cmp v0.6.0 // indirect diff --git a/go.sum b/go.sum index ac2049d1..102041bf 100644 --- a/go.sum +++ b/go.sum @@ -168,8 +168,8 @@ github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/l github.com/sagernet/quic-go v0.51.0-beta.5 h1:/mME3sJvQ8k/JKP0oC/9XoWrm0znO7hWXviB5yiipJY= github.com/sagernet/quic-go v0.51.0-beta.5/go.mod h1:OV+V5kEBb8kJS7k29MzDu6oj9GyMc7HA07sE1tedxz4= github.com/sagernet/sing v0.6.9/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= -github.com/sagernet/sing v0.6.10-0.20250520114755-0e0545dd92c4 h1:mP53fzZ9GIFaT1pZ2brV1BhbaDwN8kG8ZR0OYr11EBc= -github.com/sagernet/sing v0.6.10-0.20250520114755-0e0545dd92c4/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= +github.com/sagernet/sing v0.6.10-0.20250521033217-30d675ea099b h1:E9zgBma90grCIC1Rber6UgGw3CzbpeizJdavNu1Fy8M= +github.com/sagernet/sing v0.6.10-0.20250521033217-30d675ea099b/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= github.com/sagernet/sing-mux v0.3.2 h1:meZVFiiStvHThb/trcpAkCrmtJOuItG5Dzl1RRP5/NE= github.com/sagernet/sing-mux v0.3.2/go.mod h1:pht8iFY4c9Xltj7rhVd208npkNaeCxzyXCgulDPLUDA= github.com/sagernet/sing-quic v0.4.1-0.20250511050139-d459f561c9c3 h1:1J+s1yyZ8+YAYaClI+az8YuFgV9NGXUUCZnriKmos6w= diff --git a/route/network.go b/route/network.go index 090e4c0d..ec7a7871 100644 --- a/route/network.go +++ b/route/network.go @@ -3,6 +3,7 @@ package route import ( "context" "errors" + "fmt" "net" "net/netip" "os" @@ -313,10 +314,14 @@ func (r *NetworkManager) AutoDetectInterfaceFunc() control.Func { return nil } bindFunc := control.BindToInterfaceFunc(r.interfaceFinder, func(network string, address string) (interfaceName string, interfaceIndex int, err error) { + for _, iif := range r.interfaceFinder.Interfaces() { + r.logger.Warn("iif ", iif.Name, ": ", fmt.Sprint(iif.Addresses)) + } remoteAddr := M.ParseSocksaddr(address).Addr if remoteAddr.IsValid() { iif, err := r.interfaceFinder.ByAddr(remoteAddr) if err == nil { + r.logger.Warn("bind to interface ", iif.Name, " (", iif.Index, "): ", remoteAddr) return iif.Name, iif.Index, nil } } @@ -324,6 +329,7 @@ func (r *NetworkManager) AutoDetectInterfaceFunc() control.Func { if defaultInterface == nil { return "", -1, tun.ErrNoRoute } + r.logger.Warn("bind to default interface ", defaultInterface.Name, " (", defaultInterface.Index, "): ", remoteAddr) return defaultInterface.Name, defaultInterface.Index, nil }) return func(network, address string, conn syscall.RawConn) error {