From b18ace731be381837899c881867970bf9ed74a70 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 7 Nov 2013 14:45:16 +0100 Subject: [PATCH] remove useless cast; limit udp-truncation-threshold to 512 for non-EDNS UDP queries --- pdns/pdns_recursor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 03860e02b8..a0bde715be 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(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 ret; -- 2.47.2