From 6928d06aad5495f2866b2dbb3a5cd44f042705fe Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 19 Mar 2018 11:25:30 +0100
Subject: [PATCH] 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
---
 src/etc/rc.bootup     | 2 +-
 src/etc/rc.newwanip   | 2 +-
 src/etc/rc.newwanipv6 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index afb26e0ad..024f9b6be 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -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);
 
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index dcf3c78e3..791c0a2f5 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -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();
 }
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 1b05ac821..4468ed32b 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -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();
 }