diff options
Diffstat (limited to 'src/libcharon/encoding/payloads/auth_payload.h')
-rw-r--r-- | src/libcharon/encoding/payloads/auth_payload.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/libcharon/encoding/payloads/auth_payload.h b/src/libcharon/encoding/payloads/auth_payload.h index 37ee149db..c28fc1e06 100644 --- a/src/libcharon/encoding/payloads/auth_payload.h +++ b/src/libcharon/encoding/payloads/auth_payload.h @@ -62,15 +62,20 @@ struct auth_payload_t { /** * Set the AUTH data. * +<<<<<<< HEAD * Data gets cloned. * * @param data AUTH data as chunk_t +======= + * @param data AUTH data as chunk_t, gets cloned +>>>>>>> upstream/4.5.1 */ void (*set_data) (auth_payload_t *this, chunk_t data); /** * Get the AUTH data. * +<<<<<<< HEAD * Returned data are a copy of the internal one. * * @return AUTH data as chunk_t @@ -85,6 +90,26 @@ struct auth_payload_t { * @return AUTH data as chunk_t */ chunk_t (*get_data) (auth_payload_t *this); +======= + * @return AUTH data as chunk_t, internal data + */ + chunk_t (*get_data) (auth_payload_t *this); + + /** + * Get the value of a reserved bit. + * + * @param nr number of the reserved bit, 0-6 + * @return TRUE if bit was set, FALSE to clear + */ + bool (*get_reserved_bit)(auth_payload_t *this, u_int nr); + + /** + * Set one of the reserved bits. + * + * @param nr number of the reserved bit, 0-6 + */ + void (*set_reserved_bit)(auth_payload_t *this, u_int nr); +>>>>>>> upstream/4.5.1 /** * Destroys an auth_payload_t object. |