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 03860e02b8f20553520a2e1f504430f63b9c5a90..a0bde715bea4ee199b63d49d1ce2abf78c46674c 100644 (file)
--- 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;