mirror of
https://github.com/safing/portmaster
synced 2025-09-02 02:29:12 +00:00
Fix merge issues
This commit is contained in:
parent
b71417dde6
commit
bdb4a1a8e8
2 changed files with 4 additions and 3 deletions
|
@ -43,6 +43,7 @@ var (
|
||||||
systemResolvers []*Resolver // all resolvers that were assigned by the system
|
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
|
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
|
activeResolvers map[string]*Resolver // lookup map of all resolvers
|
||||||
|
currentResolverConfig []string // current active resolver config, to detect changes
|
||||||
resolverInitDomains map[string]struct{} // a set with all domains of the dns resolvers
|
resolverInitDomains map[string]struct{} // a set with all domains of the dns resolvers
|
||||||
|
|
||||||
resolversLock sync.RWMutex
|
resolversLock sync.RWMutex
|
||||||
|
|
Loading…
Add table
Reference in a new issue