From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Fri, 13 Jan 2017 13:28:41 +0000 (+0100)
Subject: Merge pull request #4536 from rgacogne/dnsdist-mute
X-Git-Tag: rec-4.1.0-alpha1~332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ed267e2270d8e9f1aae511b51840da330b0e0d4;p=thirdparty%2Fpdns.git

Merge pull request #4536 from rgacogne/dnsdist-mute

dnsdist: Add an option to 'mute' UDP responses per bind
---

0ed267e2270d8e9f1aae511b51840da330b0e0d4
diff --cc pdns/dnsdist.cc
index 676030a51f,76b8543fd2..e68057ed62
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@@ -439,19 -425,22 +439,22 @@@ try 
        }
  
        if (ids->packetCache && !ids->skipCache) {
 -        ids->packetCache->insert(ids->cacheKey, ids->qname, ids->qtype, ids->qclass, response, responseLen, false, dh->rcode == RCode::ServFail);
 +        ids->packetCache->insert(ids->cacheKey, ids->qname, ids->qtype, ids->qclass, response, responseLen, false, dh->rcode);
        }
  
+       if (ids->cs && !ids->cs->muted) {
  #ifdef HAVE_DNSCRYPT
-       if (!encryptResponse(response, &responseLen, responseSize, false, ids->dnsCryptQuery)) {
-         continue;
-       }
+         if (!encryptResponse(response, &responseLen, responseSize, false, ids->dnsCryptQuery)) {
+           continue;
+         }
  #endif
-       ComboAddress empty;
-       empty.sin4.sin_family = 0;
-       /* if ids->destHarvested is false, origDest holds the listening address.
-          We don't want to use that as a source since it could be 0.0.0.0 for example. */
-       sendUDPResponse(origFD, response, responseLen, ids->delayMsec, ids->destHarvested ? ids->origDest : empty, ids->origRemote);
+ 
+         ComboAddress empty;
+         empty.sin4.sin_family = 0;
+         /* if ids->destHarvested is false, origDest holds the listening address.
+            We don't want to use that as a source since it could be 0.0.0.0 for example. */
+         sendUDPResponse(origFD, response, responseLen, ids->delayMsec, ids->destHarvested ? ids->origDest : empty, ids->origRemote);
+       }
  
        g_stats.responses++;