diff options
Diffstat (limited to 'src/charon/encoding/payloads/payload.c')
| -rw-r--r-- | src/charon/encoding/payloads/payload.c | 118 |
1 files changed, 58 insertions, 60 deletions
diff --git a/src/charon/encoding/payloads/payload.c b/src/charon/encoding/payloads/payload.c index b6b8edbbb..3bd4cdb13 100644 --- a/src/charon/encoding/payloads/payload.c +++ b/src/charon/encoding/payloads/payload.c @@ -43,67 +43,65 @@ #include <encoding/payloads/eap_payload.h> #include <encoding/payloads/unknown_payload.h> -/* - * build the mappings for payload_type_t - */ -mapping_t payload_type_m[] = { - {NO_PAYLOAD, "NO_PAYLOAD"}, - {SECURITY_ASSOCIATION, "SECURITY_ASSOCIATION"}, - {KEY_EXCHANGE, "KEY_EXCHANGE"}, - {ID_INITIATOR, "ID_INITIATOR"}, - {ID_RESPONDER, "ID_RESPONDER"}, - {CERTIFICATE, "CERTIFICATE"}, - {CERTIFICATE_REQUEST, "CERTIFICATE_REQUEST"}, - {AUTHENTICATION, "AUTHENTICATION"}, - {NONCE, "NONCE"}, - {NOTIFY, "NOTIFY"}, - {DELETE, "DELETE"}, - {VENDOR_ID, "VENDOR_ID"}, - {TRAFFIC_SELECTOR_INITIATOR, "TRAFFIC_SELECTOR_INITIATOR"}, - {TRAFFIC_SELECTOR_RESPONDER, "TRAFFIC_SELECTOR_RESPONDER"}, - {ENCRYPTED, "ENCRYPTED"}, - {CONFIGURATION, "CONFIGURATION"}, - {EXTENSIBLE_AUTHENTICATION, "EXTENSIBLE_AUTHENTICATION"}, - {HEADER, "HEADER"}, - {PROPOSAL_SUBSTRUCTURE, "PROPOSAL_SUBSTRUCTURE"}, - {TRANSFORM_SUBSTRUCTURE, "TRANSFORM_SUBSTRUCTURE"}, - {TRANSFORM_ATTRIBUTE, "TRANSFORM_ATTRIBUTE"}, - {TRAFFIC_SELECTOR_SUBSTRUCTURE, "TRAFFIC_SELECTOR_SUBSTRUCTURE"}, - {CONFIGURATION_ATTRIBUTE,"CONFIGURATION_ATTRIBUTE"}, - {UNKNOWN_PAYLOAD,"UNKNOWN_PAYLOAD"}, - {MAPPING_END, NULL} -}; -/* - * build the short mappings for payload_type_t - */ -mapping_t payload_type_short_m[] = { - {NO_PAYLOAD, "--"}, - {SECURITY_ASSOCIATION, "SA"}, - {KEY_EXCHANGE, "KE"}, - {ID_INITIATOR, "IDi"}, - {ID_RESPONDER, "IDr"}, - {CERTIFICATE, "CERT"}, - {CERTIFICATE_REQUEST, "CERTREQ"}, - {AUTHENTICATION, "AUTH"}, - {NONCE, "No"}, - {NOTIFY, "N"}, - {DELETE, "D"}, - {VENDOR_ID, "V"}, - {TRAFFIC_SELECTOR_INITIATOR, "TSi"}, - {TRAFFIC_SELECTOR_RESPONDER, "TSr"}, - {ENCRYPTED, "E"}, - {CONFIGURATION, "CP"}, - {EXTENSIBLE_AUTHENTICATION, "EAP"}, - {HEADER, "HDR"}, - {PROPOSAL_SUBSTRUCTURE, "PROP"}, - {TRANSFORM_SUBSTRUCTURE, "TRANS"}, - {TRANSFORM_ATTRIBUTE, "TRANSATTR"}, - {TRAFFIC_SELECTOR_SUBSTRUCTURE, "TSSUB"}, - {CONFIGURATION_ATTRIBUTE, "CPATTR"}, - {UNKNOWN_PAYLOAD, "??"}, - {MAPPING_END, NULL} -}; +ENUM_BEGIN(payload_type_names, NO_PAYLOAD, NO_PAYLOAD, + "NO_PAYLOAD"); +ENUM_NEXT(payload_type_names, SECURITY_ASSOCIATION, EXTENSIBLE_AUTHENTICATION, NO_PAYLOAD, + "SECURITY_ASSOCIATION", + "KEY_EXCHANGE", + "ID_INITIATOR", + "ID_RESPONDER", + "CERTIFICATE", + "CERTIFICATE_REQUEST", + "AUTHENTICATION", + "NONCE", + "NOTIFY", + "DELETE", + "VENDOR_ID", + "TRAFFIC_SELECTOR_INITIATOR", + "TRAFFIC_SELECTOR_RESPONDER", + "ENCRYPTED", + "CONFIGURATION", + "EXTENSIBLE_AUTHENTICATION"); +ENUM_NEXT(payload_type_names, HEADER, UNKNOWN_PAYLOAD, EXTENSIBLE_AUTHENTICATION, + "HEADER", + "PROPOSAL_SUBSTRUCTURE", + "TRANSFORM_SUBSTRUCTURE", + "TRANSFORM_ATTRIBUTE", + "TRAFFIC_SELECTOR_SUBSTRUCTURE", + "CONFIGURATION_ATTRIBUTE", + "UNKNOWN_PAYLOAD"); +ENUM_END(payload_type_names, UNKNOWN_PAYLOAD); + +/* short forms of payload names */ +ENUM_BEGIN(payload_type_short_names, NO_PAYLOAD, NO_PAYLOAD, + "--"); +ENUM_NEXT(payload_type_short_names, SECURITY_ASSOCIATION, EXTENSIBLE_AUTHENTICATION, NO_PAYLOAD, + "SA", + "KE", + "IDi", + "IDr", + "CERT", + "CERTREQ", + "AUTH", + "No", + "N", + "D", + "V", + "TSi", + "TSr", + "E", + "CP", + "EAP"); +ENUM_NEXT(payload_type_short_names, HEADER, UNKNOWN_PAYLOAD, EXTENSIBLE_AUTHENTICATION, + "HDR", + "PROP", + "TRANS", + "TRANSATTR", + "TSSUB", + "CPATTR", + "??"); +ENUM_END(payload_type_short_names, UNKNOWN_PAYLOAD); /* * see header |