Strings for ENCRYPTED_V1 payload added.

This commit is contained in:
Tobias Brunner
2012-03-20 17:30:46 +01:00
parent d66199884f
commit 780ce7724d
+14 -10
View File
@@ -73,7 +73,7 @@ ENUM_NEXT(payload_type_names, SECURITY_ASSOCIATION, EXTENSIBLE_AUTHENTICATION, V
#ifdef ME #ifdef ME
ENUM_NEXT(payload_type_names, ID_PEER, ID_PEER, EXTENSIBLE_AUTHENTICATION, ENUM_NEXT(payload_type_names, ID_PEER, ID_PEER, EXTENSIBLE_AUTHENTICATION,
"ID_PEER"); "ID_PEER");
ENUM_NEXT(payload_type_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER, ENUM_NEXT(payload_type_names, HEADER, ENCRYPTED_V1, ID_PEER,
"HEADER", "HEADER",
"PROPOSAL_SUBSTRUCTURE", "PROPOSAL_SUBSTRUCTURE",
"PROPOSAL_SUBSTRUCTURE_V1", "PROPOSAL_SUBSTRUCTURE_V1",
@@ -82,9 +82,10 @@ ENUM_NEXT(payload_type_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER,
"TRANSFORM_ATTRIBUTE", "TRANSFORM_ATTRIBUTE",
"TRANSFORM_ATTRIBUTE_V1", "TRANSFORM_ATTRIBUTE_V1",
"TRAFFIC_SELECTOR_SUBSTRUCTURE", "TRAFFIC_SELECTOR_SUBSTRUCTURE",
"CONFIGURATION_ATTRIBUTE"); "CONFIGURATION_ATTRIBUTE",
"ENCRYPTED_V1");
#else #else
ENUM_NEXT(payload_type_names, HEADER, CONFIGURATION_ATTRIBUTE, EXTENSIBLE_AUTHENTICATION, ENUM_NEXT(payload_type_names, HEADER, ENCRYPTED_V1, EXTENSIBLE_AUTHENTICATION,
"HEADER", "HEADER",
"PROPOSAL_SUBSTRUCTURE", "PROPOSAL_SUBSTRUCTURE",
"PROPOSAL_SUBSTRUCTURE_V1", "PROPOSAL_SUBSTRUCTURE_V1",
@@ -93,9 +94,10 @@ ENUM_NEXT(payload_type_names, HEADER, CONFIGURATION_ATTRIBUTE, EXTENSIBLE_AUTHEN
"TRANSFORM_ATTRIBUTE", "TRANSFORM_ATTRIBUTE",
"TRANSFORM_ATTRIBUTE_V1", "TRANSFORM_ATTRIBUTE_V1",
"TRAFFIC_SELECTOR_SUBSTRUCTURE", "TRAFFIC_SELECTOR_SUBSTRUCTURE",
"CONFIGURATION_ATTRIBUTE"); "CONFIGURATION_ATTRIBUTE",
"ENCRYPTED_V1");
#endif /* ME */ #endif /* ME */
ENUM_END(payload_type_names, CONFIGURATION_ATTRIBUTE); ENUM_END(payload_type_names, ENCRYPTED_V1);
/* short forms of payload names */ /* short forms of payload names */
ENUM_BEGIN(payload_type_short_names, NO_PAYLOAD, NO_PAYLOAD, ENUM_BEGIN(payload_type_short_names, NO_PAYLOAD, NO_PAYLOAD,
@@ -134,7 +136,7 @@ ENUM_NEXT(payload_type_short_names, SECURITY_ASSOCIATION, EXTENSIBLE_AUTHENTICAT
#ifdef ME #ifdef ME
ENUM_NEXT(payload_type_short_names, ID_PEER, ID_PEER, EXTENSIBLE_AUTHENTICATION, ENUM_NEXT(payload_type_short_names, ID_PEER, ID_PEER, EXTENSIBLE_AUTHENTICATION,
"IDp"); "IDp");
ENUM_NEXT(payload_type_short_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER, ENUM_NEXT(payload_type_short_names, HEADER, ENCRYPTED_V1, ID_PEER,
"HDR", "HDR",
"PROP", "PROP",
"PROP", "PROP",
@@ -143,9 +145,10 @@ ENUM_NEXT(payload_type_short_names, HEADER, CONFIGURATION_ATTRIBUTE, ID_PEER,
"TRANSATTR", "TRANSATTR",
"TRANSATTR", "TRANSATTR",
"TSSUB", "TSSUB",
"CATTR"); "CATTR",
"E");
#else #else
ENUM_NEXT(payload_type_short_names, HEADER, CONFIGURATION_ATTRIBUTE, EXTENSIBLE_AUTHENTICATION, ENUM_NEXT(payload_type_short_names, HEADER, ENCRYPTED_V1, EXTENSIBLE_AUTHENTICATION,
"HDR", "HDR",
"PROP", "PROP",
"PROP", "PROP",
@@ -154,9 +157,10 @@ ENUM_NEXT(payload_type_short_names, HEADER, CONFIGURATION_ATTRIBUTE, EXTENSIBLE_
"TRANSATTR", "TRANSATTR",
"TRANSATTR", "TRANSATTR",
"TSSUB", "TSSUB",
"CATTR"); "CATTR",
"E");
#endif /* ME */ #endif /* ME */
ENUM_END(payload_type_short_names, CONFIGURATION_ATTRIBUTE); ENUM_END(payload_type_short_names, ENCRYPTED_V1);
/* /*
* see header * see header