From bdb4a1a8e86ddcba197f38ccdd9139d14d2bd10d Mon Sep 17 00:00:00 2001 From: Vladimir Stoilov Date: Thu, 21 Jul 2022 15:57:45 +0200 Subject: [PATCH] Fix merge issues --- resolver/config.go | 2 +- resolver/resolvers.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resolver/config.go b/resolver/config.go index 14ad9911..19f299d3 100644 --- a/resolver/config.go +++ b/resolver/config.go @@ -119,7 +119,7 @@ The format is: "protocol://ip:port?parameter=value¶meter=value" config.DisplayOrderAnnotation: cfgOptionNameServersOrder, config.CategoryAnnotation: "Servers", config.QuickSettingsAnnotation: []config.QuickSetting{ - { + { Name: "Cloudflare (with Malware Filter)", Action: config.QuickReplace, Value: []string{ diff --git a/resolver/resolvers.go b/resolver/resolvers.go index 856f6f8a..bc6ecbf6 100644 --- a/resolver/resolvers.go +++ b/resolver/resolvers.go @@ -43,9 +43,10 @@ var ( systemResolvers []*Resolver // all resolvers that were assigned by the system localScopes []*Scope // list of scopes with a list of local resolvers that can resolve the scope activeResolvers map[string]*Resolver // lookup map of all resolvers - resolverInitDomains map[string]struct{} // a set with all domains of the dns resolvers + currentResolverConfig []string // current active resolver config, to detect changes + resolverInitDomains map[string]struct{} // a set with all domains of the dns resolvers - resolversLock sync.RWMutex + resolversLock sync.RWMutex ) func indexOfScope(domain string, list []*Scope) int {