vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 10:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #158 from safing/fix/no-extra-section-dns-response

Browse source 
Fix second write when responding with extra section
This commit is contained in:
Daniel 2020-09-25 11:35:11 +02:00 • committed by GitHub
commit 03830b4ea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nameserver/response.go
View file

@ -53,7 +53,7 @@ func writeDNSResponse(w dns.ResponseWriter, m *dns.Msg) (err error) {
}() }()
err = w.WriteMsg(m) err = w.WriteMsg(m)
if err == nil { if err != nil {
// If we receive an error we might have exceeded the message size with all // If we receive an error we might have exceeded the message size with all
// our extra information records. Retry again without the extra section. // our extra information records. Retry again without the extra section.
m.Extra = nil m.Extra = nil

4
resolver/resolve.go
View file

@ -309,7 +309,7 @@ retry:
} }
} }
func resolveAndCache(ctx context.Context, q *Query, oldCache *RRCache) (rrCache *RRCache, err error) { //nolint:gocognit func resolveAndCache(ctx context.Context, q *Query, oldCache *RRCache) (rrCache *RRCache, err error) { //nolint:gocognit,gocyclo
// get resolvers // get resolvers
resolvers, tryAll := GetResolversInScope(ctx, q) resolvers, tryAll := GetResolversInScope(ctx, q)
if len(resolvers) == 0 { if len(resolvers) == 0 {
@ -377,7 +377,7 @@ resolveLoop:
// Defensive: This should normally not happen. // Defensive: This should normally not happen.
continue continue
} }
// Check if request suceeded and whether we should try another resolver. // Check if request succeeded and whether we should try another resolver.
if rrCache.RCode != dns.RcodeSuccess && tryAll { if rrCache.RCode != dns.RcodeSuccess && tryAll {
continue continue
} }