commit d3a8b39c7df2f0debf3b5f274a1c37a9e261f94e
author Simon Kelley <simon@thekelleys.org.uk> Wed Dec 23 12:27:37 2015 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Wed Dec 23 12:27:37 2015 +0000
tree 48f7396204ee7c5d0adbc9b26405bbc0515e6ef9
parent 15379ea1f252d1f53c5d93ae970b22dedb233642

More EDNS0 packet-size tweaks.

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 81254f6..45761cc 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -91,8 +91,11 @@
   if (daemon->edns_pktsz < PACKETSZ)
     daemon->edns_pktsz = PACKETSZ;
 
-  daemon->packet_buff_sz = daemon->edns_pktsz > DNSMASQ_PACKETSZ ? 
-    daemon->edns_pktsz : DNSMASQ_PACKETSZ;
+  /* Min buffer size: we check after adding each record, so there must be 
+     memory for the largest packet, and the largest record so the
+     min for DNS is PACKETSZ+MAXDNAME+RRFIXEDSZ which is < 1000.
+     This might be increased is EDNS packet size if greater than the minimum. */ 
+  daemon->packet_buff_sz = daemon->edns_pktsz + MAXDNAME + RRFIXEDSZ;
   daemon->packet = safe_malloc(daemon->packet_buff_sz);
   
   daemon->addrbuff = safe_malloc(ADDRSTRLEN);