diff options
Diffstat (limited to 'src/libcharon/encoding/payloads/payload.h')
| -rw-r--r-- | src/libcharon/encoding/payloads/payload.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/libcharon/encoding/payloads/payload.h b/src/libcharon/encoding/payloads/payload.h index 68fbb01c0..0f407ff42 100644 --- a/src/libcharon/encoding/payloads/payload.h +++ b/src/libcharon/encoding/payloads/payload.h @@ -137,11 +137,7 @@ enum payload_type_t{ * This payload type is not sent over wire and just * used internally to handle IKEv2-Header like a payload. */ -<<<<<<< HEAD - HEADER = 140, -======= HEADER = 256, ->>>>>>> upstream/4.5.1 /** * PROPOSAL_SUBSTRUCTURE has a value of PRIVATE USE space. @@ -149,11 +145,7 @@ enum payload_type_t{ * This payload type is not sent over wire and just * used internally to handle a proposal substructure like a payload. */ -<<<<<<< HEAD - PROPOSAL_SUBSTRUCTURE = 141, -======= PROPOSAL_SUBSTRUCTURE = 257, ->>>>>>> upstream/4.5.1 /** * TRANSFORM_SUBSTRUCTURE has a value of PRIVATE USE space. @@ -161,11 +153,7 @@ enum payload_type_t{ * This payload type is not sent over wire and just * used internally to handle a transform substructure like a payload. */ -<<<<<<< HEAD - TRANSFORM_SUBSTRUCTURE = 142, -======= TRANSFORM_SUBSTRUCTURE = 258, ->>>>>>> upstream/4.5.1 /** * TRANSFORM_ATTRIBUTE has a value of PRIVATE USE space. @@ -173,11 +161,7 @@ enum payload_type_t{ * This payload type is not sent over wire and just * used internally to handle a transform attribute like a payload. */ -<<<<<<< HEAD - TRANSFORM_ATTRIBUTE = 143, -======= TRANSFORM_ATTRIBUTE = 259, ->>>>>>> upstream/4.5.1 /** * TRAFFIC_SELECTOR_SUBSTRUCTURE has a value of PRIVATE USE space. @@ -185,11 +169,7 @@ enum payload_type_t{ * This payload type is not sent over wire and just * used internally to handle a transform selector like a payload. */ -<<<<<<< HEAD - TRAFFIC_SELECTOR_SUBSTRUCTURE = 144, -======= TRAFFIC_SELECTOR_SUBSTRUCTURE = 260, ->>>>>>> upstream/4.5.1 /** * CONFIGURATION_ATTRIBUTE has a value of PRIVATE USE space. @@ -197,24 +177,9 @@ enum payload_type_t{ * This payload type is not sent over wire and just * used internally to handle a transform attribute like a payload. */ -<<<<<<< HEAD - CONFIGURATION_ATTRIBUTE = 145, - - /** - * A unknown payload has a value of PRIVATE USE space. - * - * This payload type is not sent over wire and just - * used internally to handle a unknown payload. - */ - UNKNOWN_PAYLOAD = 146, -}; - - -======= CONFIGURATION_ATTRIBUTE = 261, }; ->>>>>>> upstream/4.5.1 /** * enum names for payload_type_t. */ @@ -295,8 +260,6 @@ struct payload_t { */ payload_t *payload_create(payload_type_t type); -<<<<<<< HEAD -======= /** * Check if a specific payload is implemented, or handled as unknown payload. * @@ -315,5 +278,4 @@ bool payload_is_known(payload_type_t type); */ void* payload_get_field(payload_t *payload, encoding_type_t type, u_int skip); ->>>>>>> upstream/4.5.1 #endif /** PAYLOAD_H_ @}*/ |