ike-qske: Change codepoints

diff --git a/src/libcharon/encoding/payloads/notify_payload.c b/src/libcharon/encoding/payloads/notify_payload.c
index 2e9ecefcd32c59e9db0b0fec21fff52d471c5e40..497e7519fab4073722da39823c1e9db81a3bfb61 100644 (file)
--- a/src/libcharon/encoding/payloads/notify_payload.c
+++ b/src/libcharon/encoding/payloads/notify_payload.c
@@ -127,8 +127,7 @@ ENUM_NEXT(notify_type_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CONTACT_I
        "DPD_R_U_THERE_ACK");
 ENUM_NEXT(notify_type_names, UNITY_LOAD_BALANCE, UNITY_LOAD_BALANCE, DPD_R_U_THERE_ACK,
        "UNITY_LOAD_BALANCE");
-ENUM_NEXT(notify_type_names, ADDITIONAL_KEY_EXCHANGE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
-       "ADDITIONAL_KEY_EXCHANGE",
+ENUM_NEXT(notify_type_names, USE_BEET_MODE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
        "USE_BEET_MODE");
 ENUM_NEXT(notify_type_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE,
        "ME_MEDIATION",
@@ -139,7 +138,10 @@ ENUM_NEXT(notify_type_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE,
        "ME_CONNECTAUTH",
        "ME_RESPONSE",
        "RADIUS_ATTRIBUTE");
-ENUM_END(notify_type_names, RADIUS_ATTRIBUTE);
+ENUM_NEXT(notify_type_names, ADDITIONAL_KEY_EXCHANGE,
+                                                        ADDITIONAL_KEY_EXCHANGE, RADIUS_ATTRIBUTE,
+       "ADDITIONAL_KEY_EXCHANGE");
+ENUM_END(notify_type_names, ADDITIONAL_KEY_EXCHANGE);
 
 
 ENUM_BEGIN(notify_type_short_names, UNSUPPORTED_CRITICAL_PAYLOAD, UNSUPPORTED_CRITICAL_PAYLOAD,
@@ -244,8 +246,7 @@ ENUM_NEXT(notify_type_short_names, DPD_R_U_THERE, DPD_R_U_THERE_ACK, INITIAL_CON
        "DPD_ACK");
 ENUM_NEXT(notify_type_short_names, UNITY_LOAD_BALANCE, UNITY_LOAD_BALANCE, DPD_R_U_THERE_ACK,
        "UNITY_LB");
-ENUM_NEXT(notify_type_short_names, ADDITIONAL_KEY_EXCHANGE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
-       "ADD_KE",
+ENUM_NEXT(notify_type_short_names, USE_BEET_MODE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
        "BEET_MODE");
 ENUM_NEXT(notify_type_short_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE,
        "ME_MED",
@@ -256,7 +257,10 @@ ENUM_NEXT(notify_type_short_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE
        "ME_CAUTH",
        "ME_R",
        "RADIUS");
-ENUM_END(notify_type_short_names, RADIUS_ATTRIBUTE);
+ENUM_NEXT(notify_type_short_names, ADDITIONAL_KEY_EXCHANGE,
+                                                                  ADDITIONAL_KEY_EXCHANGE, RADIUS_ATTRIBUTE,
+       "ADD_KE");
+ENUM_END(notify_type_short_names, ADDITIONAL_KEY_EXCHANGE);
 
 
 typedef struct private_notify_payload_t private_notify_payload_t;

diff --git a/src/libcharon/encoding/payloads/notify_payload.h b/src/libcharon/encoding/payloads/notify_payload.h
index ee145eff3b33c42da78aacc727b37d8dc283d667..c4db7e1dc1a6ad945286d0d892731ad0064583da 100644 (file)
--- a/src/libcharon/encoding/payloads/notify_payload.h
+++ b/src/libcharon/encoding/payloads/notify_payload.h
@@ -170,8 +170,6 @@ enum notify_type_t {
        DPD_R_U_THERE_ACK = 36137,
        /* IKEv1 Cisco High Availability */
        UNITY_LOAD_BALANCE = 40501,
-       /* draft-tjhai-ipsecme-hybrid-qske-ikev2 */
-       ADDITIONAL_KEY_EXCHANGE = 40960,
        /* BEET mode, not even a draft yet. private use */
        USE_BEET_MODE = 40961,
        /* IKE-ME, private use */
@@ -184,6 +182,8 @@ enum notify_type_t {
        ME_RESPONSE = 40968,
        /* RADIUS attribute received/to send to a AAA backend */
        RADIUS_ATTRIBUTE = 40969,
+       /* draft-tjhai-ipsecme-hybrid-qske-ikev2 */
+       ADDITIONAL_KEY_EXCHANGE = 50205,
 };
 
 /**