From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 7 Nov 2013 13:45:16 +0000 (+0100)
Subject: remove useless cast; limit udp-truncation-threshold to 512 for non-EDNS UDP queries
X-Git-Tag: rec-3.6.0-rc1~349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b18ace731be381837899c881867970bf9ed74a70;p=pdns

remove useless cast; limit udp-truncation-threshold to 512 for non-EDNS UDP queries
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 03860e02b..a0bde715b 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -496,10 +496,10 @@ void startDoResolve(void *p)
   try {
     loginfo=" (while setting loginfo)";
     loginfo=" ("+dc->d_mdp.d_qname+"/"+lexical_cast<string>(dc->d_mdp.d_qtype)+" from "+(dc->d_remote.toString())+")";
-    uint32_t maxanswersize= dc->d_tcp ? 65535 : g_udpTruncationThreshold;
+    uint32_t maxanswersize= dc->d_tcp ? 65535 : min((uint16_t) 512, g_udpTruncationThreshold);
     EDNSOpts edo;
     if(getEDNSOpts(dc->d_mdp, &edo) && !dc->d_tcp) {
-      maxanswersize = min(edo.d_packetsize, (uint16_t) g_udpTruncationThreshold);
+      maxanswersize = min(edo.d_packetsize, g_udpTruncationThreshold);
     }
     
     vector<DNSResourceRecord> ret;