From 0ee64f88e57afd80e7ea7eb683b5ff8ee0c22215 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 12 Jul 2017 10:59:41 +0200 Subject: [PATCH] attributes: Add definition of some additional configuration attributes --- src/libcharon/attributes/attributes.c | 22 ++++++++++++++++------ src/libcharon/attributes/attributes.h | 9 +++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/libcharon/attributes/attributes.c b/src/libcharon/attributes/attributes.c index d31b62c26d..52c2ef1f38 100644 --- 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 119143a55d..0a83277a5d 100644 --- 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, -- 2.47.2