updated IKEv2 notification messages assigned by IANA

diff --git a/src/charon/encoding/payloads/notify_payload.c b/src/charon/encoding/payloads/notify_payload.c
index bd244264cc24a623dedca55cace16beb060e6c16..469698ef505b0990e88c7e14dbb850ec406ed0d4 100644 (file)
--- a/src/charon/encoding/payloads/notify_payload.c
+++ b/src/charon/encoding/payloads/notify_payload.c
@@ -41,7 +41,7 @@ ENUM_NEXT(notify_type_names, INVALID_KE_PAYLOAD, INVALID_KE_PAYLOAD, NO_PROPOSAL
        "INVALID_KE_PAYLOAD");
 ENUM_NEXT(notify_type_names, AUTHENTICATION_FAILED, AUTHENTICATION_FAILED, INVALID_KE_PAYLOAD,
        "AUTHENTICATION_FAILED");
-ENUM_NEXT(notify_type_names, SINGLE_PAIR_REQUIRED, UNEXPECTED_NAT_DETECTED, AUTHENTICATION_FAILED,
+ENUM_NEXT(notify_type_names, SINGLE_PAIR_REQUIRED, USE_ASSIGNED_HoA, AUTHENTICATION_FAILED,
        "SINGLE_PAIR_REQUIRED",
        "NO_ADDITIONAL_SAS",
        "INTERNAL_ADDRESS_FAILURE",
@@ -49,10 +49,11 @@ ENUM_NEXT(notify_type_names, SINGLE_PAIR_REQUIRED, UNEXPECTED_NAT_DETECTED, AUTH
        "TS_UNACCEPTABLE",
        "INVALID_SELECTORS",
        "UNACCEPTABLE_ADDRESSES",
-       "UNEXPECTED_NAT_DETECTED");
-ENUM_NEXT(notify_type_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, UNEXPECTED_NAT_DETECTED,
+       "UNEXPECTED_NAT_DETECTED",
+       "USE_ASSIGNED_HoA");
+ENUM_NEXT(notify_type_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, USE_ASSIGNED_HoA,
        "ME_CONNECT_FAILED");
-ENUM_NEXT(notify_type_names, INITIAL_CONTACT, ANOTHER_AUTH_FOLLOWS, ME_CONNECT_FAILED,
+ENUM_NEXT(notify_type_names, INITIAL_CONTACT, LINK_ID, ME_CONNECT_FAILED,
        "INITIAL_CONTACT",
        "SET_WINDOW_SIZE",
        "ADDITIONAL_TS_POSSIBLE",
@@ -74,8 +75,17 @@ ENUM_NEXT(notify_type_names, INITIAL_CONTACT, ANOTHER_AUTH_FOLLOWS, ME_CONNECT_F
        "NO_NATS_ALLOWED",
        "AUTH_LIFETIME",
        "MULTIPLE_AUTH_SUPPORTED",
-       "ANOTHER_AUTH_FOLLOWS");
-ENUM_NEXT(notify_type_names, EAP_ONLY_AUTHENTICATION, EAP_ONLY_AUTHENTICATION, ANOTHER_AUTH_FOLLOWS,
+       "ANOTHER_AUTH_FOLLOWS",
+       "REDIRECT_SUPPORTED",
+       "REDIRECT",
+       "REDIRECTED_FROM",
+       "TICKET_LT_OPAQUE",
+       "TICKET_REQUEST",
+       "TICKET_ACK",
+       "TICKET_NACK",
+       "TICKET_OPAQUE",
+       "LINK_ID");
+ENUM_NEXT(notify_type_names, EAP_ONLY_AUTHENTICATION, EAP_ONLY_AUTHENTICATION, LINK_ID,
        "EAP_ONLY_AUTHENTICATION");
 ENUM_NEXT(notify_type_names, USE_BEET_MODE, USE_BEET_MODE, EAP_ONLY_AUTHENTICATION,
        "USE_BEET_MODE");
@@ -107,7 +117,7 @@ ENUM_NEXT(notify_type_short_names, INVALID_KE_PAYLOAD, INVALID_KE_PAYLOAD, NO_PR
        "INVAL_KE");
 ENUM_NEXT(notify_type_short_names, AUTHENTICATION_FAILED, AUTHENTICATION_FAILED, INVALID_KE_PAYLOAD,
        "AUTH_FAILED");
-ENUM_NEXT(notify_type_short_names, SINGLE_PAIR_REQUIRED, UNEXPECTED_NAT_DETECTED, AUTHENTICATION_FAILED,
+ENUM_NEXT(notify_type_short_names, SINGLE_PAIR_REQUIRED, USE_ASSIGNED_HoA, AUTHENTICATION_FAILED,
        "SINGLE_PAIR",
        "NO_ADD_SAS",
        "INT_ADDR_FAIL",
@@ -115,10 +125,11 @@ ENUM_NEXT(notify_type_short_names, SINGLE_PAIR_REQUIRED, UNEXPECTED_NAT_DETECTED
        "TS_UNACCEPT",
        "INVAL_SEL",
        "UNACCEPT_ADDR",
-       "UNEXPECT_NAT");
-ENUM_NEXT(notify_type_short_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, UNEXPECTED_NAT_DETECTED,
+       "UNEXPECT_NAT",
+       "ASSIGNED_HoA");
+ENUM_NEXT(notify_type_short_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, USE_ASSIGNED_HoA,
        "ME_CONN_FAIL");
-ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT, ANOTHER_AUTH_FOLLOWS, ME_CONNECT_FAILED,
+ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT, LINK_ID, ME_CONNECT_FAILED,
        "INIT_CONTACT",
        "SET_WINSIZE",
        "ADD_TS_POSS",
@@ -140,8 +151,17 @@ ENUM_NEXT(notify_type_short_names, INITIAL_CONTACT, ANOTHER_AUTH_FOLLOWS, ME_CON
        "NO_NATS",
        "AUTH_LFT",
        "MULT_AUTH",
-       "AUTH_FOLLOWS");
-ENUM_NEXT(notify_type_short_names, EAP_ONLY_AUTHENTICATION, EAP_ONLY_AUTHENTICATION, ANOTHER_AUTH_FOLLOWS,
+       "AUTH_FOLLOWS",
+       "REDIR_SUP",
+       "REDIR",
+       "REDIR_FROM",
+       "TKT_LT_OPAK",
+       "TKT_REQ",
+       "TKT_ACK",
+       "TKT_NACK",
+       "TKT_OPAK",
+       "LINK_ID");
+ENUM_NEXT(notify_type_short_names, EAP_ONLY_AUTHENTICATION, EAP_ONLY_AUTHENTICATION, LINK_ID,
        "EAP_ONLY");
 ENUM_NEXT(notify_type_short_names, USE_BEET_MODE, USE_BEET_MODE, EAP_ONLY_AUTHENTICATION,
        "BEET_MODE");

diff --git a/src/charon/encoding/payloads/notify_payload.h b/src/charon/encoding/payloads/notify_payload.h
index 9967eeb1aef2763a2bc1dd7980a02f5ff1879137..0e1bc23b80c93fa3112e7928a97f5353ff32e04a 100644 (file)
--- a/src/charon/encoding/payloads/notify_payload.h
+++ b/src/charon/encoding/payloads/notify_payload.h
@@ -59,8 +59,12 @@ enum notify_type_t {
        FAILED_CP_REQUIRED = 37,
        TS_UNACCEPTABLE = 38,
        INVALID_SELECTORS = 39,
+       /* mobile extension, RFC 4555 */
        UNACCEPTABLE_ADDRESSES = 40,
        UNEXPECTED_NAT_DETECTED = 41,
+       /* mobile IPv6 bootstrapping, RFC 5026 */
+       USE_ASSIGNED_HoA = 42,
+
        /* IKE-ME, private use */
        ME_CONNECT_FAILED = 8192,
 
@@ -90,6 +94,18 @@ enum notify_type_t {
        /* multiple authentication exchanges, RFC 4739 */
        MULTIPLE_AUTH_SUPPORTED = 16404,
        ANOTHER_AUTH_FOLLOWS = 16405,
+       /* redirect mechanism, RFC 5685 */
+       REDIRECT_SUPPORTED = 16406,
+       REDIRECT = 16407,
+       REDIRECTED_FROM = 16408,
+       /* draft-ietf-ipsecme-ikev2-resumption, assigned by IANA */
+       TICKET_LT_OPAQUE = 16409,
+       TICKET_REQUEST = 16410,
+       TICKET_ACK = 16411,
+       TICKET_NACK = 16412,
+       TICKET_OPAQUE = 16413,
+       LINK_ID = 16414,
+
        /* draft-eronen-ipsec-ikev2-eap-auth, not assigned by IANA yet */
        EAP_ONLY_AUTHENTICATION = 40960,
        /* BEET mode, not even a draft yet. private use */