CARP IPs were being checked twice in some cases. Fixes #2823

1 files changed, 10 insertions, 10 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 11c0057..f6b05bf 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -2453,25 +2453,25 @@ function is_ipaddr_configured($ipaddr, $ignore_if = "", $check_localip = false,
 					return true;
 			}
 		}
-
-		$interface_list_vips = get_configured_vips_list(true);
-		foreach ($interface_list_vips as $id => $vip) {
-			if ($ignore_if == "vip_{$id}")
-				continue;
-			if (strcasecmp($ipaddr, $vip['ipaddr']) == 0)
-				return true;
-		}
-
 	} else {
 		$interface_list_ips = get_configured_ip_addresses();
 		foreach($interface_list_ips as $if => $ilips) {
-			if ($ignore_if == $if)
+			/* Also ignore CARP interfaces, it'll be checked below */
+			if (($ignore_if == $if) || preg_match('/_vip[0-9]/', $if))
 				continue;
 			if (strcasecmp($ipaddr, $ilips) == 0)
 				return true;
 		}
 	}
 
+	$interface_list_vips = get_configured_vips_list(true);
+	foreach ($interface_list_vips as $id => $vip) {
+		if ($ignore_if == "vip_{$id}")
+			continue;
+		if (strcasecmp($ipaddr, $vip['ipaddr']) == 0)
+			return true;
+	}
+
 	if ($check_localip) {
 		if (is_array($config['pptpd']) && !empty($config['pptpd']['localip']) && (strcasecmp($ipaddr, $config['pptpd']['localip']) == 0))
 			return true;