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

filter: try to not call filter_generate_optcfg_array from...

Browse Source 
everywhere, anytime, just for fun...  first of many :(
This commit is contained in:
Franco Fichtner 2015-11-27 08:35:00 +01:00
parent b980171c3f
commit 3df63a5dbe
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,17 +162,15 @@ function filter_configure_sync($delete_states_if_needed = true)
global $config, $g, $after_filter_configure_run;
global $time_based_rules, $filterdns, $aliases;
$FilterIflist = filter_generate_optcfg_array() ;
$FilterIflist = filter_generate_optcfg_array();
/* Use filter lock to not allow concurrent filter reloads during this run. */
$filterlck = lock('filter', LOCK_EX);
filter_pflog_start();
update_filter_reload_status(gettext("Initializing"), true);
/* Get interface list to work with. */
filter_generate_optcfg_array();
if(file_exists("/var/run/booting")) {
echo gettext("Configuring firewall");
}
@ -182,7 +180,7 @@ function filter_configure_sync($delete_states_if_needed = true)
echo ".";
}
update_filter_reload_status(gettext("Creating aliases"));
$aliases = filter_generate_aliases();
$aliases = filter_generate_aliases($FilterIflist);
$gateways = filter_generate_gateways();
if(file_exists("/var/run/booting")) {
echo ".";
@ -515,10 +513,9 @@ function filter_expand_alias_array($alias_name) {
return explode(" ", preg_replace('/\s+/', ' ', trim($expansion)));
}
function filter_generate_aliases()
function filter_generate_aliases($FilterIflist)
{
global $config, $after_filter_configure_run;
$FilterIflist = filter_generate_optcfg_array() ;
$alias = "#System aliases\n ";
$aliases = "loopback = \"{ lo0 }\"\n";