fix: some default value in dialer not restore in tun when config reload

wwqgtxx · wwqgtxx · commit c0de3c0e42dc · 2025-03-10T11:10:39.000+08:00
diff --git a/listener/listener.go b/listener/listener.go
@@ -512,6 +512,9 @@ func ReCreateTun(tunConf LC.Tun, tunnel C.Tunnel) {
 	}()
 
 	if tunConf.Equal(LastTunConf) {
+		if tunLister != nil { // some default value in dialer maybe changed when config reload, reset at here
+			tunLister.OnReload()
+		}
 		return
 	}
 
diff --git a/listener/sing_tun/server.go b/listener/sing_tun/server.go
@@ -307,7 +307,7 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 				defaultInterfaceMonitor: defaultInterfaceMonitor,
 			}
 			if !dialer.DefaultInterfaceFinder.CompareAndSwap(nil, l.cDialerInterfaceFinder) {
-				err = E.New("don't allowed two tun listener using auto-detect-interface")
+				err = E.New("not allowed two tun listener using auto-detect-interface")
 				return
 			}
 		}
@@ -450,7 +450,10 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis
 		}
 		if tunOptions.AutoRedirectMarkMode {
 			l.autoRedirectOutputMark = int32(outputMark)
-			dialer.DefaultRoutingMark.Store(l.autoRedirectOutputMark)
+			if !dialer.DefaultRoutingMark.CompareAndSwap(0, l.autoRedirectOutputMark) {
+				err = E.New("not allowed setting global routing-mark when working with autoRedirectMarkMode")
+				return
+			}
 			l.autoRedirect.UpdateRouteAddressSet()
 			l.ruleUpdateCallbackCloser = rpTunnel.RuleUpdateCallback().Register(l.ruleUpdateCallback)
 		}
@@ -517,6 +520,15 @@ func (l *Listener) updateRule(ruleProvider provider.RuleProvider, exclude bool,
 	}
 }
 
+func (l *Listener) OnReload() {
+	if l.autoRedirectOutputMark != 0 {
+		dialer.DefaultRoutingMark.CompareAndSwap(0, l.autoRedirectOutputMark)
+	}
+	if l.cDialerInterfaceFinder != nil {
+		dialer.DefaultInterfaceFinder.CompareAndSwap(nil, l.cDialerInterfaceFinder)
+	}
+}
+
 type cDialerInterfaceFinder struct {
 	tunName                 string
 	defaultInterfaceMonitor tun.DefaultInterfaceMonitor

Original file line number	Diff line number	Diff line change
`@@ -512,6 +512,9 @@ func ReCreateTun(tunConf LC.Tun, tunnel C.Tunnel) {`
`512`	`512`	`}()`
`513`	`513`
`514`	`514`	`if tunConf.Equal(LastTunConf) {`
	`515`	`+ if tunLister != nil { // some default value in dialer maybe changed when config reload, reset at here`
	`516`	`+ tunLister.OnReload()`
	`517`	`+ }`
`515`	`518`	`return`
`516`	`519`	`}`
`517`	`520`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis`
`307`	`307`	`defaultInterfaceMonitor: defaultInterfaceMonitor,`
`308`	`308`	`}`
`309`	`309`	`if !dialer.DefaultInterfaceFinder.CompareAndSwap(nil, l.cDialerInterfaceFinder) {`
`310`		`- err = E.New("don't allowed two tun listener using auto-detect-interface")`
	`310`	`+ err = E.New("not allowed two tun listener using auto-detect-interface")`
`311`	`311`	`return`
`312`	`312`	`}`
`313`	`313`	`}`
`@@ -450,7 +450,10 @@ func New(options LC.Tun, tunnel C.Tunnel, additions ...inbound.Addition) (l *Lis`
`450`	`450`	`}`
`451`	`451`	`if tunOptions.AutoRedirectMarkMode {`
`452`	`452`	`l.autoRedirectOutputMark = int32(outputMark)`
`453`		`- dialer.DefaultRoutingMark.Store(l.autoRedirectOutputMark)`
	`453`	`+ if !dialer.DefaultRoutingMark.CompareAndSwap(0, l.autoRedirectOutputMark) {`
	`454`	`+ err = E.New("not allowed setting global routing-mark when working with autoRedirectMarkMode")`
	`455`	`+ return`
	`456`	`+ }`
`454`	`457`	`l.autoRedirect.UpdateRouteAddressSet()`
`455`	`458`	`l.ruleUpdateCallbackCloser = rpTunnel.RuleUpdateCallback().Register(l.ruleUpdateCallback)`
`456`	`459`	`}`
`@@ -517,6 +520,15 @@ func (l *Listener) updateRule(ruleProvider provider.RuleProvider, exclude bool,`
`517`	`520`	`}`
`518`	`521`	`}`
`519`	`522`
	`523`	`+func (l *Listener) OnReload() {`
	`524`	`+ if l.autoRedirectOutputMark != 0 {`
	`525`	`+ dialer.DefaultRoutingMark.CompareAndSwap(0, l.autoRedirectOutputMark)`
	`526`	`+ }`
	`527`	`+ if l.cDialerInterfaceFinder != nil {`
	`528`	`+ dialer.DefaultInterfaceFinder.CompareAndSwap(nil, l.cDialerInterfaceFinder)`
	`529`	`+ }`
	`530`	`+}`
	`531`	`+`
`520`	`532`	`type cDialerInterfaceFinder struct {`
`521`	`533`	`tunName string`
`522`	`534`	`defaultInterfaceMonitor tun.DefaultInterfaceMonitor`