test

monitor_windows.go

@@ -2,6 +2,7 @@ package tun
 
 import (
 	"sync"
+	"sync/atomic"
 
 	"github.com/sagernet/sing-tun/internal/winipcfg"
 	E "github.com/sagernet/sing/common/exceptions"
@@ -26,8 +27,13 @@ func NewNetworkUpdateMonitor(logger logger.Logger) (NetworkUpdateMonitor, error)
 	}, nil
 }
 
+var disableRouteUpdateMonitor atomic.Bool
+
 func (m *networkUpdateMonitor) Start() error {
 	routeListener, err := winipcfg.RegisterRouteChangeCallback(func(notificationType winipcfg.MibNotificationType, route *winipcfg.MibIPforwardRow2) {
+		if disableRouteUpdateMonitor.Load() {
+			return
+		}
 		m.emit()
 	})
 	if err != nil {

tun_windows.go

@@ -167,20 +167,18 @@ func (t *NativeTun) Start() error {
 		return nil
 	}
 	luid := winipcfg.LUID(t.adapter.LUID())
+	err := luid.FlushRoutes(windows.AF_UNSPEC)
+	if err != nil {
+		return err
+	}
 	gateway4, gateway6 := t.options.Inet4GatewayAddr(), t.options.Inet6GatewayAddr()
 	routeRanges, err := t.options.BuildAutoRouteRanges(false)
 	if err != nil {
 		return err
 	}
-	for _, routeRange := range routeRanges {
-		if routeRange.Addr().Is4() {
-			err = luid.AddRoute(routeRange, gateway4, 0)
-		} else {
-			err = luid.AddRoute(routeRange, gateway6, 0)
-		}
-		if err != nil {
-			return err
-		}
+	err = addRouteList(luid, routeRanges, gateway4, gateway6, 0)
+	if err != nil {
+		return err
 	}
 	err = windnsapi.FlushResolverCache()
 	if err != nil {
@@ -560,20 +558,48 @@ func (t *NativeTun) UpdateRouteOptions(tunOptions Options) error {
 	if err != nil {
 		return err
 	}
-	for _, routeRange := range routeRanges {
-		if routeRange.Addr().Is4() {
-			err = luid.AddRoute(routeRange, gateway4, 0)
+	err = addRouteList(luid, routeRanges, gateway4, gateway6, 0)
+	if err != nil {
+		return err
+	}
+	err = windnsapi.FlushResolverCache()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func addRouteList(luid winipcfg.LUID, destinations []netip.Prefix, gateway4 netip.Addr, gateway6 netip.Addr, metric uint32) error {
+	disableRouteUpdateMonitor.Store(true)
+	defer disableRouteUpdateMonitor.Store(false)
+
+	row := winipcfg.MibIPforwardRow2{}
+	row.Init()
+	row.InterfaceLUID = luid
+	row.Metric = metric
+	nextHop4 := row.NextHop
+	nextHop6 := row.NextHop
+	if gateway4.IsValid() {
+		nextHop4.SetAddr(gateway4)
+	}
+	if gateway6.IsValid() {
+		nextHop6.SetAddr(gateway6)
+	}
+	for _, destination := range destinations {
+		err := row.DestinationPrefix.SetPrefix(destination)
+		if err != nil {
+			return err
+		}
+		if destination.Addr().Is4() {
+			row.NextHop = nextHop4
 		} else {
-			err = luid.AddRoute(routeRange, gateway6, 0)
+			row.NextHop = nextHop6
 		}
+		err = row.Create()
 		if err != nil {
 			return err
 		}
 	}
-	err = windnsapi.FlushResolverCache()
-	if err != nil {
-		return err
-	}
 	return nil
 }