From 4a4b0b8e7f816e58b6e372e69dac1332c28093af Mon Sep 17 00:00:00 2001
From: Fedor <fedork@ubuntu.(none)>
Date: Tue, 12 Oct 2010 02:35:33 -0400
Subject: [PATCH] rc: Dnsmasq config optimization, allow to specify DNS cache
 size

---
 release/src/router/httpd/tomato.c           | 1 +
 release/src/router/nvram/defaults.c         | 1 +
 release/src/router/rc/services.c            | 4 ++++
 release/src/router/www/advanced-dhcpdns.asp | 9 ++++++++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/release/src/router/httpd/tomato.c b/release/src/router/httpd/tomato.c
index 57b61a8b05..8222de7fd5 100644
--- a/release/src/router/httpd/tomato.c
+++ b/release/src/router/httpd/tomato.c
@@ -625,6 +625,7 @@ static const nvset_t nvset_list[] = {
 	{ "dhcpd_gwmode",		V_NUM				},
 	{ "dns_addget",			V_01				},
 	{ "dns_intcpt",			V_01				},
+	{ "dns_cache",			V_NUM				},
 	{ "dhcpc_minpkt",		V_01				},
 	{ "dhcpc_vendorclass",		V_LENGTH(0, 80)			},
 	{ "dhcpc_requestip",		V_LENGTH(0, 16)			},
diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c
index 42ec0e2b45..5e63747bc7 100644
--- a/release/src/router/nvram/defaults.c
+++ b/release/src/router/nvram/defaults.c
@@ -365,6 +365,7 @@ const defaults_t defaults[] = {
 	{ "dhcpd_lmax",			""				},
 	{ "dns_addget",			"0"				},
 	{ "dns_intcpt",			"0"				},
+	{ "dns_cache",			"4096"				},	// DNS cache size (0 to disable cache)
 	{ "dhcpc_minpkt",		"1"				},
 	{ "dhcpc_vendorclass",		""				},
 	{ "dhcpc_requestip",		""				},
diff --git a/release/src/router/rc/services.c b/release/src/router/rc/services.c
index 5f1cf074a3..0a02c51c5e 100644
--- a/release/src/router/rc/services.c
+++ b/release/src/router/rc/services.c
@@ -111,10 +111,14 @@ void start_dnsmasq()
 	if (((nv = nvram_get("dns_minport")) != NULL) && (*nv)) n = atoi(nv);
 		else n = 4096;
 	fprintf(f,
+		"all-servers\n"			// query all servers by default (use strict-order to override)
+		"cache-size=%d\n"		// dns cache size (0 to disable cache)
+		"log-async\n"			// enable asynchronous logging (default queue length = 5)
 		"resolv-file=%s\n"		// the real stuff is here
 		"addn-hosts=%s\n"		// "
 		"expand-hosts\n"		// expand hostnames in hosts file
 		"min-port=%u\n", 		// min port used for random src port
+		nvram_get_int("dns_cache"),
 		dmresolv, dmhosts, n);
 	do_dns = nvram_match("dhcpd_dmdns", "1");
 
diff --git a/release/src/router/www/advanced-dhcpdns.asp b/release/src/router/www/advanced-dhcpdns.asp
index 3d4beeeb92..65c89da1a9 100644
--- a/release/src/router/www/advanced-dhcpdns.asp
+++ b/release/src/router/www/advanced-dhcpdns.asp
@@ -29,7 +29,7 @@ textarea {
 
 <script type='text/javascript'>
 
-//	<% nvram("dhcpd_dmdns,dns_addget,dhcpd_gwmode,dns_intcpt,dhcpd_slt,dhcpc_minpkt,dnsmasq_custom,dnsmasq_norw,dhcpd_lmax,dhcpc_vendorclass,dhcpc_requestip,dns_norebind"); %>
+//	<% nvram("dhcpd_dmdns,dns_addget,dhcpd_gwmode,dns_intcpt,dhcpd_slt,dhcpc_minpkt,dnsmasq_custom,dnsmasq_norw,dhcpd_lmax,dhcpc_vendorclass,dhcpc_requestip,dns_norebind,dns_cache"); %>
 
 if ((isNaN(nvram.dhcpd_lmax)) || ((nvram.dhcpd_lmax *= 1) < 1)) nvram.dhcpd_lmax = 255;
 
@@ -41,6 +41,11 @@ function verifyFields(focused, quiet)
 	if (!v_length('_dnsmasq_custom', quiet, 0, 2048)) return 0;
 	if (!v_range('_dhcpd_lmax', quiet, 1, 0xFFFF)) return 0;
 	if (!v_ipz('_dhcpc_requestip', quiet)) return 0;
+
+	b = E('_f_dhcpd_dmdns').checked;
+	E('_dns_cache').disabled = (!b);
+	if ((b) && !v_range('_dns_cache', quiet, 0, 65535)) return 0;
+
 	return 1;
 }
 
@@ -116,6 +121,8 @@ function save()
 <script type='text/javascript'>
 createFieldTable('', [
 	{ title: 'Use internal DNS', name: 'f_dhcpd_dmdns', type: 'checkbox', value: nvram.dhcpd_dmdns == '1' },
+	{ title: 'DNS Cache Size', name: 'dns_cache', type: 'text', maxlen: 5, size: 8, value: nvram.dns_cache,
+		suffix: '&nbsp;<i>names&nbsp;&nbsp;(0 = disable caching)</i>' },
 	{ title: 'Use received DNS with user-entered DNS', name: 'f_dns_addget', type: 'checkbox', value: nvram.dns_addget == '1' },
 	{ title: 'Prevent DNS-rebind attacks', name: 'f_dns_norebind', type: 'checkbox', value: nvram.dns_norebind == '1' },
 	{ title: 'Intercept DNS port<br>(UDP 53)', name: 'f_dns_intcpt', type: 'checkbox', value: nvram.dns_intcpt == '1' },
-- 
2.11.4.GIT