From c259a73cad77c64ca87408c95144412306f78f47 Mon Sep 17 00:00:00 2001 From: snakem982 Date: Sun, 10 Nov 2024 00:13:51 +0800 Subject: [PATCH] merge --- listener/sing_tun/iface.go | 16 ++++++++++++++-- test/go.mod | 8 ++++---- test/go.sum | 3 +++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/listener/sing_tun/iface.go b/listener/sing_tun/iface.go index 543d206c0d..98833eda2c 100644 --- a/listener/sing_tun/iface.go +++ b/listener/sing_tun/iface.go @@ -25,7 +25,13 @@ func (f *defaultInterfaceFinder) Interfaces() []control.Interface { } interfaces := make([]control.Interface, 0, len(ifaces)) for _, _interface := range ifaces { - interfaces = append(interfaces, control.Interface(*_interface)) + interfaces = append(interfaces, control.Interface{ + Index: _interface.Index, + MTU: _interface.MTU, + Name: _interface.Name, + Addresses: _interface.Addresses, + HardwareAddr: _interface.HardwareAddr, + }) } return interfaces @@ -67,7 +73,13 @@ func (f *defaultInterfaceFinder) InterfaceByAddr(addr netip.Addr) (*control.Inte for _, netInterface := range ifaces { for _, prefix := range netInterface.Addresses { if prefix.Contains(addr) { - return (*control.Interface)(netInterface), nil + return &control.Interface{ + Index: netInterface.Index, + MTU: netInterface.MTU, + Name: netInterface.Name, + Addresses: netInterface.Addresses, + HardwareAddr: netInterface.HardwareAddr, + }, nil } } } diff --git a/test/go.mod b/test/go.mod index cbe143b1ac..3141772fa5 100644 --- a/test/go.mod +++ b/test/go.mod @@ -1,6 +1,6 @@ module mihomo-test -go 1.21 +go 1.22 toolchain go1.22.6 @@ -59,11 +59,11 @@ require ( github.com/mdlayher/socket v0.4.1 // indirect github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect github.com/metacubex/gvisor v0.0.0-20240320004321-933faba989ec // indirect - github.com/metacubex/quic-go v0.48.1-0.20241021013658-51ca987e0174 // indirect + github.com/metacubex/quic-go v0.48.2-0.20241105005628-a3e65bac65b2 // indirect github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4 // indirect github.com/metacubex/sing-shadowsocks v0.2.8 // indirect github.com/metacubex/sing-shadowsocks2 v0.2.2 // indirect - github.com/metacubex/sing-tun v0.2.7-0.20241021011113-857bcd6ee47c // indirect + github.com/metacubex/sing-tun v0.2.7-0.20241106120309-53606a70db98 // indirect github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9 // indirect github.com/metacubex/sing-wireguard v0.0.0-20240924052438-b0976fc59ea3 // indirect github.com/moby/term v0.5.0 // indirect @@ -85,7 +85,7 @@ require ( github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61 // indirect github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect - github.com/sagernet/sing v0.5.0-rc.4 // indirect + github.com/sagernet/sing v0.5.0 // indirect github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6 // indirect github.com/sagernet/sing-shadowtls v0.1.4 // indirect github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 // indirect diff --git a/test/go.sum b/test/go.sum index b34be3782f..d1679df99b 100644 --- a/test/go.sum +++ b/test/go.sum @@ -129,6 +129,7 @@ github.com/metacubex/quic-go v0.40.1-0.20231130135418-0c1b47cf9394 h1:dIT+KB2hkn github.com/metacubex/quic-go v0.40.1-0.20231130135418-0c1b47cf9394/go.mod h1:F/t8VnA47xoia8ABlNA4InkZjssvFJ5p6E6jKdbkgAs= github.com/metacubex/quic-go v0.47.1-0.20240909010619-6b38f24bfcc4/go.mod h1:Y7yRGqFE6UQL/3aKPYmiYdjfVkeujJaStP4+jiZMcN8= github.com/metacubex/quic-go v0.48.1-0.20241021013658-51ca987e0174/go.mod h1:AiZ+UPgrkO1DTnmiAX4b+kRoV1Vfc65UkYD7RbFlIZA= +github.com/metacubex/quic-go v0.48.2-0.20241105005628-a3e65bac65b2/go.mod h1:AiZ+UPgrkO1DTnmiAX4b+kRoV1Vfc65UkYD7RbFlIZA= github.com/metacubex/sing-quic v0.0.0-20231130141855-0022295e524b h1:7XXoEePvxfkQN9b2wB8UXU3uzb9uL8syEFF7A9VAKKQ= github.com/metacubex/sing-quic v0.0.0-20231130141855-0022295e524b/go.mod h1:Gu5/zqZDd5G1AUtoV2yjAPWOEy7zwbU2DBUjdxJh0Kw= github.com/metacubex/sing-quic v0.0.0-20240827003841-cd97758ed8b4/go.mod h1:g7Mxj7b7zm7YVqD975mk/hSmrb0A0G4bVvIMr2MMzn8= @@ -142,6 +143,7 @@ github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd h1:k0+92eARq github.com/metacubex/sing-tun v0.1.15-0.20231103033938-170591e8d5bd/go.mod h1:Q7zmpJ+qOvMMXyUoYlxGQuWkqALUpXzFSSqO+KLPyzA= github.com/metacubex/sing-tun v0.2.7-0.20240729131039-ed03f557dee1/go.mod h1:olbEx9yVcaw5tHTNlRamRoxmMKcvDvcVS1YLnQGzvWE= github.com/metacubex/sing-tun v0.2.7-0.20241021011113-857bcd6ee47c/go.mod h1:lCrP0AW7ieKnXG1JEeZLW+9h99QzjuOX0MfCQfz6TgE= +github.com/metacubex/sing-tun v0.2.7-0.20241106120309-53606a70db98/go.mod h1:GRcrj7VnhvYFsS34cv0J2qTVm5h9DvQuGwliVyVLVvE= github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74 h1:FtupiyFkaVjFvRa7B/uDtRWg5BNsoyPC9MTev3sDasY= github.com/metacubex/sing-vmess v0.1.9-0.20230921005247-a0488d7dac74/go.mod h1:8EWBZpc+qNvf5gmvjAtMHK1/DpcWqzfcBL842K00BsM= github.com/metacubex/sing-vmess v0.1.9-0.20240719134745-1df6fb20bbf9/go.mod h1:olVkD4FChQ5gKMHG4ZzuD7+fMkJY1G8vwOKpRehjrmY= @@ -203,6 +205,7 @@ github.com/sagernet/sing v0.2.18-0.20231108041402-4fbbd193203c/go.mod h1:OL6k2F0 github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo= github.com/sagernet/sing v0.5.0-alpha.13/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= github.com/sagernet/sing v0.5.0-rc.4/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= +github.com/sagernet/sing v0.5.0/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= github.com/sagernet/sing-mux v0.1.5-0.20231109075101-6b086ed6bb07 h1:ncKb5tVOsCQgCsv6UpsA0jinbNb5OQ5GMPJlyQP3EHM= github.com/sagernet/sing-mux v0.1.5-0.20231109075101-6b086ed6bb07/go.mod h1:u/MZf32xPG8jEKe3t+xUV67EBnKtDtCaPhsJQOQGUYU= github.com/sagernet/sing-mux v0.2.1-0.20240124034317-9bfb33698bb6/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=