From 92f7c3fc3d8acb859af137d5dc1754070583ee8a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 10 May 2017 06:44:38 +0200
Subject: [PATCH] rc: experimental try to only reload filter when we really do

---
 src/etc/rc.newwanip   | 14 +++++++-------
 src/etc/rc.newwanipv6 | 11 ++++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index d1e05d9d2..212728873 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -134,11 +134,11 @@ if (isset($config['interfaces'][$interface]['ipaddrv6'])) {
 }
 
 /* Check Gif tunnels */
-if(isset($config['gifs']['gif']) && is_array($config['gifs']['gif'])){
-    foreach($config['gifs']['gif'] as $gif) {
-        if($gif['if'] == $interface) {
+if (isset($config['gifs']['gif']) && is_array($config['gifs']['gif'])){
+    foreach ($config['gifs']['gif'] as $gif) {
+        if ($gif['if'] == $interface) {
             foreach (legacy_config_get_interfaces(array("virtual" => false)) as $ifname => $ifparent) {
-                if(($ifparent['if'] == $gif['gifif']) && (isset($ifparent['enable']))) {
+                if (($ifparent['if'] == $gif['gifif']) && (isset($ifparent['enable']))) {
                   $gif['gifif'] = interface_gif_configure($gif);
                   $confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
                   if (!empty($confif)) {
@@ -167,7 +167,7 @@ if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interface
     plugins_configure('vpn', false, array($interface));
     plugins_configure('newwanip', false, array($interface));
     rrd_configure();
-}
 
-/* reload filter, don't try to sync to carp slave */
-filter_configure_sync();
+    /* reload filter, don't try to sync to carp slave */
+    filter_configure_sync();
+}
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index f67c2c51f..1dbc7c39f 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -80,9 +80,10 @@ $new_domain_name_servers = getenv("new_domain_name_servers");
 if (!empty($new_domain_name_servers)) {
     $name_servers = explode(" ", $new_domain_name_servers);
     $valid_ns = array();
-    foreach($name_servers as $ns) {
-        if (is_ipaddrv6(trim($ns)))
+    foreach ($name_servers as $ns) {
+        if (is_ipaddrv6(trim($ns))) {
             $valid_ns[] = trim($ns);
+        }
     }
 
     if (count($valid_ns) > 0) {
@@ -137,7 +138,7 @@ if (!is_ipaddrv6($oldipv6) || $curwanipv6 != $oldipv6 || !is_ipaddrv6($config['i
     plugins_configure('vpn', false, array($interface));
     plugins_configure('newwanip', false, array($interface));
     rrd_configure();
-}
 
-/* reload filter, don't try to sync to carp slave */
-filter_configure_sync();
+    /* reload filter, don't try to sync to carp slave */
+    filter_configure_sync();
+}