github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #753 from vlabo/develop

Browse Source 
Fix automatic merge compile errors
This commit is contained in:
Vladimir Stoilov
2022-07-21 16:08:42 +02:00
committed by GitHub
parent d1f7b3b609 bdb4a1a8e8
commit ce5bc91af2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resolver/config.go
View File

@@ -119,7 +119,7 @@ The format is: "protocol://ip:port?parameter=value&parameter=value"
config.DisplayOrderAnnotation: cfgOptionNameServersOrder, config.DisplayOrderAnnotation: cfgOptionNameServersOrder,
config.CategoryAnnotation: "Servers", config.CategoryAnnotation: "Servers",
config.QuickSettingsAnnotation: []config.QuickSetting{ config.QuickSettingsAnnotation: []config.QuickSetting{
{ {
Name: "Cloudflare (with Malware Filter)", Name: "Cloudflare (with Malware Filter)",
Action: config.QuickReplace, Action: config.QuickReplace,
Value: []string{ Value: []string{

5
resolver/resolvers.go
View File

@@ -43,9 +43,10 @@ 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
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 { func indexOfScope(domain string, list []*Scope) int {