attributes: Add definition of some additional configuration attributes

diff --git a/src/libcharon/attributes/attributes.c b/src/libcharon/attributes/attributes.c
index d31b62c26d3da5b681b657330150ac6056104b80..52c2ef1f38ee47dd3a5adba476f4e8825492b862 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, P_CSCF_IP6_ADDRESS,
+ENUM_BEGIN(configuration_attribute_type_names, INTERNAL_IP4_ADDRESS, INTERNAL_DNSSEC_TA,
        "INTERNAL_IP4_ADDRESS",
        "INTERNAL_IP4_NETMASK",
        "INTERNAL_IP4_DNS",
@@ -38,8 +38,13 @@ ENUM_BEGIN(configuration_attribute_type_names, INTERNAL_IP4_ADDRESS, P_CSCF_IP6_
        "INTERNAL_IP6_PREFIX",
        "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,
+       "P_CSCF_IP6_ADDRESS",
+       "FTT_KAT",
+       "EXT_SRC_IP4_NAT_INFO",
+       "TIMEOUT_PERIOD_FOR_DPD",
+       "INTERNAL_DNS_DOMAIN",
+       "INTERNAL_DNSSEC_TA");
+ENUM_NEXT(configuration_attribute_type_names, XAUTH_TYPE, XAUTH_ANSWER, INTERNAL_DNSSEC_TA,
        "XAUTH_TYPE",
        "XAUTH_USER_NAME",
        "XAUTH_USER_PASSWORD",
@@ -67,7 +72,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, P_CSCF_IP6_ADDRESS,
+ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, INTERNAL_DNSSEC_TA,
        "ADDR",
        "MASK",
        "DNS",
@@ -88,8 +93,13 @@ ENUM_BEGIN(configuration_attribute_type_short_names, INTERNAL_IP4_ADDRESS, P_CSC
        "PFX6",
        "HOA",
        "PCSCF4",
-       "PCSCF6");
-ENUM_NEXT(configuration_attribute_type_short_names, XAUTH_TYPE, XAUTH_ANSWER, P_CSCF_IP6_ADDRESS,
+       "PCSCF6",
+       "FTTKAT",
+       "EXTSRC4",
+       "DPD",
+       "DOMAIN",
+       "TA");
+ENUM_NEXT(configuration_attribute_type_short_names, XAUTH_TYPE, XAUTH_ANSWER, INTERNAL_DNSSEC_TA,
        "X_TYPE",
        "X_USER",
        "X_PWD",

diff --git a/src/libcharon/attributes/attributes.h b/src/libcharon/attributes/attributes.h
index 119143a55d229082249f6583bf093eb05ff89a45..0a83277a5d0d73747741fc40b54ca4f8e96bc3d3 100644 (file)
--- a/src/libcharon/attributes/attributes.h
+++ b/src/libcharon/attributes/attributes.h
@@ -52,6 +52,15 @@ enum configuration_attribute_type_t {
        /* RFC 7651 */
        P_CSCF_IP4_ADDRESS              = 20,
        P_CSCF_IP6_ADDRESS              = 21,
+       /* Firewall traversal keep-alive time (TS 24.302 12.6.0) */
+       FTT_KAT                                 = 22,
+       /* External NAT endpoint (TS 29.139) */
+       EXT_SRC_IP4_NAT_INFO    = 23,
+       /* DPD interval (TS 24.302 13.4.0)*/
+       TIMEOUT_PERIOD_FOR_DPD  = 24,
+       /* RFC 8598 */
+       INTERNAL_DNS_DOMAIN             = 25,
+       INTERNAL_DNSSEC_TA              = 26,
        /* XAUTH attributes */
        XAUTH_TYPE              = 16520,
        XAUTH_USER_NAME         = 16521,