diff options
Diffstat (limited to 'src/libcharon/encoding/payloads/ts_payload.h')
| -rw-r--r-- | src/libcharon/encoding/payloads/ts_payload.h | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/src/libcharon/encoding/payloads/ts_payload.h b/src/libcharon/encoding/payloads/ts_payload.h index eb39a5c1d..88ca00bc9 100644 --- a/src/libcharon/encoding/payloads/ts_payload.h +++ b/src/libcharon/encoding/payloads/ts_payload.h @@ -19,10 +19,6 @@ * @{ @ingroup payloads */ -<<<<<<< HEAD - -======= ->>>>>>> upstream/4.5.1 #ifndef TS_PAYLOAD_H_ #define TS_PAYLOAD_H_ @@ -39,20 +35,13 @@ typedef struct ts_payload_t ts_payload_t; */ #define TS_PAYLOAD_HEADER_LENGTH 8 -<<<<<<< HEAD - -======= ->>>>>>> upstream/4.5.1 /** * Class representing an IKEv2 TS payload. * * The TS payload format is described in RFC section 3.13. */ struct ts_payload_t { -<<<<<<< HEAD -======= ->>>>>>> upstream/4.5.1 /** * The payload_t interface. */ @@ -77,30 +66,6 @@ struct ts_payload_t { void (*set_initiator) (ts_payload_t *this,bool is_initiator); /** -<<<<<<< HEAD - * Adds a traffic_selector_substructure_t object to this object. - * - * @param traffic_selector traffic_selector_substructure_t object to add - */ - void (*add_traffic_selector_substructure) (ts_payload_t *this, - traffic_selector_substructure_t *traffic_selector); - - /** - * Creates an iterator of stored traffic_selector_substructure_t objects. - * - * When removing an traffic_selector_substructure_t object - * using this iterator, the length of this payload - * has to get refreshed by calling payload_t.get_length! - * - * @param forward iterator direction (TRUE: front to end) - * @return created iterator_t object - */ - iterator_t *(*create_traffic_selector_substructure_iterator) ( - ts_payload_t *this, bool forward); - - /** -======= ->>>>>>> upstream/4.5.1 * Get a list of nested traffic selectors as traffic_selector_t. * * Resulting list and its traffic selectors must be destroyed after usage @@ -118,28 +83,15 @@ struct ts_payload_t { /** * Creates an empty ts_payload_t object. * -<<<<<<< HEAD - * @param is_initiator - * - TRUE if this payload is of type TSi - * - FALSE if this payload is of type TSr - * @return ts_payload_t object -======= * @param is_initiator TRUE for TSi, FALSE for TSr payload type * @return ts_payload_t object ->>>>>>> upstream/4.5.1 */ ts_payload_t *ts_payload_create(bool is_initiator); /** * Creates ts_payload with a list of traffic_selector_t * -<<<<<<< HEAD - * @param is_initiator - * - TRUE if this payload is of type TSi - * - FALSE if this payload is of type TSr -======= * @param is_initiator TRUE for TSi, FALSE for TSr payload type ->>>>>>> upstream/4.5.1 * @param traffic_selectors list of traffic selectors to include * @return ts_payload_t object */ |