denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated unknown payload to INIT/METHOD macros

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:43 +01:00
parent 7814c74970
commit 9431023ce6
1 changed files with 52 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/unknown_payload.c
+52 -78
View File
@@ -18,8 +18,6 @@
#include "unknown_payload.h" #include "unknown_payload.h"
typedef struct private_unknown_payload_t private_unknown_payload_t; typedef struct private_unknown_payload_t private_unknown_payload_t;
/** /**
@@ -62,21 +60,21 @@ struct private_unknown_payload_t {
*/ */
encoding_rule_t unknown_payload_encodings[] = { encoding_rule_t unknown_payload_encodings[] = {
/* 1 Byte next payload type, stored in the field next_payload */ /* 1 Byte next payload type, stored in the field next_payload */
{ U_INT_8, offsetof(private_unknown_payload_t, next_payload)}, { U_INT_8, offsetof(private_unknown_payload_t, next_payload) },
/* the critical bit */ /* the critical bit */
{ FLAG, offsetof(private_unknown_payload_t, critical) }, { FLAG, offsetof(private_unknown_payload_t, critical) },
/* 7 Bit reserved bits, nowhere stored */ /* 7 Bit reserved bits, nowhere stored */
{ RESERVED_BIT, 0 }, { RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 }, { RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 }, { RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 }, { RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 }, { RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 }, { RESERVED_BIT, 0 },
{ RESERVED_BIT, 0 }, { RESERVED_BIT, 0 },
/* Length of the whole payload*/ /* Length of the whole payload*/
{ PAYLOAD_LENGTH, offsetof(private_unknown_payload_t, payload_length)}, { PAYLOAD_LENGTH, offsetof(private_unknown_payload_t, payload_length) },
/* some unknown data bytes, length is defined in PAYLOAD_LENGTH */ /* some unknown data bytes, length is defined in PAYLOAD_LENGTH */
{ UNKNOWN_DATA, offsetof(private_unknown_payload_t, data) } { UNKNOWN_DATA, offsetof(private_unknown_payload_t, data) },
}; };
/* /*
@@ -91,82 +89,59 @@ encoding_rule_t unknown_payload_encodings[] = {
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/ */
/** METHOD(payload_t, verify, status_t,
* Implementation of payload_t.verify. private_unknown_payload_t *this)
*/
static status_t verify(private_unknown_payload_t *this)
{ {
/* can't do any checks, so we assume its good */
return SUCCESS; return SUCCESS;
} }
/** METHOD(payload_t, get_encoding_rules, void,
* Implementation of payload_t.get_encoding_rules. private_unknown_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
*/
static void get_encoding_rules(private_unknown_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
{ {
*rules = unknown_payload_encodings; *rules = unknown_payload_encodings;
*rule_count = sizeof(unknown_payload_encodings) / sizeof(encoding_rule_t); *rule_count = sizeof(unknown_payload_encodings) / sizeof(encoding_rule_t);
} }
/** METHOD(payload_t, get_payload_type, payload_type_t,
* Implementation of payload_t.get_type. private_unknown_payload_t *this)
*/
static payload_type_t get_payload_type(private_unknown_payload_t *this)
{ {
return UNKNOWN_PAYLOAD; return UNKNOWN_PAYLOAD;
} }
/** METHOD(payload_t, get_next_type, payload_type_t,
* Implementation of payload_t.get_next_type. private_unknown_payload_t *this)
*/
static payload_type_t get_next_type(private_unknown_payload_t *this)
{ {
return (this->next_payload); return this->next_payload;
} }
/** METHOD(payload_t, set_next_type, void,
* Implementation of payload_t.set_next_type. private_unknown_payload_t *this,payload_type_t type)
*/
static void set_next_type(private_unknown_payload_t *this,payload_type_t type)
{ {
this->next_payload = type; this->next_payload = type;
} }
/** METHOD(payload_t, get_length, size_t,
* Implementation of payload_t.get_length. private_unknown_payload_t *this)
*/
static size_t get_length(private_unknown_payload_t *this)
{ {
return this->payload_length; return this->payload_length;
} }
/** METHOD(unknown_payload_t, is_critical, bool,
* Implementation of unknown_payload_t.get_data. private_unknown_payload_t *this)
*/
static bool is_critical(private_unknown_payload_t *this)
{ {
return this->critical; return this->critical;
} }
/** METHOD(unknown_payload_t, get_data, chunk_t,
* Implementation of unknown_payload_t.get_data. private_unknown_payload_t *this)
*/
static chunk_t get_data (private_unknown_payload_t *this)
{ {
return (this->data); return this->data;
} }
/** METHOD2(payload_t, unknown_payload_t, destroy, void,
* Implementation of payload_t.destroy and unknown_payload_t.destroy. private_unknown_payload_t *this)
*/
static void destroy(private_unknown_payload_t *this)
{ {
if (this->data.ptr != NULL) free(this->data.ptr);
{
chunk_free(&(this->data));
}
free(this); free(this);
} }
@@ -175,27 +150,26 @@ static void destroy(private_unknown_payload_t *this)
*/ */
unknown_payload_t *unknown_payload_create() unknown_payload_t *unknown_payload_create()
{ {
private_unknown_payload_t *this = malloc_thing(private_unknown_payload_t); private_unknown_payload_t *this;
/* interface functions */ INIT(this,
this->public.payload_interface.verify = (status_t (*) (payload_t *))verify; .public = {
this->public.payload_interface.get_encoding_rules = (void (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules; .payload_interface = {
this->public.payload_interface.get_length = (size_t (*) (payload_t *)) get_length; .verify = _verify,
this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t *)) get_next_type; .get_encoding_rules = _get_encoding_rules,
this->public.payload_interface.set_next_type = (void (*) (payload_t *,payload_type_t)) set_next_type; .get_length = _get_length,
this->public.payload_interface.get_type = (payload_type_t (*) (payload_t *)) get_payload_type; .get_next_type = _get_next_type,
this->public.payload_interface.destroy = (void (*) (payload_t *))destroy; .set_next_type = _set_next_type,
.get_type = _get_payload_type,
.destroy = _destroy,
},
.is_critical = _is_critical,
.get_data = _get_data,
.destroy = _destroy,
},
.next_payload = NO_PAYLOAD,
.payload_length = UNKNOWN_PAYLOAD_HEADER_LENGTH,
);
/* public functions */ return &this->public;
this->public.destroy = (void (*) (unknown_payload_t *)) destroy;
this->public.is_critical = (bool (*) (unknown_payload_t *)) is_critical;
this->public.get_data = (chunk_t (*) (unknown_payload_t *)) get_data;
/* private variables */
this->critical = FALSE;
this->next_payload = NO_PAYLOAD;
this->payload_length = UNKNOWN_PAYLOAD_HEADER_LENGTH;
this->data = chunk_empty;
return (&(this->public));
} }