- rewrites: fix invalid question in response

for a rule: cname -> domain with IP of 'domain' resolved by upstream
eoghan2t9 · May 29, 2020 · 12cb2e1 · 12cb2e1
1 parent 72f253f
commit 12cb2e1
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/dnsforward/handle_dns.go b/dnsforward/handle_dns.go
@@ -211,12 +211,11 @@ func processFilteringAfterResponse(ctx *dnsContext) int {
 
 	switch res.Reason {
 	case dnsfilter.ReasonRewrite:
-		if d.Res != nil {
-			break // response is already prepared
-		}
-		if len(res.CanonName) == 0 {
+		if len(ctx.origQuestion.Name) == 0 {
+			// origQuestion is set in case we get only CNAME without IP from rewrites table
 			break
 		}
+
 		d.Req.Question[0] = ctx.origQuestion
 		d.Res.Question[0] = ctx.origQuestion