Fix get_carp_interface_status() to work with uniqid notation and also, verify the CARP vhid and not only the interface (when you have more than one CARP IP on the same interface). Ticket #4858

1 files changed, 24 insertions, 12 deletions

diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index b32130a..df2cb32 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -405,21 +405,33 @@ function convert_ip_to_network_format($ip, $subnet) {
  * get_carp_interface_status($carpinterface): returns the status of a carp ip
  */
 function get_carp_interface_status($carpinterface) {
+	global $config;
 
-	$interface = get_real_interface($interface);
-	$carp_query = '';
-	$_gb = exec("/sbin/ifconfig $interface | /usr/bin/grep -v grep | /usr/bin/grep carp: | /usr/bin/head -n 1", $carp_query);
-	foreach ($carp_query as $int) {
-		if (stripos($int, "MASTER")) {
-			return "MASTER";
-		}
-		if (stripos($int, "BACKUP")) {
-			return "BACKUP";
-		}
-		if (stripos($int, "INIT")) {
-			return "INIT";
+	foreach ($config['virtualip']['vip'] as $carp) {
+		if ($carp['mode'] != "carp")
+			continue;
+		$carpif = "_vip{$carp['uniqid']}";
+		if ($carpinterface !== $carpif)
+			continue;
+
+		$interface = get_real_interface($carp['interface']);
+		$vhid = $carp['vhid'];
+		$carp_query = '';
+		$_gb = exec("/sbin/ifconfig $interface | /usr/bin/grep carp: | /usr/bin/grep \"vhid $vhid\"", $carp_query);
+		foreach ($carp_query as $int) {
+			if (stripos($int, "MASTER")) {
+				return "MASTER";
+			}
+			if (stripos($int, "BACKUP")) {
+				return "BACKUP";
+			}
+			if (stripos($int, "INIT")) {
+				return "INIT";
+			}
 		}
+		break;
 	}
+
 	return;
 }