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

fix alias cleanup, https://github.com/opnsense/core/issues/1396

Browse Source
This commit is contained in:
Ad Schellevis 2017-02-16 21:34:56 +01:00
parent eff961d561
commit 067f0982b7
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,9 +378,6 @@ function filter_configure_sync($verbose = false)
{
global $config, $filterdns, $aliases;
/* holds the tables to be flushed *AFTER* the filter is fully loaded */
$after_filter_configure_run = array();
$FilterIflist = filter_generate_optcfg_array();
// initialize fw plugin object
@ -405,7 +402,7 @@ function filter_configure_sync($verbose = false)
/* generate aliases */
update_filter_reload_status(gettext("Creating aliases"));
$aliases = filter_generate_aliases($FilterIflist, $after_filter_configure_run);
$aliases = filter_generate_aliases($FilterIflist);
$aliases .= filter_generate_network_aliases();
$gateways = filter_generate_gateways();
@ -614,11 +611,6 @@ function filter_configure_sync($verbose = false)
update_filter_reload_status(gettext("Flushing schedule state"));
/* run items scheduled for after filter configure run */
foreach ($after_filter_configure_run as $afcr) {
mwexecf('/sbin/pfctl -T flush -t %s', $afcr);
}
if ($verbose) {
echo '.';
flush();
@ -791,7 +783,7 @@ function filter_expand_alias_array($alias_name) {
return explode(" ", preg_replace('/\s+/', ' ', trim($expansion)));
}
function filter_generate_aliases(&$FilterIflist, &$after_filter_configure_run)
function filter_generate_aliases(&$FilterIflist)
{
global $config;
@ -843,10 +835,7 @@ function filter_generate_aliases(&$FilterIflist, &$after_filter_configure_run)
case "network":
case "url":
if (empty($addrlist)) {
$aliases .= "table <{$aliased['name']}> persist\n";
if (empty($aliased['address'])) {
$after_filter_configure_run[] = $aliased['name'];
}
$aliases .= "table <{$aliased['name']}> {} persist\n";
} else {
$aliases .= "table <{$aliased['name']}> { {$addrlist} } \n";
}