unbound: clean up includes and function usage

o consolidate "unbound_" prefix for unbound.inc for pluginification
o services.inc includes unbound.inc rightfully, a bit like a
  plugin would do in the future, but this also means we can
  zap all requires from top pages, which are entirely spurious.
o get_dns_servers() moves to system.inc because it is used by
  status_interfaces.php
o RIP read_hosts()

src/etc/inc/services.inc

@@ -1921,7 +1921,7 @@ function services_unbound_configure($verbose = false)
         flush();
     }
 
-    sync_unbound_service();
+    unbound_sync_service();
 
     if ($verbose) {
         echo "done.\n";

src/etc/inc/system.inc

@@ -306,6 +306,22 @@ function get_searchdomains()
     return $master_list;
 }
 
+function get_dns_servers()
+{
+    $dns_servers = array();
+
+    $dns_s = file("/etc/resolv.conf", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+    foreach($dns_s as $dns) {
+        $matches = "";
+        if (preg_match("/nameserver (.*)/", $dns, $matches)) {
+            $dns_servers[] = $matches[1];
+        }
+    }
+
+    return array_unique($dns_servers);
+}
+
 function get_nameservers()
 {
     global $config;

src/etc/inc/unbound.inc

@@ -28,26 +28,6 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-/****f* legacy/get_dns_servers
- * NAME
- *   get_dns_servers - get system dns servers
- * INPUTS
- *   $dns_servers - an array of the dns servers
- * RESULT
- *   null
- ******/
-function get_dns_servers() {
-    $dns_servers = array();
-    $dns_s = file("/etc/resolv.conf", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-    foreach($dns_s as $dns) {
-        $matches = "";
-        if (preg_match("/nameserver (.*)/", $dns, $matches)) {
-            $dns_servers[] = $matches[1];
-        }
-    }
-    return array_unique($dns_servers);
-}
-
 /* Optimize Unbound for environment */
 function unbound_optimization() {
     global $config;
@@ -112,7 +92,7 @@ function unbound_optimization() {
     return $optimization;
 }
 
-function bootstrap_unbound_root()
+function unbound_bootstrap_root()
 {
     global $g;
 
@@ -128,7 +108,7 @@ function unbound_generate_config()
     global $config, $g;
 
     // Bootstrap needed for /var MFS
-    bootstrap_unbound_root();
+    unbound_bootstrap_root();
 
     // Setup optimization
     $optimization = unbound_optimization();
@@ -408,39 +388,10 @@ EOF;
     }
 }
 
-
-// Read /etc/hosts
-function read_hosts() {
-
-    /* Open /etc/hosts and extract the only dhcpleases info
-     * XXX - to convert to an unbound C library which reads /etc/hosts automatically
-     */
-    $etc_hosts = array();
-    foreach (file('/etc/hosts') as $line) {
-        $d = preg_split('/\s/', $line, -1, PREG_SPLIT_NO_EMPTY);
-        if (empty($d) || substr(reset($d), 0, 1) == "#") {
-            continue;
-        }
-        if ($d[3] == "#") {
-            $ip = array_shift($d);
-            $fqdn = array_shift($d);
-            $name = array_shift($d);
-            if ($fqdn != "empty") {
-                if ($name != "empty") {
-                    array_push($etc_hosts, array(ipaddr => "$ip", fqdn => "$fqdn", name => "$name"));
-                } else {
-                    array_push($etc_hosts, array(ipaddr => "$ip", fqdn => "$fqdn"));
-                }
-            }
-        }
-    }
-    return $etc_hosts;
-}
-
-function sync_unbound_service()
+function unbound_sync_service()
 {
     // Configure chroot
-    bootstrap_unbound_root();
+    unbound_bootstrap_root();
 
     // Configure our Unbound service
     unbound_execute("unbound-anchor");
@@ -612,7 +563,7 @@ function unbound_add_host_entries()
     }
 
     // Write out entries
-    bootstrap_unbound_root();
+    unbound_bootstrap_root();
     file_put_contents("{$g['unbound_chroot_path']}/host_entries.conf", $unbound_entries);
 }
 
@@ -735,7 +686,7 @@ function unbound_acls_config() {
     }
 
     // Write out Access list
-    bootstrap_unbound_root();
+    unbound_bootstrap_root();
     file_put_contents("{$g['unbound_chroot_path']}/access_lists.conf", $aclcfg);
 }
 

src/etc/inc/xmlrpc/service.inc

@@ -31,7 +31,6 @@
 require_once("services.inc");
 require_once("system.inc");
 require_once('util.inc');
-require_once("unbound.inc");
 require_once("openvpn.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");

src/etc/rc.bootup

@@ -47,8 +47,6 @@ require_once("services.inc");
 echo ".";
 require_once("system.inc");
 echo ".";
-require_once("unbound.inc");
-echo ".";
 require_once("filter.inc");
 echo ".";
 require_once("ipsec.inc");

src/etc/rc.initial.setlanip

@@ -37,7 +37,6 @@ require_once("filter.inc");
 require_once("rrd.inc");
 require_once("util.inc");
 require_once("services.inc");
-require_once("unbound.inc");
 require_once("system.inc");
 
 $options = getopt("hn", array("dry-run", "help"));

src/etc/rc.initial.setports

@@ -38,7 +38,6 @@ require_once("system.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("unbound.inc");
 
 if (set_networking_interfaces_ports()) {
     echo "Reloading interfaces...";

src/etc/rc.interfaces_wan_configure

@@ -33,7 +33,6 @@ require_once("filter.inc");
 require_once("system.inc");
 require_once('openvpn.inc');
 require_once("interfaces.inc");
-require_once("unbound.inc");
 require_once("services.inc");
 
 if (!empty($argv[1])) {

src/etc/rc.linkup

@@ -35,7 +35,6 @@ require_once('ipsec.inc');
 require_once('openvpn.inc');
 require_once("util.inc");
 require_once("system.inc");
-require_once("unbound.inc");
 require_once("services.inc");
 
 function handle_argument_group($iface, $argument2) {

src/etc/rc.newwanip

@@ -38,7 +38,6 @@ require_once("util.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
-require_once("unbound.inc");
 
 // Do not process while booting
 if (file_exists('/var/run/booting')) {

src/etc/rc.reload_all

@@ -35,7 +35,6 @@ require_once('ipsec.inc');
 require_once("util.inc");
 require_once("system.inc");
 require_once("services.inc");
-require_once("unbound.inc");
 require_once("interfaces.inc");
 
 global $config;

src/etc/rc.reload_interfaces

@@ -35,7 +35,6 @@ require_once('ipsec.inc');
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
-require_once("unbound.inc");
 
 system_routing_enable();
 interfaces_configure();

src/www/interfaces.php

@@ -39,7 +39,6 @@ require_once("interfaces.inc");
 require_once("ipsec.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
-require_once("unbound.inc");
 
 /***************************************************************************************************************
  * imported from xmlparse_attr.inc

src/www/interfaces_assign.php

@@ -36,7 +36,6 @@ require_once("interfaces.inc");
 require_once("ipsec.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
-require_once("unbound.inc");
 
 function list_interfaces() {
     global $config;

src/www/interfaces_bridge_edit.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("unbound.inc");
 require_once("services.inc");
 
 if (!isset($config['bridges']) || !is_array($config['bridges'])) {

src/www/interfaces_gif_edit.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("unbound.inc");
 require_once("services.inc");
 
 if (!isset($config['gifs']) || !is_array($config['gifs'])) {

src/www/interfaces_gre_edit.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("unbound.inc");
 require_once("services.inc");
 
 if (!isset($config['gres']) || !is_array($config['gres'])) {

src/www/interfaces_lagg_edit.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("unbound.inc");
 require_once("services.inc");
 
 /**

src/www/interfaces_vlan_edit.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("unbound.inc");
 require_once("services.inc");
 
 if (!isset($config['vlans']) || !is_array($config['vlans'])) {

src/www/services_dhcp.php

@@ -31,7 +31,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("unbound.inc");
 require_once("interfaces.inc");
 
 /*

src/www/services_dhcpv6.php

@@ -31,7 +31,6 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("system.inc");
-require_once("unbound.inc");
 require_once("interfaces.inc");
 require_once("services.inc");
 

src/www/services_dnsmasq.php

@@ -32,7 +32,6 @@ require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("unbound.inc");
 
 if (empty($config['dnsmasq']['hosts']) || !is_array($config['dnsmasq']['hosts'])) {
     $config['dnsmasq']['hosts'] = array();

src/www/services_unbound_host_edit.php

@@ -33,7 +33,6 @@ require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 
-
 function hostcmp($a, $b)
 {
     return strcasecmp($a['host'], $b['host']);

src/www/status_interfaces.php

@@ -33,7 +33,6 @@ require_once("system.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
 require_once("openvpn.inc");
-require_once("unbound.inc");
 require_once("services.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {

src/www/status_services.php

@@ -31,7 +31,6 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
-require_once("unbound.inc");
 require_once("openvpn.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");

src/www/system_advanced_admin.php

@@ -32,7 +32,6 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("system.inc");
-require_once("unbound.inc");
 require_once("services.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {

src/www/system_general.php

@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("system.inc");
-require_once("unbound.inc");
 require_once("interfaces.inc");
 require_once("services.inc");