From 25936c8361e3c9810fe2ada44393e173275700fb Mon Sep 17 00:00:00 2001 From: kr328 Date: Sun, 14 Nov 2021 19:40:02 +0800 Subject: [PATCH] Fix: fix dns fake-ip patch --- .../src/main/golang/native/config/defaults.go | 1 + core/src/main/golang/native/config/process.go | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/core/src/main/golang/native/config/defaults.go b/core/src/main/golang/native/config/defaults.go index 41fb30df..371970f8 100644 --- a/core/src/main/golang/native/config/defaults.go +++ b/core/src/main/golang/native/config/defaults.go @@ -20,4 +20,5 @@ var ( // Nintendo Switch "*.n.n.srv.nintendo.net", } + defaultFakeIPRange = "28.0.0.0/8" ) diff --git a/core/src/main/golang/native/config/process.go b/core/src/main/golang/native/config/process.go index 782baca9..7ef379fe 100644 --- a/core/src/main/golang/native/config/process.go +++ b/core/src/main/golang/native/config/process.go @@ -62,19 +62,24 @@ func patchProfile(cfg *config.RawConfig, _ string) error { func patchDns(cfg *config.RawConfig, _ string) error { if !cfg.DNS.Enable { - cfg.DNS.Enable = true - cfg.DNS.IPv6 = false - cfg.DNS.NameServer = defaultNameServers - cfg.DNS.EnhancedMode = C.DNSFakeIP - cfg.DNS.FakeIPRange = "28.0.0.0/8" - cfg.DNS.DefaultNameserver = defaultNameServers - cfg.DNS.FakeIPFilter = defaultFakeIPFilter + cfg.DNS = config.RawDNS{ + Enable: true, + UseHosts: true, + DefaultNameserver: defaultNameServers, + NameServer: defaultNameServers, + EnhancedMode: C.DNSFakeIP, + FakeIPRange: defaultFakeIPRange, + FakeIPFilter: defaultFakeIPFilter, + FallbackFilter: config.RawFallbackFilter{ + GeoIP: false, + }, + } cfg.ClashForAndroid.AppendSystemDNS = true } if cfg.ClashForAndroid.AppendSystemDNS { - cfg.DNS.NameServer = append(cfg.DNS.NameServer, "dhcp://" + dns.SystemDNSPlaceholder) + cfg.DNS.NameServer = append(cfg.DNS.NameServer, "dhcp://"+dns.SystemDNSPlaceholder) } return nil