lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter: localise time_based_rules variable usage

Browse Source 
Even though we take a hit for running through the filter rules
array again, it's the first step for sidestepping the need to
use the config to inject our cron job and flush the rules in
mid-reload...
This commit is contained in:
Franco Fichtner 2016-05-07 17:48:42 +02:00
parent c43fcea649
commit 7086992b22
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/etc/inc/filter.inc
View File

@ -30,9 +30,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
/* For installing cron job of schedules */
$time_based_rules = false;
/* Create a global array to avoid errors on rulesets. */
$GatewaysList = array();
@ -162,11 +159,14 @@ function filter_delete_states_for_down_gateways()
function filter_configure_sync()
{
global $config, $time_based_rules, $filterdns, $aliases;
global $config, $filterdns, $aliases;
/* holds the tables to be flushed *AFTER* the filter is fully loaded */
$after_filter_configure_run = array();
/* For installing cron job of schedules */
$time_based_rules = false;
$FilterIflist = filter_generate_optcfg_array();
/* Use filter lock to not allow concurrent filter reloads during this run. */
@ -364,10 +364,14 @@ function filter_configure_sync()
}
/* if time based rules are enabled then swap in the set */
if ($time_based_rules == true) {
filter_tdr_install_cron(true);
} else {
filter_tdr_install_cron(false);
if (isset($config['filter']['rule'])) {
foreach ($config['filter']['rule'] as $rule) {
if (isset($rule['sched']) && !empty($rule['sched'])) {
$time_based_rules = true;
break;
}
}
filter_tdr_install_cron($time_based_rules);
}
if (file_exists("/var/run/booting")) {
@ -2748,7 +2752,7 @@ function filter_generate_user_rule(&$FilterIflist, $rule)
function filter_rules_generate(&$FilterIflist)
{
global $config, $time_based_rules, $GatewaysList;
global $config, $GatewaysList;
$fix_rule_label = 'fix_rule_label';
@ -3248,9 +3252,6 @@ EOD;
$rule_arr3[] = filter_generate_user_rule_arr($FilterIflist, $rule);
}
}
if (isset($rule['sched']) && !empty($rule['sched'])) {
$time_based_rules = true;
}
}
$ipfrules .= "\n# User-defined rules follow\n";