From 5f2d078e7d7d2b63c486d7da081f48e4616fc4a7 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sat, 21 Nov 2009 19:10:37 -0500 Subject: Decouple filter.inc from functions.inc. There is no need to process filter functions most of the time. Include filter.inc where it is needed --- etc/inc/functions.inc | 4 ++-- etc/rc.bootup | 6 +++++- etc/rc.captiveportal_configure | 4 ++++ etc/rc.dyndns.update | 1 + etc/rc.exipireaccounts | 3 ++- etc/rc.filter_configure | 1 + etc/rc.filter_configure_sync | 3 ++- etc/rc.filter_synchronize | 4 +++- etc/rc.initial.firmware_update | 1 + etc/rc.initial.reboot | 3 ++- etc/rc.initial.setlanip | 3 +++ etc/rc.initial.setports | 8 ++++++-- etc/rc.initial.store_config_to_removable_device | 1 + etc/rc.initial.toggle_sshd | 2 +- etc/rc.interfaces_carp_configure | 3 ++- etc/rc.interfaces_lan_configure | 3 ++- etc/rc.interfaces_opt_configure | 5 +++-- etc/rc.interfaces_wan_configure | 3 ++- etc/rc.linkup | 2 ++ etc/rc.newipsecdns | 2 ++ etc/rc.newwanip | 2 ++ etc/rc.ntpdate | 2 ++ etc/rc.packages | 4 ++++ etc/rc.prunecaptiveportal | 2 ++ etc/rc.reload_all | 2 ++ etc/rc.reload_interfaces | 2 ++ etc/rc.restart_webgui | 2 ++ etc/rc.savevoucher | 4 +++- 28 files changed, 66 insertions(+), 16 deletions(-) diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc index 3953765..4c157ec 100644 --- a/etc/inc/functions.inc +++ b/etc/inc/functions.inc @@ -78,8 +78,8 @@ require_once("interfaces.inc"); require_once("gwlb.inc"); require_once("services.inc"); require_once("pfsense-utils.inc"); -require_once("filter.inc"); -require_once("shaper.inc"); +//require_once("filter.inc"); +//require_once("shaper.inc"); require_once("certs.inc"); require_once("system.inc"); require_once("vslb.inc"); diff --git a/etc/rc.bootup b/etc/rc.bootup index 8e2ebca..435aaf1 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -108,11 +108,15 @@ require_once("/etc/inc/config.inc"); echo "."; require_once("/etc/inc/functions.inc"); echo "."; +require("/etc/inc/filter.inc"); +echo "."; +require("/etc/inc/shaper.inc"); +echo "."; require_once("/etc/inc/ipsec.inc"); echo "."; require_once("/etc/inc/vpn.inc"); echo "."; -require_once("openvpn.inc"); +require_once("/etc/inc/openvpn.inc"); echo "."; require_once("/etc/inc/captiveportal.inc"); echo "."; diff --git a/etc/rc.captiveportal_configure b/etc/rc.captiveportal_configure index b35024a..5901071 100755 --- a/etc/rc.captiveportal_configure +++ b/etc/rc.captiveportal_configure @@ -29,6 +29,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +require("config.inc"); +require("functions.inc"); +require("filter.inc"); +require("shaper.inc"); require("captiveportal.inc"); captiveportal_configure(); diff --git a/etc/rc.dyndns.update b/etc/rc.dyndns.update index 1e4087a..15079c9 100755 --- a/etc/rc.dyndns.update +++ b/etc/rc.dyndns.update @@ -32,6 +32,7 @@ require_once("config.inc"); require_once("functions.inc"); require_once("filter.inc"); +require_once("shaper.inc"); services_dyndns_configure(); diff --git a/etc/rc.exipireaccounts b/etc/rc.exipireaccounts index c5f1961..7aa9fe5 100755 --- a/etc/rc.exipireaccounts +++ b/etc/rc.exipireaccounts @@ -30,7 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ - require_once("auth.inc"); + require_once("config.inc"); + require_once("functions.inc"); $removed = 0; if (!is_array($config['system']['user'])) diff --git a/etc/rc.filter_configure b/etc/rc.filter_configure index 852d584..c91313d 100755 --- a/etc/rc.filter_configure +++ b/etc/rc.filter_configure @@ -32,6 +32,7 @@ require_once("config.inc"); require_once("functions.inc"); require_once("filter.inc"); +require_once("shaper.inc"); /* invalidate interface cache */ get_interface_arr(true); diff --git a/etc/rc.filter_configure_sync b/etc/rc.filter_configure_sync index f30ee15..44da184 100755 --- a/etc/rc.filter_configure_sync +++ b/etc/rc.filter_configure_sync @@ -31,7 +31,8 @@ require_once("config.inc"); require_once("functions.inc"); -require_once("functions.inc"); +require_once("filter.inc"); +require_once("shaper.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 7e9a980..300ff84 100644 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -35,8 +35,10 @@ */ -/* Globals.inc and util.inc is included by config.inc */ require_once("config.inc"); +require_once("functions.inc"); +require_once("filter.inc"); +require_once("shaper.inc"); require_once("xmlrpc.inc"); /* diff --git a/etc/rc.initial.firmware_update b/etc/rc.initial.firmware_update index 9d6f6c2..e102988 100755 --- a/etc/rc.initial.firmware_update +++ b/etc/rc.initial.firmware_update @@ -4,6 +4,7 @@ require("globals.inc"); require("util.inc"); + $g['booting'] = true; echo "Starting the {$g['product_name']} console firmware update system"; diff --git a/etc/rc.initial.reboot b/etc/rc.initial.reboot index 61bf0a9..ca9dcf5 100755 --- a/etc/rc.initial.reboot +++ b/etc/rc.initial.reboot @@ -55,4 +55,5 @@ EOD; } fclose($fp); -?> + +?> \ No newline at end of file diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index 24497bf..2a37169 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -33,6 +33,9 @@ /* parse the configuration and include all functions used below */ require_once("config.inc"); require_once("functions.inc"); + require_once("filter.inc"); + require_once("shaper.inc"); + require_once("rrd.inc"); function prompt_for_enable_dhcp_server() { global $config, $fp, $interface; diff --git a/etc/rc.initial.setports b/etc/rc.initial.setports index 94e203b..aba4caf 100755 --- a/etc/rc.initial.setports +++ b/etc/rc.initial.setports @@ -33,11 +33,15 @@ /* parse the configuration and include all functions used below */ require_once("config.inc"); require_once("functions.inc"); + require_once("filter.inc"); + require_once("shaper.inc"); + require_once("rrd.inc"); set_networking_interfaces_ports(); reload_interfaces_sync(); - /* reload graphing functions */ - enable_rrd_graphing(); + + /* reload graphing functions */ + enable_rrd_graphing(); ?> diff --git a/etc/rc.initial.store_config_to_removable_device b/etc/rc.initial.store_config_to_removable_device index 438e484..19fa70e 100755 --- a/etc/rc.initial.store_config_to_removable_device +++ b/etc/rc.initial.store_config_to_removable_device @@ -32,6 +32,7 @@ /* parse the configuration and include all functions used below */ require_once("config.inc"); + require_once("functions.inc"); require_once("util.inc"); $fp = fopen('php://stdin', 'r'); diff --git a/etc/rc.initial.toggle_sshd b/etc/rc.initial.toggle_sshd index 6c1d8ce..a7ecf6b 100644 --- a/etc/rc.initial.toggle_sshd +++ b/etc/rc.initial.toggle_sshd @@ -29,8 +29,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -require_once("functions.inc"); require_once("config.inc"); +require_once("functions.inc"); conf_mount_rw(); diff --git a/etc/rc.interfaces_carp_configure b/etc/rc.interfaces_carp_configure index 6faa589..cdff0b5 100755 --- a/etc/rc.interfaces_carp_configure +++ b/etc/rc.interfaces_carp_configure @@ -31,7 +31,8 @@ require_once("config.inc"); require_once("functions.inc"); -require_once("filter.inc"); +require_once("filter.inc"); +require_once("shaper.inc"); interfaces_carp_configure(); diff --git a/etc/rc.interfaces_lan_configure b/etc/rc.interfaces_lan_configure index d5c16fd..e500a72 100755 --- a/etc/rc.interfaces_lan_configure +++ b/etc/rc.interfaces_lan_configure @@ -31,7 +31,8 @@ require_once("config.inc"); require_once("functions.inc"); -require_once("filter.inc"); +require_once("filter.inc"); +require_once("shaper.inc"); interface_configure("lan"); diff --git a/etc/rc.interfaces_opt_configure b/etc/rc.interfaces_opt_configure index 3ccb8b9..6b292ec 100755 --- a/etc/rc.interfaces_opt_configure +++ b/etc/rc.interfaces_opt_configure @@ -31,8 +31,9 @@ require_once("config.inc"); require_once("functions.inc"); -require_once("filter.inc"); - +require_once("filter.inc"); +require_once("shaper.inc"); + interfaces_configure(); ?> diff --git a/etc/rc.interfaces_wan_configure b/etc/rc.interfaces_wan_configure index 350cdfe..02063f5 100755 --- a/etc/rc.interfaces_wan_configure +++ b/etc/rc.interfaces_wan_configure @@ -31,7 +31,8 @@ require_once("config.inc"); require_once("functions.inc"); -require_once("filter.inc"); +require_once("filter.inc"); +require_once("shaper.inc"); interface_configure("wan"); diff --git a/etc/rc.linkup b/etc/rc.linkup index 6b04a19..77e6659 100755 --- a/etc/rc.linkup +++ b/etc/rc.linkup @@ -32,6 +32,8 @@ /* parse the configuration and include all functions used below */ require_once("globals.inc"); require_once("config.inc"); +require_once("filter.inc"); +require_once("shaper.inc"); require_once("interfaces.inc"); function handle_argument_group($iface, $argument2) { diff --git a/etc/rc.newipsecdns b/etc/rc.newipsecdns index d6509f9..18b3b5b 100755 --- a/etc/rc.newipsecdns +++ b/etc/rc.newipsecdns @@ -32,6 +32,8 @@ /* parse the configuration and include all functions used below */ require_once("functions.inc"); + require_once("filter.inc"); + require_once("shaper.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); diff --git a/etc/rc.newwanip b/etc/rc.newwanip index 5918084..ab5c89c 100755 --- a/etc/rc.newwanip +++ b/etc/rc.newwanip @@ -35,6 +35,8 @@ require_once("globals.inc"); require_once("config.inc"); require_once("functions.inc"); +require_once("filter.inc"); +require_once("shaper.inc"); /* WAN IP address has changed */ diff --git a/etc/rc.ntpdate b/etc/rc.ntpdate index 10df982..4d64577 100755 --- a/etc/rc.ntpdate +++ b/etc/rc.ntpdate @@ -32,6 +32,8 @@ /* parse the configuration and include all functions used below */ require_once("config.inc"); require_once("functions.inc"); + require_once("filter.inc"); + require_once("shaper.inc"); system_ntp_configure(); ?> diff --git a/etc/rc.packages b/etc/rc.packages index ae62675..3dae6de 100755 --- a/etc/rc.packages +++ b/etc/rc.packages @@ -30,6 +30,10 @@ */ require_once("config.inc"); +require_once("functions.inc"); +require_once("filter.inc"); +require_once("shaper.inc"); +require_once("captiveportal.inc"); require_once("pkg-utils.inc"); require_once("pfsense-utils.inc"); diff --git a/etc/rc.prunecaptiveportal b/etc/rc.prunecaptiveportal index bff2667..798b196 100755 --- a/etc/rc.prunecaptiveportal +++ b/etc/rc.prunecaptiveportal @@ -34,6 +34,8 @@ /* config.inc retrives the util.inc and globals.inc */ require_once("config.inc"); require_once("functions.inc"); +require_once("filter.inc"); +require_once("shaper.inc"); require_once("captiveportal.inc"); captiveportal_prune_old(); diff --git a/etc/rc.reload_all b/etc/rc.reload_all index 896dace..8ec6745 100755 --- a/etc/rc.reload_all +++ b/etc/rc.reload_all @@ -30,7 +30,9 @@ */ require_once("config.inc"); +require_once("functions.inc"); require_once("filter.inc"); +require_once("shaper.inc"); log_error("rc.reload_all: Reloading all configuration settings."); reload_all_sync(); diff --git a/etc/rc.reload_interfaces b/etc/rc.reload_interfaces index 108efd1..6e88275 100755 --- a/etc/rc.reload_interfaces +++ b/etc/rc.reload_interfaces @@ -30,7 +30,9 @@ */ require_once("config.inc"); +require_once("functions.inc"); require_once("filter.inc"); +require_once("shaper.inc"); require_once("openvpn.inc"); reload_interfaces_sync(); diff --git a/etc/rc.restart_webgui b/etc/rc.restart_webgui index eef95d5..cffd07c 100755 --- a/etc/rc.restart_webgui +++ b/etc/rc.restart_webgui @@ -4,6 +4,8 @@ require("config.inc"); require("functions.inc"); +require("filter.inc"); +require("shaper.inc"); require("captiveportal.inc"); require("rrd.inc"); diff --git a/etc/rc.savevoucher b/etc/rc.savevoucher index 4ccc4d4..29b18d6 100644 --- a/etc/rc.savevoucher +++ b/etc/rc.savevoucher @@ -29,8 +29,10 @@ */ /* parse the configuration and include all functions used below */ - require_once("functions.inc"); require_once("config.inc"); + require_once("functions.inc"); + require_once("filter.inc"); + require_once("shaper.inc"); require_once("captiveportal.inc"); require_once("voucher.inc"); -- cgit v1.1