wip: notify-payload: Add notify types for QSKE negotiation

diff --git a/src/libcharon/encoding/payloads/notify_payload.c b/src/libcharon/encoding/payloads/notify_payload.c
index f932aa566554e31005fcdc8c7fe22eb20e6c61e0..2e9ecefcd32c59e9db0b0fec21fff52d471c5e40 100644 (file)
--- a/src/libcharon/encoding/payloads/notify_payload.c
+++ b/src/libcharon/encoding/payloads/notify_payload.c
@@ -61,7 +61,8 @@ ENUM_NEXT(notify_type_names, SINGLE_PAIR_REQUIRED, CHILD_SA_NOT_FOUND, AUTHENTIC
        "USE_ASSIGNED_HoA",
        "TEMPORARY_FAILURE",
        "CHILD_SA_NOT_FOUND");
-ENUM_NEXT(notify_type_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, CHILD_SA_NOT_FOUND,
+ENUM_NEXT(notify_type_names, STATE_NOT_FOUND, ME_CONNECT_FAILED, CHILD_SA_NOT_FOUND,
+       "STATE_NOT_FOUND",
        "ME_CONNECT_FAILED");
 ENUM_NEXT(notify_type_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED,
        "MS_NOTIFY_STATUS");
@@ -126,7 +127,8 @@ 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, USE_BEET_MODE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
+ENUM_NEXT(notify_type_names, ADDITIONAL_KEY_EXCHANGE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
+       "ADDITIONAL_KEY_EXCHANGE",
        "USE_BEET_MODE");
 ENUM_NEXT(notify_type_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE,
        "ME_MEDIATION",
@@ -176,7 +178,8 @@ ENUM_NEXT(notify_type_short_names, SINGLE_PAIR_REQUIRED, CHILD_SA_NOT_FOUND, AUT
        "ASSIGNED_HoA",
        "TEMP_FAIL",
        "NO_CHILD_SA");
-ENUM_NEXT(notify_type_short_names, ME_CONNECT_FAILED, ME_CONNECT_FAILED, CHILD_SA_NOT_FOUND,
+ENUM_NEXT(notify_type_short_names, STATE_NOT_FOUND, ME_CONNECT_FAILED, CHILD_SA_NOT_FOUND,
+       "NO_STATE",
        "ME_CONN_FAIL");
 ENUM_NEXT(notify_type_short_names, MS_NOTIFY_STATUS, MS_NOTIFY_STATUS, ME_CONNECT_FAILED,
        "MS_STATUS");
@@ -241,7 +244,8 @@ 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, USE_BEET_MODE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
+ENUM_NEXT(notify_type_short_names, ADDITIONAL_KEY_EXCHANGE, USE_BEET_MODE, UNITY_LOAD_BALANCE,
+       "ADD_KE",
        "BEET_MODE");
 ENUM_NEXT(notify_type_short_names, ME_MEDIATION, RADIUS_ATTRIBUTE, USE_BEET_MODE,
        "ME_MED",

diff --git a/src/libcharon/encoding/payloads/notify_payload.h b/src/libcharon/encoding/payloads/notify_payload.h
index ff39fa1617a524cf18ad50d01d98d8f3a0295f2c..ee145eff3b33c42da78aacc727b37d8dc283d667 100644 (file)
--- a/src/libcharon/encoding/payloads/notify_payload.h
+++ b/src/libcharon/encoding/payloads/notify_payload.h
@@ -79,8 +79,10 @@ enum notify_type_t {
        TEMPORARY_FAILURE = 43,
        CHILD_SA_NOT_FOUND = 44,
 
+       /* draft-tjhai-ipsecme-hybrid-qske-ikev2 */
+       STATE_NOT_FOUND = 8192,
        /* IKE-ME, private use */
-       ME_CONNECT_FAILED = 8192,
+       ME_CONNECT_FAILED = 8193,
 
        /* Windows error code */
        MS_NOTIFY_STATUS = 12345,
@@ -168,6 +170,8 @@ 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 */