xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: adjust the configuration loading order

Browse source
This commit is contained in:
gVisor bot 2023-02-23 14:13:27 +08:00
parent 62b2f9f3eb
commit 4be11bfa08
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
hub/executor/executor.go
View file

@ -144,6 +144,10 @@ func updateListeners(general *config.General, listeners map[string]C.InboundList
return return
} }
if general.Interface == "" && (!general.Tun.Enable || !general.Tun.AutoDetectInterface) {
dialer.DefaultInterface.Store(general.Interface)
}
inbound.SetTfo(general.InboundTfo) inbound.SetTfo(general.InboundTfo)
allowLan := general.AllowLan allowLan := general.AllowLan
listener.SetAllowLan(allowLan) listener.SetAllowLan(allowLan)
@ -339,9 +343,14 @@ func updateGeneral(general *config.General) {
adapter.UnifiedDelay.Store(general.UnifiedDelay) adapter.UnifiedDelay.Store(general.UnifiedDelay)
// Avoid reload configuration clean the value, causing traffic loops // Avoid reload configuration clean the value, causing traffic loops
if general.Interface != "" && general.Tun.Enable && !general.Tun.AutoDetectInterface { if listener.GetTunConf().Enable && listener.GetTunConf().AutoDetectInterface {
// changed only when the name is specified
// if name is empty, setting delay until after tun loaded
if general.Interface != "" && (!general.Tun.Enable || !general.Tun.AutoDetectInterface) {
dialer.DefaultInterface.Store(general.Interface)
}
} else {
dialer.DefaultInterface.Store(general.Interface) dialer.DefaultInterface.Store(general.Interface)
log.Infoln("Use interface name: %s", general.Interface)
} }
dialer.DefaultRoutingMark.Store(int32(general.RoutingMark)) dialer.DefaultRoutingMark.Store(int32(general.RoutingMark))