attributes: Define P-CSCF address attributes described in RFC 7651

diff --git a/src/libcharon/attributes/attributes.c b/src/libcharon/attributes/attributes.c
index 9fabcf4e4d073e8b10bcb1f37ffae97bcd354b34..0f28d55fab22da1a67ac57619731caa54a0c3c26 100644 (file)
--- a/src/libcharon/attributes/attributes.c
+++ b/src/libcharon/attributes/attributes.c
@@ -17,7 +17,7 @@
 
 #include "attributes.h"
 
-ENUM_BEGIN(configuration_attribute_type_names, INTERNAL_IP4_ADDRESS, HOME_AGENT_ADDRESS,
+ENUM_BEGIN(configuration_attribute_type_names, INTERNAL_IP4_ADDRESS, P_CSCF_IP6_ADDRESS,
        "INTERNAL_IP4_ADDRESS",
        "INTERNAL_IP4_NETMASK",
        "INTERNAL_IP4_DNS",
@@ -36,8 +36,10 @@ ENUM_BEGIN(configuration_attribute_type_names, INTERNAL_IP4_ADDRESS, HOME_AGENT_
        "MIP6_HOME_PREFIX",
        "INTERNAL_IP6_LINK",
        "INTERNAL_IP6_PREFIX",
-       "HOME_AGENT_ADDRESS");
-ENUM_NEXT(configuration_attribute_type_names, XAUTH_TYPE, XAUTH_ANSWER, HOME_AGENT_ADDRESS,
+       "HOME_AGENT_ADDRESS",
+       "P_CSCF_IP4_ADDRESS",
+       "P_CSCF_IP6_ADDRESS");
+ENUM_NEXT(configuration_attribute_type_names, XAUTH_TYPE, XAUTH_ANSWER, P_CSCF_IP6_ADDRESS,
        "XAUTH_TYPE",
        "XAUTH_USER_NAME",
        "XAUTH_USER_PASSWORD",
@@ -65,7 +67,7 @@ ENUM_NEXT(configuration_attribute_type_names, UNITY_BANNER, UNITY_DDNS_HOSTNAME,
        "UNITY_DDNS_HOSTNAME");
 ENUM_END(configuration_attribute_type_names, UNITY_DDNS_HOSTNAME);
 
-ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, HOME_AGENT_ADDRESS,
+ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, P_CSCF_IP6_ADDRESS,
        "ADDR",
        "MASK",
        "DNS",
@@ -84,8 +86,10 @@ ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, HOME_
        "MIP6HPFX",
        "LINK6",
        "PFX6",
-       "HOA");
-ENUM_NEXT(configuration_attribute_type_short_names, XAUTH_TYPE, XAUTH_ANSWER, HOME_AGENT_ADDRESS,
+       "HOA",
+       "PCSCF4",
+       "PCSCF6");
+ENUM_NEXT(configuration_attribute_type_short_names, XAUTH_TYPE, XAUTH_ANSWER, P_CSCF_IP6_ADDRESS,
        "X_TYPE",
        "X_USER",
        "X_PWD",

diff --git a/src/libcharon/attributes/attributes.h b/src/libcharon/attributes/attributes.h
index 5d1e9f9ba4b6f51fdc9cf952cc3a917e03296239..dd1db4fc3fbc8a3ad4b8246d4dcbd56ec7513268 100644 (file)
--- a/src/libcharon/attributes/attributes.h
+++ b/src/libcharon/attributes/attributes.h
@@ -49,6 +49,9 @@ enum configuration_attribute_type_t {
        INTERNAL_IP6_LINK       = 17,
        INTERNAL_IP6_PREFIX     = 18,
        HOME_AGENT_ADDRESS              = 19,
+       /* RFC 7651 */
+       P_CSCF_IP4_ADDRESS              = 20,
+       P_CSCF_IP6_ADDRESS              = 21,
        /* XAUTH attributes */
        XAUTH_TYPE              = 16520,
        XAUTH_USER_NAME         = 16521,