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 97fe5d2a473eff8aa6aff7722e6f9494762f3543..cd32f98644aaef7eea3ad2b9dd7d478ee71bb49e 100644 (file)
--- 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 8336735fff4ebadce7592f14d9b7170248de3b7f..aedab587b76b993719066457ab09a01856698a05 100644 (file)
--- 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.