mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Remove an uneccesary global variable($schedule_enabled)

Browse Source 
* Do not create schedule rules in the case that schedules have been created but not referenced in any rule
This commit is contained in:
Ermal Luçi 2008-12-14 20:28:30 +00:00
parent 6fa67e540e
commit 9ea2576b3a
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etc/inc/filter.inc
View File

@ -1128,7 +1128,6 @@ function generate_user_filter_rule($rule)
{
global $config, $g, $FilterIflist, $GatewaysList, $GatewayGroupsList;
global $table_cache;
global $schedule_enabled;
if(isset($config['system']['developerspew'])) {
$mt = microtime();
echo "generate_user_filter_rule() being called $mt\n";
@ -1137,12 +1136,6 @@ function generate_user_filter_rule($rule)
if (isset($rule['disabled'])) {
return "# rule " . $rule['descr'] . " disabled \n";
}
if($config['schedules']) {
foreach($config['schedules']['schedule'] as $sched) {
$schedule_enabled = true;
break;
}
}
/* Setup cache array if not already existing */
if (!isset($table_cache)) {
if ($g['debug'])
@ -1655,10 +1648,9 @@ function generate_user_filter_rule($rule)
$aline['flags'] . $aline['queue'] . $aline['dnpipe'];
/* is a time based rule schedule attached? */
if($rule['sched']) {
if(!empty($rule['sched'])) {
if($config['schedules']) {
foreach($config['schedules']['schedule'] as $sched) {
$schedule_enabled = true;
if($sched['name'] == $rule['sched']) {
$schedule_xml_block = $sched;
break;
@ -1695,14 +1687,9 @@ function generate_user_filter_rule($rule)
}
return "# $line";
}
} else {
if($schedule_enabled) {
// no schedule allow rules should simply allow
$ipfw_rule = tdr_create_ipfw_rule($rule, "allow");
tdr_install_rule($ipfw_rule);
}
return $line;
}
}
return $line;
}
function filter_rules_generate()