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

Pull request: all: upd go, tools

Browse Source 
Merge in DNS/adguard-home from upd-go to master

Squashed commit of the following:

commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 13 17:46:24 2022 +0300

    all: upd go, tools
This commit is contained in:
Ainar Garipov
2022-04-13 18:16:33 +03:00
parent 2c2c0d445b
commit 21a1187ed2
10 changed files with 236 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/filtering/filtering.go
View File

@@ -471,7 +471,7 @@ func (d *DNSFilter) matchSysHosts(
return res, nil
}
dnsres, _ := d.EtcHosts.MatchRequest(urlfilter.DNSRequest{
dnsres, _ := d.EtcHosts.MatchRequest(&urlfilter.DNSRequest{
Hostname: host,
SortedClientTags: setts.ClientTags,
// TODO(e.burkov): Wait for urlfilter update to pass net.IP.
@@ -802,7 +802,7 @@ func (d *DNSFilter) matchHost(
return Result{}, nil
}
ureq := urlfilter.DNSRequest{
ureq := &urlfilter.DNSRequest{
Hostname: host,
SortedClientTags: setts.ClientTags,
// TODO(e.burkov): Wait for urlfilter update to pass net.IP.