Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2025-02-23 12:42:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Fixed] launch resolver an enhancer when tun mode

Browse Source
This commit is contained in:
Skyxim 2021-12-09 23:00:54 +08:00
parent b0fdd8dc47
commit 9e44e21406
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -251,6 +251,8 @@ func ParseRawConfig(rawCfg *RawConfig) (*Config, error) {
return nil, err return nil, err
} }
config.General = general config.General = general
//TODO 暂未使用
config.Tun = &rawCfg.Tun
proxies, providers, err := parseProxies(rawCfg) proxies, providers, err := parseProxies(rawCfg)
if err != nil { if err != nil {

16
hub/executor/executor.go
View File

@ -114,7 +114,7 @@ func GetGeneral() *config.General {
func updateExperimental(c *config.Config) {} func updateExperimental(c *config.Config) {}
func updateDNS(c *config.DNS, general *config.General) { func updateDNS(c *config.DNS, general *config.General) {
if !c.Enable { if !c.Enable && !general.Tun.Enable {
resolver.DefaultResolver = nil resolver.DefaultResolver = nil
resolver.MainResolver = nil resolver.MainResolver = nil
resolver.DefaultHostMapper = nil resolver.DefaultHostMapper = nil
@ -158,13 +158,15 @@ func updateDNS(c *config.DNS, general *config.General) {
resolver.DefaultLocalServer = nil resolver.DefaultLocalServer = nil
} }
if err := dns.ReCreateServer(c.Listen, r, m); err != nil { if c.Enable {
log.Errorln("Start DNS server error: %s", err.Error()) if err := dns.ReCreateServer(c.Listen, r, m); err != nil {
return log.Errorln("Start DNS server error: %s", err.Error())
} return
}
if c.Listen != "" { if c.Listen != "" {
log.Infoln("DNS server listening at: %s", c.Listen) log.Infoln("DNS server listening at: %s", c.Listen)
}
} }
} }