rc: filter_configure_sync does gateway switching...

... so let's do that first and afterwards reload OpenVPN and IPsec.
It's not that problematic, because both variants reload the filter
when they have done something, so we merely spread out the call order
a bit instead of batching a number of filter reload at the end.

PR: https://github.com/opnsense/core/issues/2247
This commit is contained in:
Franco Fichtner 2018-03-19 11:25:30 +01:00
parent 6769bc7d41
commit 6928d06aad
3 changed files with 3 additions and 3 deletions

View File

@ -113,8 +113,8 @@ services_dhcrelay_configure(true);
services_dhcrelay6_configure(true);
prefer_ipv4_or_ipv6();
plugins_configure('vpn', true);
filter_configure_sync(true);
plugins_configure('vpn', true);
plugins_configure('bootup', true);
rrd_configure(true);

View File

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

View File

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