From 336cbd67dd413d2792e3467737f093075089faff Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 20 Mar 2017 21:14:14 +0100
Subject: [PATCH] (gwlb.inc) simplify things a bit more and add
 get_interface_gateway_v6()

---
 src/etc/inc/gwlb.inc | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc
index 18623ad31..7c548930c 100644
--- a/src/etc/inc/gwlb.inc
+++ b/src/etc/inc/gwlb.inc
@@ -740,27 +740,28 @@ function fixup_default_gateway($gateways_status, $gateways_arr)
                     $upgw = $gwname;
                 }
                 if ($dfltgwdown && !empty($upgw)) {
+                    // switch gateway
+                    $dfltgwname = $upgw;
                     break;
                 }
             }
         }
-        if ($gateways_arr[$upgw]['gateway'] == "dynamic") {
-            $gwip = get_interface_gateway($gateways_arr[$upgw]['friendlyiface']);
+        if ($gateways_arr[$dfltgwname]['gateway'] == "dynamic") {
+            if ($ipprotocol == 'inet') {
+                $gwip = get_interface_gateway($gateways_arr[$dfltgwname]['friendlyiface']);
+            } else {
+                $gwip = get_interface_gateway_v6($gateways_arr[$dfltgwname]['friendlyiface']);
+            }
         } else {
-            $gwip = $gateways_arr[$upgw]['gateway'];
+            $gwip = $gateways_arr[$dfltgwname]['gateway'];
         }
-        if (!$dfltgwup && !empty($upgw)) {
-            if (is_ipaddr($gwip)) {
-                log_error("Default gateway down setting {$upgw} as default!");
-                mwexec("/sbin/route delete -{$ipprotocol} default");
-                mwexec("/sbin/route add -{$ipprotocol} default {$gwip}");
-            }
-        } else {
-            $defaultgw = trim(exec("/sbin/route -n get -{$ipprotocol} default | /usr/bin/awk '/gateway:/ {print $2}'"), " \n");
-            if ($defaultgw != $gwip) {
-                mwexec("/sbin/route delete -{$ipprotocol} default");
-                mwexec("/sbin/route add -{$ipprotocol} default {$gwip}");
-            }
+        $defaultgw = trim(exec("/sbin/route -n get -{$ipprotocol} default | /usr/bin/awk '/gateway:/ {print $2}'"), " \n");
+        if (!$dfltgwup) {
+            log_error("Default gateway down setting {$dfltgwname} as default!");
+        }
+        if ($defaultgw != $gwip && is_ipaddr($gwip)) {
+            mwexec("/sbin/route delete -{$ipprotocol} default");
+            mwexec("/sbin/route add -{$ipprotocol} default {$gwip}");
         }
     }
 }