From b12f9212dccbd2573e54558df3af83074b60befa Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 6 Feb 2018 19:06:38 +0000
Subject: [PATCH] unbound: optimize outgoing-range differently; closes #2172

"- 50" would will eventually underflow.  According to the official
docs in the libevent case we set double num-queries-per-thread, so
that's what we'll do and kick the other code.

While here, seems like the GUI options for the default value are
missing which causes the num-queries-per-thread value to decrease
to 512, reducing the outbound-range with it arbitrarily.

See: https://www.unbound.net/documentation/howto_optimise.html
---
 src/etc/inc/plugins.inc.d/unbound.inc | 11 ++---------
 src/www/services_unbound_advanced.php |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc
index c622c878e..0b1e27102 100644
--- a/src/etc/inc/plugins.inc.d/unbound.inc
+++ b/src/etc/inc/plugins.inc.d/unbound.inc
@@ -105,14 +105,6 @@ function unbound_optimization()
         $optimization['key_cache_slabs'] = "key-cache-slabs: 4";
     }
 
-    // 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}";
-    }
-
     return $optimization;
 }
 
@@ -235,6 +227,7 @@ EOF;
     $outgoing_num_tcp = !empty($config['unbound']['outgoing_num_tcp']) ? $config['unbound']['outgoing_num_tcp'] : "10";
     $incoming_num_tcp = !empty($config['unbound']['incoming_num_tcp']) ? $config['unbound']['incoming_num_tcp'] : "10";
     $num_queries_per_thread = !empty($config['unbound']['num_queries_per_thread']) ? $config['unbound']['num_queries_per_thread'] : "4096";
+    $outgoing_range = $num_queries_per_thread * 2;
     $jostle_timeout = !empty($config['unbound']['jostle_timeout']) ? $config['unbound']['jostle_timeout'] : "200";
     $cache_max_ttl = !empty($config['unbound']['cache_max_ttl']) ? $config['unbound']['cache_max_ttl'] : "86400";
     $cache_min_ttl = !empty($config['unbound']['cache_min_ttl']) ? $config['unbound']['cache_min_ttl'] : "0";
@@ -315,6 +308,7 @@ serve-expired: {$serveexpired}
 outgoing-num-tcp: {$outgoing_num_tcp}
 incoming-num-tcp: {$incoming_num_tcp}
 num-queries-per-thread: {$num_queries_per_thread}
+outgoing-range: {$outgoing_range}
 infra-host-ttl: {$infra_host_ttl}
 infra-cache-numhosts: {$infra_cache_numhosts}
 unwanted-reply-threshold: {$unwanted_reply_threshold}
@@ -326,7 +320,6 @@ rrset-cache-size: {$rrsetcachesize}m
 {$optimization['rrset_cache_slabs']}
 {$optimization['infra_cache_slabs']}
 {$optimization['key_cache_slabs']}
-{$optimization['outgoing_range']}
 {$optimization['so_rcvbuf']}
 {$anchor_file}
 prefetch: {$prefetch}
diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php
index 6c7781d9b..495bd43f7 100644
--- a/src/www/services_unbound_advanced.php
+++ b/src/www/services_unbound_advanced.php
@@ -240,7 +240,7 @@ include_once("head.inc");
                         <td>
                           <select id="num_queries_per_thread" name="num_queries_per_thread" class="selectpicker">
 <?php
-                          foreach (array("512", "1024", "2048") as $queries) :?>
+                          foreach (array('512', '1024', '2048', '4096', '8192') as $queries) :?>
                             <option value="<?= $queries ?>" <?= $pconfig['num_queries_per_thread'] == $queries ? 'selected="selected"' : '' ?>>
                               <?= $queries ?>
                             </option>