Fix the function that checks if a link is to be included or excluded.

Multiple alarms can be returned which requires different parsing.
Scott will test this

1 files changed, 18 insertions, 20 deletions

diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc
index e6fb8b1..7329658 100644
--- a/etc/inc/gwlb.inc
+++ b/etc/inc/gwlb.inc
@@ -307,27 +307,25 @@ function return_gateway_groups_array() {
 					if(($status['name'] != $gwname)) {
 						continue;
 					}
-					switch($status['status']) {
-						case "None":
-							/* Online add member */
+					if (preg_match("/down/i", $status['status'])) {
+						log_error("MONITOR: $gwname has high latency, removing from routing group");
+					} elseif (preg_match("/loss/i", $status['status'])) {
+						if (strstr($group['trigger'], "loss")) {
+							/* packet loss */
+							log_error("MONITOR: $gwname has packet loss, removing from routing group");
+						} else {
 							$tiers[$tier][] = $gwname;
-							break;
-						case "delay":
-							if(strstr($group['trigger'] , "latency")) {
-								/* high latency */
-								log_error("MONITOR: $gwname has high latency, removing from routing group");
-							} else {
-								$tiers[$tier][] = $gwname;
-							}
-							break;
-						case "loss":
-							if(strstr($group['trigger'], "loss")) {
-								/* packet loss */
-								log_error("MONITOR: $gwname has packet loss, removing from routing group");
-							} else {
-								$tiers[$tier][] = $gwname;
-							}
-							break;
+						}
+					} elseif (preg_match("/delay/i", $status['status'])) {
+						if (strstr($group['trigger'] , "latency")) {
+							/* high latency */
+							log_error("MONITOR: $gwname has high latency, removing from routing group");
+						} else {
+							$tiers[$tier][] = $gwname;
+						}
+					} elseif (preg_match("/none/i", $status['status'])) {
+						/* Online add member */
+						$tiers[$tier][] = $gwname;
 					}
 				}
 			}