From 11e9c582d5529d35a07fec6bfe63811d0a45f88b Mon Sep 17 00:00:00 2001
From: Warren Baker <warren@decoy.co.za>
Date: Thu, 13 Jun 2013 20:56:47 +0200
Subject: We make use of libevent so up these default values

---
 config/unbound/unbound.inc          | 12 ++----------
 config/unbound/unbound_advanced.xml |  3 ++-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc
index 8cd186fb..f1d68eb7 100644
--- a/config/unbound/unbound.inc
+++ b/config/unbound/unbound.inc
@@ -487,7 +487,7 @@ EOF;
 	$outgoing_num_tcp = (!empty($unbound_config['outgoing_num_tcp'])) ? $unbound_config['outgoing_num_tcp'] : "10";
 	$incoming_num_tcp = (!empty($unbound_config['incoming_num_tcp'])) ? $unbound_config['incoming_num_tcp'] : "10";
 	$edns_buffer_size = (!empty($unbound_config['edns_buffer_size'])) ? $unbound_config['edns_buffer_size'] : "4096";
-	$num_queries_per_thread = (!empty($unbound_config['num_queries_per_thread'])) ? $unbound_config['num_queries_per_thread'] : "1024";
+	$num_queries_per_thread = (!empty($unbound_config['num_queries_per_thread'])) ? $unbound_config['num_queries_per_thread'] : "4096";
 	$jostle_timeout = (!empty($unbound_config['jostle_timeout'])) ? $unbound_config['jostle_timeout'] : "200";
 	$cache_max_ttl = (!empty($unbound_config['cache_max_ttl'])) ? $unbound_config['cache_max_ttl'] : "86400";
 	$cache_min_ttl = (!empty($unbound_config['cache_min_ttl'])) ? $unbound_config['cache_min_ttl'] : "0";
@@ -545,7 +545,7 @@ harden-dnssec-stripped: {$harden_dnssec_stripped}
 {$optimization['key_cache_slabs']}
 {$optimization['msg_cache_size']}
 {$optimization['rrset_cache_size']}
-{$optimization['outgoing_range']}
+outgoing-range: 8192
 {$optimization['so_rcvbuf']}
 
 # Interface IP(s) to bind to
@@ -645,14 +645,6 @@ function unbound_optimization() {
 		$optimization['rrset_cache_size'] = "rrset-cache-size: 8m";
 	}
 
-	// More outgoing connections per thread otherwise assign a default of 4096 for a single thread
-	if($numprocs > 0) {
-		$or = (1024/$numprocs) - 50;
-		$optimization['outgoing_range'] = "outgoing-range: {$or}";
-	} else {
-		$optimization['outgoing_range'] = "outgoing-range: {4096}";
-	}
-
 	// Larger socket buffer for busy servers
 	// Check that it is set to 4MB (by default the OS has it configured to 4MB)
 	foreach ($config['sysctl']['item'] as $tunable) {
diff --git a/config/unbound/unbound_advanced.xml b/config/unbound/unbound_advanced.xml
index 7603d0aa..2da5b505 100644
--- a/config/unbound/unbound_advanced.xml
+++ b/config/unbound/unbound_advanced.xml
@@ -219,11 +219,12 @@
 			<fieldname>num_queries_per_thread</fieldname>
 			<description>The number of queries that every thread will service simultaneously. If more queries arrive that need to be serviced, and no queries can be jostled, then these queries are dropped.</description>
 			<type>select</type>
-			<default_value>1024</default_value>
+			<default_value>4096</default_value>
 			<options>
 				<option><name>512</name><value>512</value></option>
 				<option><name>1024</name><value>1024</value></option>
 				<option><name>2048</name><value>2048</value></option>
+				<option><name>4096</name><value>4096</value></option>
 			</options>
 			<advancedfield/>
 		</field>
-- 
cgit v1.2.3