From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 11 Jul 2025 06:04:26 +0000 (+0200)
Subject: vici: Add support for P-CSCF server attributes
X-Git-Tag: 6.0.3dr1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f02033664e35e547f7d29769f6bede965d5a40e6;p=thirdparty%2Fstrongswan.git

vici: Add support for P-CSCF server attributes

Was apparently forgotten when support was added to the attr plugin
with 98a3ba8a5a16 ("attr: Add p-cscf keyword for P-CSCF server addresses").

For consistency, using an underscore like the `split*` options and not a
dash like in the attr plugin.

References strongswan/strongswan#2396
---

diff --git a/src/libcharon/plugins/vici/vici_attribute.c b/src/libcharon/plugins/vici/vici_attribute.c
index 97fe5d2a47..cd32f98644 100644
--- a/src/libcharon/plugins/vici/vici_attribute.c
+++ b/src/libcharon/plugins/vici/vici_attribute.c
@@ -421,6 +421,7 @@ CALLBACK(pool_li, bool,
 		{"netmask",			INTERNAL_IP4_NETMASK,	INTERNAL_IP6_NETMASK	},
 		{"server",			INTERNAL_IP4_SERVER,	INTERNAL_IP6_SERVER		},
 		{"subnet",			INTERNAL_IP4_SUBNET,	INTERNAL_IP6_SUBNET		},
+		{"p_cscf",			P_CSCF_IP4_ADDRESS,		P_CSCF_IP6_ADDRESS,		},
 		{"split_include",	UNITY_SPLIT_INCLUDE,	UNITY_SPLIT_INCLUDE		},
 		{"split_exclude",	UNITY_LOCAL_LAN,		UNITY_LOCAL_LAN			},
 	};
diff --git a/src/swanctl/swanctl.opt b/src/swanctl/swanctl.opt
index 8336735fff..aedab587b7 100644
--- a/src/swanctl/swanctl.opt
+++ b/src/swanctl/swanctl.opt
@@ -1401,10 +1401,10 @@ pools.<name>.<attr> =
 
 	Comma separated list of additional attributes of type **<attr>**. The
 	attribute type may be one of _dns_, _nbns_, _dhcp_, _netmask_, _server_,
-	_subnet_, _split_include_ and _split_exclude_ to define addresses or CIDR
-	subnets for the corresponding attribute types. Alternatively, **<attr>** can
-	be a numerical identifier, for which string attribute values are accepted
-	as well.
+	_subnet_, _p_cscf_, _split_include_ and _split_exclude_ to define addresses
+	or CIDR subnets for the corresponding attribute types. Alternatively,
+	**<attr>** can be a numerical identifier, for which string attribute values
+	are accepted as well.
 
 authorities { # }
 	Section defining attributes of certification authorities.