Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
067f0982
Commit
067f0982
authored
Feb 16, 2017
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix alias cleanup,
https://github.com/opnsense/core/issues/1396
parent
eff961d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
14 deletions
+3
-14
filter.inc
src/etc/inc/filter.inc
+3
-14
No files found.
src/etc/inc/filter.inc
View file @
067f0982
...
@@ -378,9 +378,6 @@ function filter_configure_sync($verbose = false)
...
@@ -378,9 +378,6 @@ function filter_configure_sync($verbose = false)
{
{
global
$config
,
$filterdns
,
$aliases
;
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
();
$FilterIflist
=
filter_generate_optcfg_array
();
// initialize fw plugin object
// initialize fw plugin object
...
@@ -405,7 +402,7 @@ function filter_configure_sync($verbose = false)
...
@@ -405,7 +402,7 @@ function filter_configure_sync($verbose = false)
/* generate aliases */
/* generate aliases */
update_filter_reload_status
(
gettext
(
"Creating 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
();
$aliases
.=
filter_generate_network_aliases
();
$gateways
=
filter_generate_gateways
();
$gateways
=
filter_generate_gateways
();
...
@@ -614,11 +611,6 @@ function filter_configure_sync($verbose = false)
...
@@ -614,11 +611,6 @@ function filter_configure_sync($verbose = false)
update_filter_reload_status
(
gettext
(
"Flushing schedule state"
));
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
)
{
if
(
$verbose
)
{
echo
'.'
;
echo
'.'
;
flush
();
flush
();
...
@@ -791,7 +783,7 @@ function filter_expand_alias_array($alias_name) {
...
@@ -791,7 +783,7 @@ function filter_expand_alias_array($alias_name) {
return
explode
(
" "
,
preg_replace
(
'/\s+/'
,
' '
,
trim
(
$expansion
)));
return
explode
(
" "
,
preg_replace
(
'/\s+/'
,
' '
,
trim
(
$expansion
)));
}
}
function
filter_generate_aliases
(
&
$FilterIflist
,
&
$after_filter_configure_run
)
function
filter_generate_aliases
(
&
$FilterIflist
)
{
{
global
$config
;
global
$config
;
...
@@ -843,10 +835,7 @@ function filter_generate_aliases(&$FilterIflist, &$after_filter_configure_run)
...
@@ -843,10 +835,7 @@ function filter_generate_aliases(&$FilterIflist, &$after_filter_configure_run)
case
"network"
:
case
"network"
:
case
"url"
:
case
"url"
:
if
(
empty
(
$addrlist
))
{
if
(
empty
(
$addrlist
))
{
$aliases
.=
"table <
{
$aliased
[
'name'
]
}
> persist
\n
"
;
$aliases
.=
"table <
{
$aliased
[
'name'
]
}
> {} persist
\n
"
;
if
(
empty
(
$aliased
[
'address'
]))
{
$after_filter_configure_run
[]
=
$aliased
[
'name'
];
}
}
else
{
}
else
{
$aliases
.=
"table <
{
$aliased
[
'name'
]
}
> {
{
$addrlist
}
}
\n
"
;
$aliases
.=
"table <
{
$aliased
[
'name'
]
}
> {
{
$addrlist
}
}
\n
"
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment