From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 18 May 2018 16:30:49 +0000 (+0200)
Subject: rec: advertise 512 bytes as max query size
X-Git-Tag: dnsdist-1.3.1~50^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b60fb7163c3332a4ad472d6ea86e631de0d02b4;p=pdns

rec: advertise 512 bytes as max query size
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 4aa1628e7..9ffab649f 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1313,7 +1313,7 @@ static void startDoResolve(void *p)
          OPT record.  This MUST also occur when a truncated response (using
          the DNS header's TC bit) is returned."
       */
-      pw.addOpt(g_udpTruncationThreshold, ednsExtRCode, DNSSECOK ? EDNSOpts::DNSSECOK : 0, returnedEdnsOptions);
+      pw.addOpt(512, ednsExtRCode, DNSSECOK ? EDNSOpts::DNSSECOK : 0, returnedEdnsOptions);
       pw.commit();
     }
 
diff --git a/regression-tests.recursor-dnssec/test_EDNSBufferSize.py b/regression-tests.recursor-dnssec/test_EDNSBufferSize.py
index 89fcfd9e6..8ff69a10b 100644
--- a/regression-tests.recursor-dnssec/test_EDNSBufferSize.py
+++ b/regression-tests.recursor-dnssec/test_EDNSBufferSize.py
@@ -122,14 +122,14 @@ class EDNSBufferTest16801680(EDNSBufferTest):
             self.checkResponseContent(raw, 'A',
                                       self._udpTruncationThreshold, 9)
             message = dns.message.from_wire(raw)
-            self.checkEDNS(message, 1680)
+            self.checkEDNS(message, 512)
 
     def testEdnsBufferTestCase02(self):
         query = self.getMessage('02', 1679)
         for _ in range(10):
             message = self.sendUDPQuery(query)
             self.checkTruncatedResponse(message)
-            self.checkEDNS(message, self._udpTruncationThreshold)
+            self.checkEDNS(message, 512)
 
     def testEdnsBufferTestCase05(self):
         query = self.getMessage('05', 1680)
@@ -138,7 +138,7 @@ class EDNSBufferTest16801680(EDNSBufferTest):
             self.checkResponseContent(raw, 'E',
                                       self._udpTruncationThreshold, 9)
             message = dns.message.from_wire(raw)
-            self.checkEDNS(message, self._udpTruncationThreshold)
+            self.checkEDNS(message, 512)
 
     def testEdnsBufferTestCase06(self):
         query = self.getMessage('06', 0)
@@ -161,7 +161,7 @@ class EDNSBufferTest16801680(EDNSBufferTest):
             raw = self.sendUDPQuery(query, decode=False)
             self.checkResponseContent(raw, 'H', 512, 181)
             message = dns.message.from_wire(raw)
-            self.checkEDNS(message, 1680)
+            self.checkEDNS(message, 512)
 
 class EDNSBufferTest16801681(EDNSBufferTest):
     """
@@ -183,7 +183,7 @@ edns-outgoing-bufsize=%d
         for _ in range(10):
             message = self.sendUDPQuery(query)
             self.checkTruncatedResponse(message)
-            self.checkEDNS(message, 1680)
+            self.checkEDNS(message, 512)
 
 
 class EDNSBufferTest16801679(EDNSBufferTest):
@@ -208,7 +208,7 @@ edns-outgoing-bufsize=%d
             self.checkResponseContent(raw, 'D',
                                       self._ednsOutgoingBufsize, 8)
             message = dns.message.from_wire(raw)
-            self.checkEDNS(message, self._udpTruncationThreshold)
+            self.checkEDNS(message, 512)
 
 
 class UDPLargeResponder(DatagramProtocol):