From 8d0ae4284db7683115c9ebf456080a1b40e794ba Mon Sep 17 00:00:00 2001 From: yaling888 <73897884+yaling888@users.noreply.github.com> Date: Thu, 17 Mar 2022 07:41:18 +0800 Subject: [PATCH] Chore: use gateway address of fake ip pool as the TUN device address --- component/process/process.go | 6 +++++- hub/executor/executor.go | 6 +++--- listener/listener.go | 4 ++-- listener/tun/ipstack/commons/router_darwin.go | 2 +- listener/tun/ipstack/commons/router_windows.go | 2 +- listener/tun/ipstack/system/stack.go | 2 +- listener/tun/tun_adapter.go | 11 +++++++++-- 7 files changed, 22 insertions(+), 11 deletions(-) diff --git a/component/process/process.go b/component/process/process.go index 2fc288c5..deaf11b5 100644 --- a/component/process/process.go +++ b/component/process/process.go @@ -34,8 +34,12 @@ func ShouldFindProcess(metadata *C.Metadata) bool { return false } +func AppendLocalIPs(ip ...net.IP) { + localIPs = append(ip, localIPs...) +} + func getLocalIPs() []net.IP { - ips := []net.IP{net.IPv4(198, 18, 0, 1), net.IPv4zero, net.IPv6zero} + ips := []net.IP{net.IPv4zero, net.IPv6zero} netInterfaces, err := net.Interfaces() if err != nil { diff --git a/hub/executor/executor.go b/hub/executor/executor.go index f79ece87..dd4f4acf 100644 --- a/hub/executor/executor.go +++ b/hub/executor/executor.go @@ -81,7 +81,7 @@ func ApplyConfig(cfg *config.Config, force bool) { updateDNS(cfg.DNS, cfg.Tun) updateGeneral(cfg.General, force) updateIPTables(cfg.DNS, cfg.General.TProxyPort, cfg.General.Interface, cfg.Tun.Enable) - updateTun(cfg.Tun) + updateTun(cfg.Tun, cfg.DNS.FakeIPRange.IPNet().String()) updateExperimental(cfg) log.SetLevel(cfg.General.LogLevel) @@ -176,8 +176,8 @@ func updateRules(rules []C.Rule) { tunnel.UpdateRules(rules) } -func updateTun(tun *config.Tun) { - P.ReCreateTun(tun, tunnel.TCPIn(), tunnel.UDPIn()) +func updateTun(tun *config.Tun, tunAddressPrefix string) { + P.ReCreateTun(tun, tunAddressPrefix, tunnel.TCPIn(), tunnel.UDPIn()) } func updateGeneral(general *config.General, force bool) { diff --git a/listener/listener.go b/listener/listener.go index 14d57322..46157e5d 100644 --- a/listener/listener.go +++ b/listener/listener.go @@ -307,7 +307,7 @@ func ReCreateMixed(port int, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.P log.Infoln("Mixed(http+socks) proxy listening at: %s", mixedListener.Address()) } -func ReCreateTun(tunConf *config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { +func ReCreateTun(tunConf *config.Tun, tunAddressPrefix string, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) { tunMux.Lock() defer tunMux.Unlock() @@ -328,7 +328,7 @@ func ReCreateTun(tunConf *config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- * return } - tunStackListener, err = tun.New(tunConf, tcpIn, udpIn) + tunStackListener, err = tun.New(tunConf, tunAddressPrefix, tcpIn, udpIn) } // GetPorts return the ports of proxy servers diff --git a/listener/tun/ipstack/commons/router_darwin.go b/listener/tun/ipstack/commons/router_darwin.go index fb017511..97233144 100644 --- a/listener/tun/ipstack/commons/router_darwin.go +++ b/listener/tun/ipstack/commons/router_darwin.go @@ -20,7 +20,7 @@ func ConfigInterfaceAddress(dev device.Device, addr netip.Prefix, forceMTU int, var ( interfaceName = dev.Name() ip = addr.Masked().Addr().Next() - gw = addr.Addr() + gw = ip netmask = IPv4MaskString(addr.Bits()) ) diff --git a/listener/tun/ipstack/commons/router_windows.go b/listener/tun/ipstack/commons/router_windows.go index 51dbcd7c..05ac7fb1 100644 --- a/listener/tun/ipstack/commons/router_windows.go +++ b/listener/tun/ipstack/commons/router_windows.go @@ -121,7 +121,7 @@ startOver: // add gateway deduplicatedRoutes = append(deduplicatedRoutes, &winipcfg.RouteData{ Destination: addr.Masked(), - NextHop: addr.Addr(), + NextHop: addr.Masked().Addr().Next().Next(), Metric: 0, }) diff --git a/listener/tun/ipstack/system/stack.go b/listener/tun/ipstack/system/stack.go index 85fdd947..01e4c952 100644 --- a/listener/tun/ipstack/system/stack.go +++ b/listener/tun/ipstack/system/stack.go @@ -40,8 +40,8 @@ var ipv4LoopBack = netip.MustParsePrefix("127.0.0.0/8") func New(device device.Device, dnsHijack []netip.AddrPort, tunAddress netip.Prefix, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) (ipstack.Stack, error) { var ( - portal = tunAddress.Addr() gateway = tunAddress.Masked().Addr().Next() + portal = gateway.Next() ) stack, err := mars.StartListener(device, gateway, portal) diff --git a/listener/tun/tun_adapter.go b/listener/tun/tun_adapter.go index d04cf498..5c9361c5 100644 --- a/listener/tun/tun_adapter.go +++ b/listener/tun/tun_adapter.go @@ -9,6 +9,7 @@ import ( "github.com/Dreamacro/clash/adapter/inbound" "github.com/Dreamacro/clash/common/cmd" + "github.com/Dreamacro/clash/component/process" "github.com/Dreamacro/clash/config" C "github.com/Dreamacro/clash/constant" "github.com/Dreamacro/clash/listener/tun/device" @@ -22,9 +23,9 @@ import ( ) // New TunAdapter -func New(tunConf *config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) (ipstack.Stack, error) { +func New(tunConf *config.Tun, tunAddressPrefix string, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) (ipstack.Stack, error) { var ( - tunAddress = netip.MustParsePrefix("198.18.255.254/16") + tunAddress = netip.MustParsePrefix(tunAddressPrefix) devName = tunConf.Device stackType = tunConf.Stack autoRoute = tunConf.AutoRoute @@ -40,6 +41,12 @@ func New(tunConf *config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound. devName = generateDeviceName() } + if !tunAddress.IsValid() || !tunAddress.Addr().Is4() { + tunAddress = netip.MustParsePrefix("198.18.0.1/16") + } + + process.AppendLocalIPs(tunAddress.Masked().Addr().Next().AsSlice()) + // open tun device tunDevice, err = parseDevice(devName, uint32(mtu)) if err != nil {