Two interfaces, carp, ip aliases might be on the same subnet as their parent. What needs to be checked is the ip itself

1 files changed, 11 insertions, 10 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index bba28dd..47469d8 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -2444,6 +2444,15 @@ function is_ipaddr_configured($ipaddr, $ignore_if = "", $check_localip = false,
 			if (ip_in_subnet($ipaddr, $subnet . '/' . $bitmask))
 				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) {
@@ -2454,19 +2463,11 @@ function is_ipaddr_configured($ipaddr, $ignore_if = "", $check_localip = false,
 		}
 	}
 
-	$interface_list_vips = get_configured_vips_list();
-	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 (isset($config['pptpd']['localip']) && (strcasecmp($ipaddr, $config['pptpd']['localip']) == 0))
+		if (is_array($config['pptpd']) && !empty($config['pptpd']['localip']) && (strcasecmp($ipaddr, $config['pptpd']['localip']) == 0))
 			return true;
 
-		if (isset($config['l2tp']['localip']) && (strcasecmp($ipaddr, $config['l2tp']['localip']) == 0))
+		if (!is_array($config['l2tp']) && !empty($config['l2tp']['localip']) && (strcasecmp($ipaddr, $config['l2tp']['localip']) == 0))
 			return true;
 	}