From 27f0f65bfbb927b7d5c5b163650786c5b07c8629 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Fri, 7 Jan 2022 22:32:02 +0800 Subject: [PATCH] [Style] Adjust the routing table of tun on mac --- listener/tun/dev/dev_darwin.go | 48 ++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/listener/tun/dev/dev_darwin.go b/listener/tun/dev/dev_darwin.go index 9424c16b..cde63c96 100644 --- a/listener/tun/dev/dev_darwin.go +++ b/listener/tun/dev/dev_darwin.go @@ -5,11 +5,13 @@ package dev import ( "bytes" - "errors" "fmt" + "github.com/Dreamacro/clash/log" "net" "os" "os/exec" + "regexp" + "strings" "sync" "syscall" "unsafe" @@ -176,7 +178,7 @@ func OpenTunDevice(tunAddress string, autoRoute bool) (TunDevice, error) { } if autoRoute { - SetLinuxAutoRoute() + setAutoRoute(tunAddress) } return tun, nil @@ -480,15 +482,39 @@ func (t *tunDarwin) attachLinkLocal() error { // GetAutoDetectInterface get ethernet interface func GetAutoDetectInterface() (string, error) { - cmd := exec.Command("bash", "-c", "netstat -rnf inet | grep 'default' | awk -F ' ' 'NR==1{print $6}' | xargs echo -n") - var out bytes.Buffer - cmd.Stdout = &out - err := cmd.Run() - if err != nil { + cmd := exec.Command("route", "-n", "get", "default") + if result, err := cmd.Output(); err != nil { return "", err + } else { + resultString := string(result) + reg, err := regexp.Compile("(interface:)(.*)") + if err != nil { + return "", err + } + matchResult := reg.FindStringSubmatch(resultString) + interfaceName := strings.TrimSpace(matchResult[len(matchResult)-1]) + return interfaceName, nil + } + +} + +func setAutoRoute(tunGateway string) { + addRoute("1", tunGateway) + addRoute("2/7", tunGateway) + addRoute("4/6", tunGateway) + addRoute("8/5", tunGateway) + addRoute("16/4", tunGateway) + addRoute("32/3", tunGateway) + addRoute("64/2", tunGateway) + addRoute("128.0/1", tunGateway) + addRoute("198.18.0/16", tunGateway) +} + +func addRoute(net, name string) { + cmd := exec.Command("route", "add", "-net", net, name) + var stderr bytes.Buffer + cmd.Stderr = &stderr + if err := cmd.Run(); err != nil { + log.Errorln("[auto route] Failed to add system route: %s: %s , cmd: %s", err.Error(), stderr.String(), cmd.String()) } - if out.Len() == 0 { - return "", errors.New("interface not found by default route") - } - return out.String(), nil }