From 6f73096972495c0ac79d75c4730e00578c4890e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Thu, 26 Dec 2024 14:39:57 +0800 Subject: [PATCH] Revert "platform: Implement set underlying networks for android" This reverts commit eb4a184b7ed7becfcf82e108639d8d19cbeed6bd. --- adapter/network.go | 1 - experimental/libbox/config.go | 4 ---- experimental/libbox/platform.go | 8 -------- experimental/libbox/platform/interface.go | 1 - experimental/libbox/raw_network_android.go | 3 --- experimental/libbox/raw_network_stub.go | 7 ------- experimental/libbox/service.go | 7 ------- route/network.go | 12 ------------ 8 files changed, 43 deletions(-) delete mode 100644 experimental/libbox/raw_network_android.go delete mode 100644 experimental/libbox/raw_network_stub.go diff --git a/adapter/network.go b/adapter/network.go index 22816f07..00ef54b8 100644 --- a/adapter/network.go +++ b/adapter/network.go @@ -51,5 +51,4 @@ type NetworkInterface struct { DNSServers []string Expensive bool Constrained bool - RawNetwork any } diff --git a/experimental/libbox/config.go b/experimental/libbox/config.go index 7d0627fe..6a85c963 100644 --- a/experimental/libbox/config.go +++ b/experimental/libbox/config.go @@ -82,10 +82,6 @@ func (s *platformInterfaceStub) Interfaces() ([]adapter.NetworkInterface, error) return nil, os.ErrInvalid } -func (s *platformInterfaceStub) SetUnderlyingNetworks(networks []adapter.NetworkInterface) error { - return os.ErrInvalid -} - func (s *platformInterfaceStub) UnderNetworkExtension() bool { return false } diff --git a/experimental/libbox/platform.go b/experimental/libbox/platform.go index f4bc7ea6..2503ea44 100644 --- a/experimental/libbox/platform.go +++ b/experimental/libbox/platform.go @@ -18,7 +18,6 @@ type PlatformInterface interface { StartDefaultInterfaceMonitor(listener InterfaceUpdateListener) error CloseDefaultInterfaceMonitor(listener InterfaceUpdateListener) error GetInterfaces() (NetworkInterfaceIterator, error) - SetUnderlyingNetworks(networks RawNetworkIterator) error UnderNetworkExtension() bool IncludeAllNetworks() bool ReadWIFIState() *WIFIState @@ -52,8 +51,6 @@ type NetworkInterface struct { Type int32 DNSServer StringIterator Metered bool - - RawNetwork RawNetwork } type WIFIState struct { @@ -70,11 +67,6 @@ type NetworkInterfaceIterator interface { HasNext() bool } -type RawNetworkIterator interface { - Next() RawNetwork - HasNext() bool -} - type Notification struct { Identifier string TypeName string diff --git a/experimental/libbox/platform/interface.go b/experimental/libbox/platform/interface.go index 1684d88c..eda51b48 100644 --- a/experimental/libbox/platform/interface.go +++ b/experimental/libbox/platform/interface.go @@ -16,7 +16,6 @@ type Interface interface { UpdateRouteOptions(options *tun.Options, platformOptions option.TunPlatformOptions) error CreateDefaultInterfaceMonitor(logger logger.Logger) tun.DefaultInterfaceMonitor Interfaces() ([]adapter.NetworkInterface, error) - SetUnderlyingNetworks(networks []adapter.NetworkInterface) error UnderNetworkExtension() bool IncludeAllNetworks() bool ClearDNSCache() diff --git a/experimental/libbox/raw_network_android.go b/experimental/libbox/raw_network_android.go deleted file mode 100644 index b8d38aaa..00000000 --- a/experimental/libbox/raw_network_android.go +++ /dev/null @@ -1,3 +0,0 @@ -package libbox - -type RawNetwork interface{} diff --git a/experimental/libbox/raw_network_stub.go b/experimental/libbox/raw_network_stub.go deleted file mode 100644 index 6e23135c..00000000 --- a/experimental/libbox/raw_network_stub.go +++ /dev/null @@ -1,7 +0,0 @@ -//go:build !android - -package libbox - -type RawNetwork interface { - stub() -} diff --git a/experimental/libbox/service.go b/experimental/libbox/service.go index 613b2e66..4906c571 100644 --- a/experimental/libbox/service.go +++ b/experimental/libbox/service.go @@ -220,18 +220,11 @@ func (w *platformInterfaceWrapper) Interfaces() ([]adapter.NetworkInterface, err DNSServers: iteratorToArray[string](netInterface.DNSServer), Expensive: netInterface.Metered || isDefault && w.isExpensive, Constrained: isDefault && w.isConstrained, - RawNetwork: netInterface.RawNetwork, }) } return interfaces, nil } -func (w *platformInterfaceWrapper) SetUnderlyingNetworks(networks []adapter.NetworkInterface) error { - return w.iif.SetUnderlyingNetworks(newIterator(common.Map(networks, func(it adapter.NetworkInterface) RawNetwork { - return it.RawNetwork.(RawNetwork) - }))) -} - func (w *platformInterfaceWrapper) UnderNetworkExtension() bool { return w.iif.UnderNetworkExtension() } diff --git a/route/network.go b/route/network.go index 05dffb01..97d165f1 100644 --- a/route/network.go +++ b/route/network.go @@ -237,9 +237,6 @@ func (r *NetworkManager) UpdateInterfaces() error { newInterfaces := common.Filter(interfaces, func(it adapter.NetworkInterface) bool { return it.Flags&net.FlagUp != 0 }) - for _, networkInterface := range newInterfaces { - networkInterface.RawNetwork = nil - } r.networkInterfaces.Store(newInterfaces) if len(newInterfaces) > 0 && !slices.EqualFunc(oldInterfaces, newInterfaces, func(oldInterface adapter.NetworkInterface, newInterface adapter.NetworkInterface) bool { return oldInterface.Interface.Index == newInterface.Interface.Index && @@ -260,15 +257,6 @@ func (r *NetworkManager) UpdateInterfaces() error { } return F.ToString(it.Name, " (", strings.Join(options, ", "), ")") }), ", ")) - if C.IsAndroid { - err = r.platformInterface.SetUnderlyingNetworks(newInterfaces) - if err != nil { - r.logger.Error("set underlying networks: ", err) - } - } - } - for _, networkInterface := range interfaces { - networkInterface.RawNetwork = nil } return nil }