vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-01 18:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix merge issues

Browse source
This commit is contained in:
Vladimir Stoilov 2022-07-21 15:57:45 +02:00
parent b71417dde6
commit bdb4a1a8e8
2 changed files with 4 additions and 3 deletions
Show stats 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.CategoryAnnotation: "Servers",
config.QuickSettingsAnnotation: []config.QuickSetting{
{
{
Name: "Cloudflare (with Malware Filter)",
Action: config.QuickReplace,
Value: []string{

5
resolver/resolvers.go
View file

@ -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 {