better tun config passing

wwqgtxx · Nov 3, 2022 · a92438b · a92438b
1 parent dc44598
commit a92438b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/adapter/provider/healthcheck.go b/adapter/provider/healthcheck.go
@@ -70,7 +70,7 @@ func (hc *HealthCheck) lazyCheck() bool {
 		hc.check()
 		return true
 	} else {
-		log.Infoln("Skip once health check because we are lazy (%s)", hc.gName)
+		log.Debugln("Skip once health check because we are lazy (%s)", hc.gName)
 		return false
 	}
 }

diff --git a/hub/route/configs.go b/hub/route/configs.go
@@ -137,7 +137,7 @@ func patchConfigs(w http.ResponseWriter, r *http.Request) {
 	P.ReCreateRedir(pointerOrDefault(general.RedirPort, ports.RedirPort), tcpIn, udpIn)
 	P.ReCreateTProxy(pointerOrDefault(general.TProxyPort, ports.TProxyPort), tcpIn, udpIn)
 	P.ReCreateMixed(pointerOrDefault(general.MixedPort, ports.MixedPort), tcpIn, udpIn)
-	P.ReCreateTun(pointerOrDefaultTun(general.Tun, P.Tun()), tcpIn, udpIn)
+	P.ReCreateTun(pointerOrDefaultTun(general.Tun, P.LastTunConf), tcpIn, udpIn)
 	P.ReCreateMixEC(pointerOrDefaultString(general.MixECConfig, ports.MixECConfig), tcpIn, udpIn)
 	P.ReCreateShadowSocks(pointerOrDefaultString(general.ShadowSocksConfig, ports.ShadowSocksConfig), tcpIn, udpIn)
 	P.ReCreateVmess(pointerOrDefaultString(general.VmessConfig, ports.VmessConfig), tcpIn, udpIn)

diff --git a/listener/listener.go b/listener/listener.go
@@ -61,7 +61,7 @@ var (
 	udpTunMux sync.Mutex
 	mtpMux    sync.Mutex
 
-	tunConfig config.Tun
+	LastTunConf config.Tun
 )
 
 type Ports struct {
@@ -80,7 +80,7 @@ type Ports struct {
 
 func Tun() config.Tun {
 	if tunLister == nil {
-		return tunConfig
+		return LastTunConf
 	}
 	return tunLister.Config()
 }
@@ -504,7 +504,7 @@ func ReCreateTun(conf config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbo
 	shouldIgnore := false
 
 	if tunLister != nil {
-		if tunLister.Config().String() != conf.String() {
+		if LastTunConf.String() != conf.String() {
 			tunLister.Close()
 			tunLister = nil
 		} else {
@@ -517,7 +517,7 @@ func ReCreateTun(conf config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbo
 		return
 	}
 
-	tunConfig = conf
+	LastTunConf = conf
 
 	generalInterface := dialer.GeneralInterface.Load()
 	defaultInterface := dialer.DefaultInterface.Load()

diff --git a/listener/sing_tun/server.go b/listener/sing_tun/server.go
@@ -41,6 +41,7 @@ func New(options config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.P
 	tunName := options.InterfaceName
 	if tunName == "" {
 		tunName = tun.CalculateInterfaceName(InterfaceName)
+		options.InterfaceName = tunName
 	}
 	tunMTU := options.MTU
 	if tunMTU == 0 {