gwlb, gateway switch shouldn't be in the for loop

(cherry picked from commit ce8ef993)

gwlb, gateway switch shouldn't be in the for loop
(cherry picked from commit ce8ef993)
c5cd4b78 · Ad Schellevis · Franco Fichtner · 17dc44a7 · c5cd4b78
Commit c5cd4b78 authored May 08, 2017 by Ad Schellevis Committed by Franco Fichtner May 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

gwlb.inc src/etc/inc/gwlb.inc +7 -5

No files found.
--- a/src/etc/inc/gwlb.inc
+++ b/src/etc/inc/gwlb.inc
@@ -739,14 +739,16 @@ function fixup_default_gateway($gateways_status, $gateways_arr)
                if (empty($upgw) && $gwsttng[$gwname]['friendlyiface'] != "lan" &&
                  (isset($gwsttng['monitor_disable']) || !stristr($gateways_status[$gwname]['status'], "down"))) {
                    $upgw = $gwname;
-                }
+                    if (!$dfltgwup) {
-                if (!$dfltgwup && !empty($upgw)) {
+                        break;
-                    // switch gateway
+                    }
-                    $dfltgwname = $upgw;
-                    break;
                }
            }
        }
+        if (!$dfltgwup && !empty($upgw)) {
+            // switch gateway
+            $dfltgwname = $upgw;
+        }
        if ($gateways_arr[$dfltgwname]['gateway'] == "dynamic") {
            if ($ipprotocol == 'inet') {
                $gwip = get_interface_gateway($gateways_arr[$dfltgwname]['friendlyiface']);