gateways: fixup gateway as well if link local

opnsense · Sep 25, 2017 · c6c9d10 · c6c9d10
1 parent dec5ea3
commit c6c9d10
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc
@@ -210,15 +210,16 @@ EOD;
             }
 
             /*
-             * 'monitor' has been set, so makes sure it has precedence over
-             * 'gateway' in defining the source IP. Otherwise if 'gateway'
-             * is a local link and 'monitor' is global routable then the
-             * ICMP6 response would not find its way back home...
+             * If gateway is a local link and 'monitor' is global routable
+             * then the ICMP6 response would not find its way back home.
              */
-            if (is_linklocal($gateway['monitor']) && !strstr($gateway['monitor'], '%')) {
+            if (is_linklocal($gateway['monitor']) && strpos($gateway['monitor'], '%') === false) {
                 $gateway['monitor'] .= "%{$gateway['interface']}";
             }
-            if (is_linklocal($gwifip) && !strstr($gwifip, '%')) {
+            if (is_linklocal($gateway['gateway']) && strpos($gateway['gateway'], '%') === false) {
+                $gateway['gateway'] .= "%{$gateway['interface']}";
+            }
+            if (is_linklocal($gwifip) && strpos($gwifip, '%') === false) {
                 $gwifip .= "%{$gateway['interface']}";
             }