refactor: new way to get interface for android

config/config.go

@@ -884,7 +884,7 @@ func parseAuthentication(rawRecords []string) []auth.AuthUser {
 
 func parseTun(rawTun RawTun, general *General) (*Tun, error) {
 	if rawTun.Enable && rawTun.AutoDetectInterface {
-		autoDetectInterfaceName, err := commons.GetAutoDetectInterface()
+		autoDetectInterfaceName, err := commons.GetAutoDetectInterface(rawTun.Device)
 		if err != nil {
 			log.Warnln("Can not find auto detect interface.[%s]", err)
 		} else {

listener/tun/ipstack/commons/router.go

@@ -23,17 +23,17 @@ func ipv4MaskString(bits int) string {
 	return fmt.Sprintf("%d.%d.%d.%d", m[0], m[1], m[2], m[3])
 }
 
-func DefaultInterfaceChangeMonitor() {
+func DefaultInterfaceChangeMonitor(tunName string) {
 	t := time.NewTicker(defaultInterfaceMonitorDuration)
 	defer t.Stop()
 
 	for {
 		<-t.C
 
-		interfaceName, err := GetAutoDetectInterface()
+		interfaceName, err := GetAutoDetectInterface(tunName)
 		if err != nil {
 			log.Warnln("[TUN] default interface monitor exited, cause: %v", err)
-			break
+			continue
 		}
 
 		old := dialer.DefaultInterface.Load()

listener/tun/ipstack/commons/router_android.go

@@ -10,18 +10,30 @@ import (
 	"strings"
 )
 
-func GetAutoDetectInterface() (string, error) {
+func GetAutoDetectInterface(tunName string) (ifn string, err error) {
-	res, err := cmd.ExecCmd("sh -c ip route | awk '{print $3}' | xargs echo -n")
+	cmdRes, err := cmd.ExecCmd("ip route show")
 	if err != nil {
-		return "", err
+		return
 	}
-	ifaces := strings.Split(res, " ")
+
-	for _, iface := range ifaces {
+	for _, route := range strings.Split(cmdRes, "\n") {
-		if iface == "wlan0" {
+		rs := strings.Split(route, " ")
-			return "wlan0", nil
+		if len(rs) > 2 {
+			if rs[2] == tunName {
+				continue
+			}
+			ifn = rs[2]
+			if ifn == "wlan0" {
+				return
+			}
 		}
 	}
-	return ifaces[0], nil
+
+	if ifn == "" {
+		return "", fmt.Errorf("interface not found")
+	}
+	return
+	//err = fmt.Errorf("interface not found")
 }
 
 func ConfigInterfaceAddress(dev device.Device, addr netip.Prefix, forceMTU int, autoRoute, autoDetectInterface bool) error {
@@ -40,6 +52,10 @@ func ConfigInterfaceAddress(dev device.Device, addr netip.Prefix, forceMTU int,
 		return err
 	}
 
+	if err = execRouterCmd("add", addr.Masked().String(), interfaceName, ip.String(), "main"); err != nil {
+		return err
+	}
+
 	if autoRoute {
 		err = configInterfaceRouting(interfaceName, addr, autoDetectInterface)
 	}
@@ -62,7 +78,7 @@ func configInterfaceRouting(interfaceName string, addr netip.Prefix, autoDetectI
 	execAddRuleCmd(fmt.Sprintf("not from all iif lo lookup %d pref 9004", tableId))
 
 	if autoDetectInterface {
-		go DefaultInterfaceChangeMonitor()
+		go DefaultInterfaceChangeMonitor(interfaceName)
 	}
 
 	return nil

listener/tun/ipstack/commons/router_darwin.go

@@ -8,7 +8,7 @@ import (
 	"github.com/Dreamacro/clash/listener/tun/device"
 )
 
-func GetAutoDetectInterface() (string, error) {
+func GetAutoDetectInterface(string) (string, error) {
 	return cmd.ExecCmd("bash -c route -n get default | grep 'interface:' | awk -F ' ' 'NR==1{print $2}' | xargs echo -n")
 }
 
@@ -55,7 +55,7 @@ func configInterfaceRouting(interfaceName string, addr netip.Prefix, autoDetectI
 	}
 
 	if autoDetectInterface {
-		go DefaultInterfaceChangeMonitor()
+		go DefaultInterfaceChangeMonitor(interfaceName)
 	}
 
 	return execRouterCmd("add", "-inet6", "2000::/3", interfaceName)

listener/tun/ipstack/commons/router_linux.go

@@ -9,7 +9,7 @@ import (
 	"net/netip"
 )
 
-func GetAutoDetectInterface() (string, error) {
+func GetAutoDetectInterface(string) (string, error) {
 	return cmd.ExecCmd("bash -c ip route show | grep 'default via' | awk -F ' ' 'NR==1{print $5}' | xargs echo -n")
 }
 
@@ -47,7 +47,7 @@ func configInterfaceRouting(interfaceName string, addr netip.Prefix, autoDetectI
 	}
 
 	if autoDetectInterface {
-		go DefaultInterfaceChangeMonitor()
+		go DefaultInterfaceChangeMonitor(interfaceName)
 	}
 
 	return nil

listener/tun/ipstack/commons/router_others.go

@@ -10,7 +10,7 @@ import (
 	"github.com/Dreamacro/clash/listener/tun/device"
 )
 
-func GetAutoDetectInterface() (string, error) {
+func GetAutoDetectInterface(string) (string, error) {
 	return "", fmt.Errorf("can not auto detect interface-name on this OS: %s, you must be detecting interface-name by manual", runtime.GOOS)
 }
 

listener/tun/ipstack/commons/router_windows.go

@@ -18,7 +18,7 @@ import (
 
 var wintunInterfaceName string
 
-func GetAutoDetectInterface() (string, error) {
+func GetAutoDetectInterface(string) (string, error) {
 	ifname, err := getAutoDetectInterfaceByFamily(winipcfg.AddressFamily(windows.AF_INET))
 	if err == nil {
 		return ifname, err
@@ -206,7 +206,7 @@ startOver:
 	wintunInterfaceName = dev.Name()
 
 	if autoDetectInterface {
-		go DefaultInterfaceChangeMonitor()
+		go DefaultInterfaceChangeMonitor(dev.Name())
 	}
 
 	return nil