lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

rc: a bit for #2414

Browse Source
This commit is contained in:
Franco Fichtner 2018-05-18 17:21:33 +00:00
parent a0e982f492
commit 8844e7260a
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ function filter_delete_states_for_down_gateways()
}
}
function filter_configure_sync($verbose = false)
function filter_configure_sync($verbose = false, $flush_states = false)
{
global $config;
@ -308,7 +308,6 @@ function filter_configure_sync($verbose = false)
}
}
filter_pflog_start();
if ($verbose) {
@ -441,7 +440,6 @@ function filter_configure_sync($verbose = false)
mwexecf('/sbin/pfctl -k label -k %s', $label);
}
/*
* check for a error while loading the rules file. if an error has occurred
* then output the contents of the error to the caller
@ -494,7 +492,7 @@ function filter_configure_sync($verbose = false)
* not there, the kill is still fine).
*/
if (!is_bogonsv6_used()) {
exec('/sbin/pfctl -t bogonsv6 -T kill 2>/dev/null');
mwexec('/sbin/pfctl -t bogonsv6 -T kill');
}
if ($verbose) {
@ -511,6 +509,15 @@ function filter_configure_sync($verbose = false)
flush();
}
if ($flush_states) {
mwexec('/sbin/pfctl -Fs');
}
if ($verbose) {
echo '.';
flush();
}
configd_run('template reload OPNsense/Filter');
configd_run('filter refresh_aliases', true);
@ -519,7 +526,6 @@ function filter_configure_sync($verbose = false)
}
unlock($filterlck);
return 0;
}
function filter_generate_scrubing(&$FilterIflist)

6
src/etc/rc.newwanip
View File

@ -162,8 +162,8 @@ if (!is_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($configip)) {
@unlink($cacheip_file);
system_routing_configure(false, $interface);
setup_gateways_monitor();
filter_configure_sync();
setup_gateways_monitor(false);
filter_configure_sync(false, false /* XXX */);
if (is_ipaddr($ip)) {
@file_put_contents($cacheip_file, $ip);
@ -171,5 +171,5 @@ if (!is_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($configip)) {
plugins_configure('vpn', false, array($interface));
plugins_configure('newwanip', false, array($interface));
rrd_configure();
rrd_configure(false);
}

6
src/etc/rc.newwanipv6
View File

@ -143,8 +143,8 @@ if (!is_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($configip)) {
@unlink($cacheip_file);
system_routing_configure(false, $interface);
setup_gateways_monitor();
filter_configure_sync();
setup_gateways_monitor(false);
filter_configure_sync(false);
if (is_ipaddr($ip)) {
@file_put_contents($cacheip_file, $ip);
@ -152,5 +152,5 @@ if (!is_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($configip)) {
plugins_configure('vpn', false, array($interface));
plugins_configure('newwanip', false, array($interface));
rrd_configure();
rrd_configure(false);
}