Commit 10a148ff authored by Franco Fichtner's avatar Franco Fichtner

filter: two more converted calls

parent 77d87a27
...@@ -253,12 +253,12 @@ function filter_configure_sync($delete_states_if_needed = true) ...@@ -253,12 +253,12 @@ function filter_configure_sync($delete_states_if_needed = true)
$rules .= "{$aliases} \n"; $rules .= "{$aliases} \n";
$rules .= "{$gateways} \n"; $rules .= "{$gateways} \n";
update_filter_reload_status(gettext("Setting up logging information")); update_filter_reload_status(gettext("Setting up logging information"));
$rules .= filter_setup_logging_interfaces(); $rules .= filter_setup_logging_interfaces($FilterIflist);
$rules .= "\n"; $rules .= "\n";
$rules .= "set skip on pfsync0\n"; $rules .= "set skip on pfsync0\n";
$rules .= "\n"; $rules .= "\n";
update_filter_reload_status(gettext("Setting up SCRUB information")); update_filter_reload_status(gettext("Setting up SCRUB information"));
$rules .= filter_generate_scrubing(); $rules .= filter_generate_scrubing($FilterIflist);
$rules .= "\n"; $rules .= "\n";
$rules .= "{$natrules}\n"; $rules .= "{$natrules}\n";
$rules .= "{$pfrules}\n"; $rules .= "{$pfrules}\n";
...@@ -389,10 +389,11 @@ function filter_configure_sync($delete_states_if_needed = true) ...@@ -389,10 +389,11 @@ function filter_configure_sync($delete_states_if_needed = true)
return 0; return 0;
} }
function filter_generate_scrubing() { function filter_generate_scrubing(&$FilterIflist)
{
global $config; global $config;
$FilterIflist = filter_generate_optcfg_array() ;
$scrubrules = ""; $scrubrules = '';
if (isset($config['system']['maxmss_enable'])) { if (isset($config['system']['maxmss_enable'])) {
$maxmss = 1400; $maxmss = 1400;
...@@ -3595,10 +3596,9 @@ function filter_tdr_month($schedule) { ...@@ -3595,10 +3596,9 @@ function filter_tdr_month($schedule) {
return false; return false;
} }
function filter_setup_logging_interfaces() function filter_setup_logging_interfaces(&$FilterIflist)
{ {
global $config; global $config;
$FilterIflist = filter_generate_optcfg_array() ;
$rules = ''; $rules = '';
if (isset($FilterIflist['lan'])) { if (isset($FilterIflist['lan'])) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment