From dde1180b511ecdaf6003416c7dd3ac5d58ef3bcf Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 10 Apr 2019 18:05:57 +0200
Subject: [PATCH] routing, gateways. add function to return "down" gateways and
 remove now unused validate_address_family(), for
 https://github.com/opnsense/core/issues/2279

---
 src/etc/inc/gwlb.inc | 72 +++++++-------------------------------------
 1 file changed, 11 insertions(+), 61 deletions(-)

diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc
index be47f63bc..d30340d93 100644
--- a/src/etc/inc/gwlb.inc
+++ b/src/etc/inc/gwlb.inc
@@ -613,6 +613,17 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive
     return $gateways_arr;
 }
 
+function return_down_gateways()
+{
+    $result = array();
+    foreach (return_gateways_status() as $gwname => $stat) {
+        if (strpos($stat['status'], 'down') !== false) {
+            $result[] = $gwname;
+        }
+    }
+    return $result ;
+}
+
 function fixup_default_gateway()
 {
     $gateways_status = return_gateways_status();
@@ -893,67 +904,6 @@ function get_interface_gateway_v6($wanif, &$dynamic = false)
     return $gw;
 }
 
-/*
- * Check an IP address against a gateway IP
- * or name to verify its address family
- */
-function validate_address_family($ipaddr, $gwname)
-{
-    $v4ip = false;
-    $v6ip = false;
-    $v4gw = false;
-    $v6gw = false;
-
-    if (is_ipaddrv4($ipaddr)) {
-        $v4ip = true;
-    }
-    if (is_ipaddrv6($ipaddr)) {
-        $v6ip = true;
-    }
-    if (is_ipaddrv4($gwname)) {
-        $v4gw = true;
-    }
-    if (is_ipaddrv6($gwname)) {
-        $v6gw = true;
-    }
-
-    if ($v4ip && $v4gw) {
-        return true;
-    }
-    if ($v6ip && $v6gw) {
-        return true;
-    }
-
-    /* still no match, carry on, lookup gateways */
-    if (is_ipaddrv4(lookup_gateway_ip_by_name($gwname))) {
-        $v4gw = true;
-    }
-    if (is_ipaddrv6(lookup_gateway_ip_by_name($gwname))) {
-        $v6gw = true;
-    }
-
-    $gw_array = return_gateways_array();
-    if (is_array($gw_array[$gwname])) {
-        switch ($gw_array[$gwname]['ipprotocol']) {
-            case "inet":
-                $v4gw = true;
-                break;
-            case "inet6":
-                $v6gw = true;
-                break;
-        }
-    }
-
-    if ($v4ip && $v4gw) {
-        return true;
-    }
-    if ($v6ip && $v6gw) {
-        return true;
-    }
-
-    return false;
-}
-
 function running_dpinger_processes()
 {
     $result = array();