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

Pull request: * dnsforward, querylog: set client_proto for logs correctly

Browse Source 
Merge in DNS/adguard-home from 2241-doq-logs to master

Squashed commit of the following:

commit a15cab05358e3c0b97f8257f8b9628fa590e7e7d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Nov 3 14:22:25 2020 +0300

    * all: update dnsproxy

commit 5fb0919a7528dc6ee7a433a8096b550f3691771c
Merge: b22b1dff4 64c1a68fb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Nov 3 14:22:15 2020 +0300

    Merge branch 'master' into 2241-doq-logs

commit b22b1dff43e541d77160fd5c234483bbf0f6d8de
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Nov 3 12:37:23 2020 +0300

    * dnsforward, querylog: set client_proto for logs correctly
This commit is contained in:
Ainar Garipov
2020-11-03 15:39:55 +03:00
parent 64c1a68fb9
commit df34ee5c09
9 changed files with 108 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/querylog/decode.go
View File

@@ -38,7 +38,7 @@ func decodeLogEntry(ent *logEntry, str string) {
ent.QClass = v
case "CP":
ent.ClientProto = v
ent.ClientProto, err = NewClientProto(v)
case "Answer":
ent.Answer, err = base64.StdEncoding.DecodeString(v)