From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 7 Dec 2023 17:26:24 +0000 (-0500)
Subject: add combo-ip and combo-prefix to upcast_cmp
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21ce91e66b60b2c3c44857562f44b14a98247ef4;p=thirdparty%2Ffreeradius-server.git

add combo-ip and combo-prefix to upcast_cmp
---

diff --git a/src/lib/util/calc.c b/src/lib/util/calc.c
index 5f0c2d2e4de..b22830d76b2 100644
--- a/src/lib/util/calc.c
+++ b/src/lib/util/calc.c
@@ -392,6 +392,9 @@ static const fr_type_t upcast_cmp[FR_TYPE_MAX + 1][FR_TYPE_MAX + 1] = {
 		[FR_TYPE_IPV6_ADDR] = FR_TYPE_IPV6_ADDR,
 		[FR_TYPE_IPV6_PREFIX] = FR_TYPE_IPV6_PREFIX,
 
+		[FR_TYPE_COMBO_IP_ADDR] = FR_TYPE_COMBO_IP_ADDR,
+		[FR_TYPE_COMBO_IP_PREFIX] = FR_TYPE_COMBO_IP_PREFIX,
+
 		[FR_TYPE_UINT32] =  FR_TYPE_IPV4_ADDR,
 	},
 
@@ -400,6 +403,8 @@ static const fr_type_t upcast_cmp[FR_TYPE_MAX + 1][FR_TYPE_MAX + 1] = {
 		[FR_TYPE_OCTETS] = FR_TYPE_IPV4_PREFIX,
 
 		[FR_TYPE_IPV6_PREFIX] = FR_TYPE_IPV6_PREFIX,
+
+		[FR_TYPE_COMBO_IP_PREFIX] = FR_TYPE_COMBO_IP_PREFIX,
 	},
 
 	[FR_TYPE_IPV6_ADDR] = {
@@ -407,11 +412,16 @@ static const fr_type_t upcast_cmp[FR_TYPE_MAX + 1][FR_TYPE_MAX + 1] = {
 		[FR_TYPE_OCTETS] = FR_TYPE_IPV6_ADDR,
 
 		[FR_TYPE_IPV6_PREFIX] = FR_TYPE_IPV6_PREFIX,
+
+		[FR_TYPE_COMBO_IP_ADDR] = FR_TYPE_COMBO_IP_ADDR,
+		[FR_TYPE_COMBO_IP_PREFIX] = FR_TYPE_COMBO_IP_PREFIX,
 	},
 
 	[FR_TYPE_IPV6_PREFIX] = {
 		[FR_TYPE_STRING] = FR_TYPE_IPV6_PREFIX,
 		[FR_TYPE_OCTETS] = FR_TYPE_IPV6_PREFIX,
+
+		[FR_TYPE_COMBO_IP_PREFIX] = FR_TYPE_COMBO_IP_PREFIX,
 	},
 
 	[FR_TYPE_IFID] = {
@@ -419,6 +429,10 @@ static const fr_type_t upcast_cmp[FR_TYPE_MAX + 1][FR_TYPE_MAX + 1] = {
 		[FR_TYPE_OCTETS] = FR_TYPE_IFID,
 	},
 
+	[FR_TYPE_COMBO_IP_ADDR] = {
+		[FR_TYPE_COMBO_IP_PREFIX] = FR_TYPE_COMBO_IP_PREFIX,
+	},
+
 	[FR_TYPE_ETHERNET] = {
 		[FR_TYPE_STRING] = FR_TYPE_ETHERNET,
 		[FR_TYPE_OCTETS] = FR_TYPE_ETHERNET,