From 1bafebe861884725f4fac54ac925d88ef45db06e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 26 Feb 2021 00:43:11 +0100
Subject: [PATCH] interfaces: make this easier to read

---
 src/etc/inc/interfaces.inc | 14 +++++---------
 src/etc/rc.newwanip        | 12 +++++-------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 2a9b9cf86..7ba49fdc3 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2458,12 +2458,10 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
         switch ($wancfg['ipaddrv6']) {
             case 'slaac':
             case 'dhcp6':
-                /* XXX why not tell the function... */
-                if (isset($wancfg['dhcp6usev4iface'])) {
-                    break;
+                if (!isset($wancfg['dhcp6usev4iface'])) {
+                    interface_dhcpv6_prepare($interface, $wancfg);
+                    interface_dhcpv6_configure($interface, $wancfg);
                 }
-                interface_dhcpv6_prepare($interface, $wancfg);
-                interface_dhcpv6_configure($interface, $wancfg);
                 break;
             case '6rd':
                 interface_6rd_configure($interface, $wancfg);
@@ -2475,11 +2473,9 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
                 interface_track6_configure($interface, $wancfg, $reload || $linkupevent);
                 break;
             default:
-                /* XXX why not tell the function... */
-                if (isset($wancfg['dhcp6usev4iface'])) {
-                    break;
+                if (!isset($wancfg['dhcp6usev4iface'])) {
+                    interface_static6_configure($interface, $wancfg);
                 }
-                interface_static6_configure($interface, $wancfg);
                 break;
         }
     }
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index e805ed2d7..16757a15b 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -114,17 +114,15 @@ if (isset($config['interfaces'][$interface]['ipaddrv6'])) {
             break;
         case 'dhcp6':
         case 'slaac':
-            if (!isset($config['interfaces'][$interface]['dhcp6usev4iface'])) {
-                break;
+            if (isset($config['interfaces'][$interface]['dhcp6usev4iface'])) {
+                interface_dhcpv6_prepare($interface, $config['interfaces'][$interface]);
+                interface_dhcpv6_configure($interface, $config['interfaces'][$interface]);
             }
-            interface_dhcpv6_prepare($interface, $config['interfaces'][$interface]);
-            interface_dhcpv6_configure($interface, $config['interfaces'][$interface]);
             break;
        default:
-            if (!isset($config['interfaces'][$interface]['dhcp6usev4iface'])) {
-                break;
+            if (isset($config['interfaces'][$interface]['dhcp6usev4iface'])) {
+                interface_static6_configure($interface, $config['interfaces'][$interface]);
             }
-            interface_static6_configure($interface, $config['interfaces'][$interface]);
             break;
     }
 }