(legacy) remove services.inc dependency from interfaces.inc

src/etc/inc/interfaces.inc

@@ -31,11 +31,9 @@
 
 require_once("interfaces.lib.inc");
 require_once("gwlb.inc");
-require_once('services.inc');
 require_once('openvpn.inc');
 require_once("services.inc");
 
-
 /*
  * converts a string like "a,b,c,d"
  * into an array like array("a" => "b", "c" => "d")

src/etc/rc.dyndns.update

@@ -31,6 +31,7 @@ require_once("config.inc");
 require_once("interfaces.inc");
 require_once("util.inc");
 require_once("filter.inc");
+require_once("services.inc");
 
 /* Interface IP address has changed */
 

src/etc/rc.filter_configure_sync

@@ -35,5 +35,7 @@ require_once("vpn.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
+require_once("services.inc");
+
 
 filter_configure_sync();

src/etc/rc.filter_configure_xmlrpc

@@ -41,6 +41,7 @@ require_once("openvpn.inc");
 require_once("vslb.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 system_routing_configure();
 setup_gateways_monitor();

src/etc/rc.initial.setlanip

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

src/etc/rc.newwanip

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

src/etc/rc.reload_all

@@ -37,6 +37,7 @@ require_once("util.inc");
 require_once("system.inc");
 require_once("certs.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 /****f* legacy/reload_all_sync
  * NAME

src/etc/rc.reload_interfaces

@@ -37,6 +37,7 @@ require_once("system.inc");
 require_once("interfaces.inc");
 require_once("pfsense-utils.inc");
 require_once("ipsec.inc");
+require_once("services.inc");
 
 system_routing_enable();
 interfaces_configure();

src/etc/rc.resolv_conf_generate

@@ -29,6 +29,7 @@
 
 require_once("config.inc");
 require_once("system.inc");
+require_once("services.inc");
 require_once("pfsense-utils.inc");
 
 system_resolvconf_generate(true);

src/www/diag_logs_settings.php

@@ -32,6 +32,7 @@ require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 function clear_all_log_files()
 {

src/www/interfaces.php

@@ -40,6 +40,7 @@ require_once("vpn.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 /***************************************************************************************************************
  * imported from xmlparse_attr.inc

src/www/interfaces_assign.php

@@ -40,6 +40,7 @@ require_once("rrd.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 function interface_assign_description($portinfo, $portname) {
 	if ($portinfo['isvlan']) {

src/www/interfaces_ppps_edit.php

@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
+require_once("services.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_ppps.php');
 

src/www/services_dhcpv6.php

@@ -34,6 +34,7 @@ require_once("system.inc");
 require_once("unbound.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
+require_once("services.inc");
 
 /*  Fix failover DHCP problem
  *  http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749

src/www/services_dhcpv6_relay.php

@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
+require_once("services.inc");
 
 $pconfig['enable'] = isset($config['dhcrelay6']['enable']);
 if (empty($config['dhcrelay6']['interface']))

src/www/services_dyndns.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
+require_once("services.inc");
 
 if (!is_array($config['dyndnses']['dyndns']))
 	$config['dyndnses']['dyndns'] = array();

src/www/services_igmpproxy.php

@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
+require_once("services.inc");
 
 if (!is_array($config['igmpproxy']['igmpentry']))
 	$config['igmpproxy']['igmpentry'] = array();

src/www/services_opendns.php

@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 if (!is_array($config['opendns'])) {
 	$config['opendns'] = array();

src/www/services_rfc2136.php

@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
+require_once("services.inc");
 
 if (!is_array($config['dnsupdates']['dnsupdate']))
 	$config['dnsupdates']['dnsupdate'] = array();

src/www/services_rfc2136_edit.php

@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 if (!is_array($config['dnsupdates']['dnsupdate'])) {
 	$config['dnsupdates']['dnsupdate'] = array();

src/www/services_router_advertisements.php

@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("services.inc");
 
 /*  Fix failover DHCP problem
  *  http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749

src/www/services_unbound_acls.php

@@ -30,6 +30,7 @@ require_once("guiconfig.inc");
 require_once("unbound.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 function unbound_acl_id_used($id) {
     global $config;

src/www/services_unbound_advanced.php

@@ -30,6 +30,7 @@ require_once("guiconfig.inc");
 require_once("unbound.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 if(!is_array($config['unbound']))
 	$config['unbound'] = array();

src/www/status_dhcpv6_leases.php

@@ -31,6 +31,7 @@
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
+require_once("services.inc");
 
 $pgtitle = array(gettext("Status"),gettext("DHCPv6 leases"));
 $shortcut_section = "dhcp6";

src/www/system_advanced_admin.php

@@ -34,6 +34,7 @@ require_once("filter.inc");
 require_once("system.inc");
 require_once("unbound.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 $pconfig['webguiproto'] = $config['system']['webgui']['protocol'];
 $pconfig['webguiport'] = $config['system']['webgui']['port'];

src/www/system_advanced_firewall.php

@@ -31,6 +31,7 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
+require_once("services.inc");
 
 function default_table_entries_size()
 {

src/www/system_advanced_misc.php

@@ -35,6 +35,7 @@ require_once("vpn.inc");
 require_once("vslb.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
+require_once("services.inc");
 
 $pconfig['proxyurl'] = $config['system']['proxyurl'];
 $pconfig['proxyport'] = $config['system']['proxyport'];

src/www/system_general.php

@@ -33,6 +33,7 @@ require_once("system.inc");
 require_once("unbound.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
+require_once("services.inc");
 
 function get_locale_list()
 {

src/www/widgets/widgets/dyn_dns_status.widget.php

@@ -33,6 +33,7 @@ $nocsrf = true;
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 require_once("widgets/include/dyn_dns_status.inc");
+require_once("services.inc");
 
 if (!is_array($config['dyndnses']['dyndns'])) {
     $config['dyndnses']['dyndns'] = array();