daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* use dnsproxy v0.22.0 and urlfilter v0.7.0

Browse Source
This commit is contained in:
Simon Zolin
2019-11-27 15:11:46 +03:00
parent 07a9c3bd45
commit 8dbdf49c32
5 changed files with 82 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
home/blocked_services.go
View File

@@ -6,10 +6,10 @@ import (
"github.com/AdguardTeam/AdGuardHome/dnsfilter"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/urlfilter"
"github.com/AdguardTeam/urlfilter/rules"
)
var serviceRules map[string][]*urlfilter.NetworkRule // service name -> filtering rules
var serviceRules map[string][]*rules.NetworkRule // service name -> filtering rules
type svc struct {
name string
@@ -121,18 +121,18 @@ var serviceRulesArray = []svc{
// convert array to map
func initServices() {
serviceRules = make(map[string][]*urlfilter.NetworkRule)
serviceRules = make(map[string][]*rules.NetworkRule)
for _, s := range serviceRulesArray {
rules := []*urlfilter.NetworkRule{}
netRules := []*rules.NetworkRule{}
for _, text := range s.rules {
rule, err := urlfilter.NewNetworkRule(text, 0)
rule, err := rules.NewNetworkRule(text, 0)
if err != nil {
log.Error("urlfilter.NewNetworkRule: %s rule: %s", err, text)
log.Error("rules.NewNetworkRule: %s rule: %s", err, text)
continue
}
rules = append(rules, rule)
netRules = append(netRules, rule)
}
serviceRules[s.name] = rules
serviceRules[s.name] = netRules
}
}