From c55a7c50ed1b38ed2bbedb2b2bac6a07857ee5b4 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 23 Jul 2015 08:04:59 +0000 Subject: [PATCH] (legacy) remove services.inc dependency from interfaces.inc --- src/etc/inc/interfaces.inc | 2 -- src/etc/rc.dyndns.update | 1 + src/etc/rc.filter_configure_sync | 2 ++ src/etc/rc.filter_configure_xmlrpc | 1 + src/etc/rc.initial.setlanip | 1 + src/etc/rc.newwanip | 1 + src/etc/rc.reload_all | 1 + src/etc/rc.reload_interfaces | 1 + src/etc/rc.resolv_conf_generate | 1 + src/www/diag_logs_settings.php | 1 + src/www/interfaces.php | 1 + src/www/interfaces_assign.php | 1 + src/www/interfaces_ppps_edit.php | 1 + src/www/services_dhcpv6.php | 1 + src/www/services_dhcpv6_relay.php | 1 + src/www/services_dyndns.php | 1 + src/www/services_igmpproxy.php | 1 + src/www/services_opendns.php | 1 + src/www/services_rfc2136.php | 1 + src/www/services_rfc2136_edit.php | 1 + src/www/services_router_advertisements.php | 1 + src/www/services_unbound_acls.php | 1 + src/www/services_unbound_advanced.php | 1 + src/www/status_dhcpv6_leases.php | 1 + src/www/system_advanced_admin.php | 1 + src/www/system_advanced_firewall.php | 1 + src/www/system_advanced_misc.php | 1 + src/www/system_general.php | 1 + src/www/widgets/widgets/dyn_dns_status.widget.php | 1 + 29 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 3f92d24db..c4e0b5326 100644 --- a/src/etc/inc/interfaces.inc +++ b/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") diff --git a/src/etc/rc.dyndns.update b/src/etc/rc.dyndns.update index 40826a4e0..a09889f07 100755 --- a/src/etc/rc.dyndns.update +++ b/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 */ diff --git a/src/etc/rc.filter_configure_sync b/src/etc/rc.filter_configure_sync index 0c5e54906..5019ef800 100755 --- a/src/etc/rc.filter_configure_sync +++ b/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(); diff --git a/src/etc/rc.filter_configure_xmlrpc b/src/etc/rc.filter_configure_xmlrpc index c9253cc8f..378695610 100755 --- a/src/etc/rc.filter_configure_xmlrpc +++ b/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(); diff --git a/src/etc/rc.initial.setlanip b/src/etc/rc.initial.setlanip index 2d381bee3..abddf81be 100755 --- a/src/etc/rc.initial.setlanip +++ b/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")); diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index d91b27b5a..ec4cb2b7d 100755 --- a/src/etc/rc.newwanip +++ b/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')) { diff --git a/src/etc/rc.reload_all b/src/etc/rc.reload_all index a50739651..a8870c1b5 100755 --- a/src/etc/rc.reload_all +++ b/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 diff --git a/src/etc/rc.reload_interfaces b/src/etc/rc.reload_interfaces index 9623e36e6..68cff2144 100755 --- a/src/etc/rc.reload_interfaces +++ b/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(); diff --git a/src/etc/rc.resolv_conf_generate b/src/etc/rc.resolv_conf_generate index 1b05f49c0..bec5c412f 100755 --- a/src/etc/rc.resolv_conf_generate +++ b/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); diff --git a/src/www/diag_logs_settings.php b/src/www/diag_logs_settings.php index ad613c58e..c67479f39 100644 --- a/src/www/diag_logs_settings.php +++ b/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() { diff --git a/src/www/interfaces.php b/src/www/interfaces.php index e3ce51a34..3b8b59bee 100644 --- a/src/www/interfaces.php +++ b/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 diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php index 2c9eb059b..cecce1f19 100644 --- a/src/www/interfaces_assign.php +++ b/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']) { diff --git a/src/www/interfaces_ppps_edit.php b/src/www/interfaces_ppps_edit.php index 4ef75889a..53d188bcd 100644 --- a/src/www/interfaces_ppps_edit.php +++ b/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'); diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php index 81d01ff91..e628c9aae 100644 --- a/src/www/services_dhcpv6.php +++ b/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 diff --git a/src/www/services_dhcpv6_relay.php b/src/www/services_dhcpv6_relay.php index 0f7b0b340..24a8d0c95 100644 --- a/src/www/services_dhcpv6_relay.php +++ b/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'])) diff --git a/src/www/services_dyndns.php b/src/www/services_dyndns.php index e49fc6fae..cb6436c72 100644 --- a/src/www/services_dyndns.php +++ b/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(); diff --git a/src/www/services_igmpproxy.php b/src/www/services_igmpproxy.php index 87004a328..f335a21c6 100644 --- a/src/www/services_igmpproxy.php +++ b/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(); diff --git a/src/www/services_opendns.php b/src/www/services_opendns.php index ce3430daa..3a047c1b4 100644 --- a/src/www/services_opendns.php +++ b/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(); diff --git a/src/www/services_rfc2136.php b/src/www/services_rfc2136.php index 6e8a15854..00d6b3f1f 100644 --- a/src/www/services_rfc2136.php +++ b/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(); diff --git a/src/www/services_rfc2136_edit.php b/src/www/services_rfc2136_edit.php index c90a8165f..4f79588a7 100644 --- a/src/www/services_rfc2136_edit.php +++ b/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(); diff --git a/src/www/services_router_advertisements.php b/src/www/services_router_advertisements.php index 0a0f911a3..c853d95b2 100644 --- a/src/www/services_router_advertisements.php +++ b/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 diff --git a/src/www/services_unbound_acls.php b/src/www/services_unbound_acls.php index cec90eaf6..9b949d25b 100644 --- a/src/www/services_unbound_acls.php +++ b/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; diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php index ebaafe7ff..f6c29287a 100644 --- a/src/www/services_unbound_advanced.php +++ b/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(); diff --git a/src/www/status_dhcpv6_leases.php b/src/www/status_dhcpv6_leases.php index b4b602ffd..1de9dff82 100644 --- a/src/www/status_dhcpv6_leases.php +++ b/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"; diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php index 4cd461796..6f0332c91 100644 --- a/src/www/system_advanced_admin.php +++ b/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']; diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php index 56661c928..8569ceb62 100644 --- a/src/www/system_advanced_firewall.php +++ b/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() { diff --git a/src/www/system_advanced_misc.php b/src/www/system_advanced_misc.php index b02c7de18..acbe14d6a 100644 --- a/src/www/system_advanced_misc.php +++ b/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']; diff --git a/src/www/system_general.php b/src/www/system_general.php index 1ee0cca09..efdd2d956 100644 --- a/src/www/system_general.php +++ b/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() { diff --git a/src/www/widgets/widgets/dyn_dns_status.widget.php b/src/www/widgets/widgets/dyn_dns_status.widget.php index 9c02149bf..faabdffcb 100644 --- a/src/www/widgets/widgets/dyn_dns_status.widget.php +++ b/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();