Revert "platform: Implement set underlying networks for android"

This reverts commit eb4a184b7ed7becfcf82e108639d8d19cbeed6bd.

adapter/network.go

@@ -51,5 +51,4 @@ type NetworkInterface struct {
 	DNSServers  []string
 	Expensive   bool
 	Constrained bool
-	RawNetwork  any
 }

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
 }

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

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()

experimental/libbox/raw_network_android.go

@@ -1,3 +0,0 @@
-package libbox
-
-type RawNetwork interface{}

experimental/libbox/raw_network_stub.go

@@ -1,7 +0,0 @@
-//go:build !android
-
-package libbox
-
-type RawNetwork interface {
-	stub()
-}

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()
 }

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
 	}