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

Migrated vendor_id_payload to INIT/METHOD macros

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:51 +01:00
parent 102adb9bfd
commit 1b671248c2
2 changed files with 59 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/vendor_id_payload.c
+54 -72
View File
@@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2005-2009 Martin Willi * Copyright (C) 2005-2010 Martin Willi
* Copyright (C) 2010 revosec AG
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
* *
@@ -59,21 +60,21 @@ struct private_vendor_id_payload_t {
*/ */
encoding_rule_t vendor_id_payload_encodings[] = { encoding_rule_t vendor_id_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_vendor_id_payload_t, next_payload) }, { U_INT_8, offsetof(private_vendor_id_payload_t, next_payload) },
/* the critical bit */ /* the critical bit */
{ FLAG, offsetof(private_vendor_id_payload_t, critical) }, { FLAG, offsetof(private_vendor_id_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_vendor_id_payload_t, payload_length)}, { PAYLOAD_LENGTH, offsetof(private_vendor_id_payload_t, payload_length)},
/* some vendor_id data bytes, length is defined in PAYLOAD_LENGTH */ /* some vendor_id data bytes, length is defined in PAYLOAD_LENGTH */
{ VID_DATA, offsetof(private_vendor_id_payload_t, data) } { VID_DATA, offsetof(private_vendor_id_payload_t, data) }
}; };
/* /*
@@ -88,97 +89,57 @@ encoding_rule_t vendor_id_payload_encodings[] = {
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/ */
/** METHOD(payload_t, verify, status_t,
* Implementation of payload_t.verify. private_vendor_id_payload_t *this)
*/
static status_t verify(private_vendor_id_payload_t *this)
{ {
return SUCCESS; return SUCCESS;
} }
/** METHOD(payload_t, get_encoding_rules, void,
* Implementation of vendor_id_payload_t.get_encoding_rules. private_vendor_id_payload_t *this, encoding_rule_t **rules,
*/ size_t *rule_count)
static void get_encoding_rules(private_vendor_id_payload_t *this,
encoding_rule_t **rules, size_t *rule_count)
{ {
*rules = vendor_id_payload_encodings; *rules = vendor_id_payload_encodings;
*rule_count = sizeof(vendor_id_payload_encodings) / sizeof(encoding_rule_t); *rule_count = countof(vendor_id_payload_encodings);
} }
/** METHOD(payload_t, get_type, payload_type_t,
* Implementation of payload_t.get_type. private_vendor_id_payload_t *this)
*/
static payload_type_t get_payload_type(private_vendor_id_payload_t *this)
{ {
return VENDOR_ID; return VENDOR_ID;
} }
/** METHOD(payload_t, get_next_type, payload_type_t,
* Implementation of payload_t.get_next_type. private_vendor_id_payload_t *this)
*/
static payload_type_t get_next_type(private_vendor_id_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_vendor_id_payload_t *this, payload_type_t type)
*/
static void set_next_type(private_vendor_id_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_vendor_id_payload_t *this)
*/
static size_t get_length(private_vendor_id_payload_t *this)
{ {
return this->payload_length; return this->payload_length;
} }
/** METHOD(vendor_id_payload_t, get_data, chunk_t,
* Implementation of vendor_id_payload_t.get_data. private_vendor_id_payload_t *this)
*/
static chunk_t get_data(private_vendor_id_payload_t *this)
{ {
return this->data; return this->data;
} }
/** METHOD2(payload_t, vendor_id_payload_t, destroy, void,
* Implementation of payload_t.destroy and vendor_id_payload_t.destroy. private_vendor_id_payload_t *this)
*/
static void destroy(private_vendor_id_payload_t *this)
{ {
free(this->data.ptr); free(this->data.ptr);
free(this); free(this);
} }
/*
* Described in header
*/
vendor_id_payload_t *vendor_id_payload_create()
{
private_vendor_id_payload_t *this = malloc_thing(private_vendor_id_payload_t);
this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;
this->public.payload_interface.get_encoding_rules = (void (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules;
this->public.payload_interface.get_length = (size_t (*) (payload_t *)) get_length;
this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t *)) get_next_type;
this->public.payload_interface.set_next_type = (void (*) (payload_t *,payload_type_t)) set_next_type;
this->public.payload_interface.get_type = (payload_type_t (*) (payload_t *)) get_payload_type;
this->public.payload_interface.destroy = (void (*) (payload_t *))destroy;
this->public.get_data = (chunk_t (*) (vendor_id_payload_t *)) get_data;
this->critical = FALSE;
this->next_payload = NO_PAYLOAD;
this->payload_length = VENDOR_ID_PAYLOAD_HEADER_LENGTH;
this->data = chunk_empty;
return &this->public;
}
/* /*
* Described in header * Described in header
*/ */
@@ -186,10 +147,31 @@ vendor_id_payload_t *vendor_id_payload_create_data(chunk_t data)
{ {
private_vendor_id_payload_t *this; private_vendor_id_payload_t *this;
this = (private_vendor_id_payload_t*)vendor_id_payload_create(); INIT(this,
this->payload_length += data.len; .public = {
this->data = data; .payload_interface = {
.verify = _verify,
.get_encoding_rules = _get_encoding_rules,
.get_length = _get_length,
.get_next_type = _get_next_type,
.set_next_type = _set_next_type,
.get_type = _get_type,
.destroy = _destroy,
},
.get_data = _get_data,
.destroy = _destroy,
},
.next_payload = NO_PAYLOAD,
.payload_length = VENDOR_ID_PAYLOAD_HEADER_LENGTH + data.len,
.data = data,
);
return &this->public; return &this->public;
} }
/*
* Described in header
*/
vendor_id_payload_t *vendor_id_payload_create()
{
return vendor_id_payload_create_data(chunk_empty);
}
src/libcharon/encoding/payloads/vendor_id_payload.h
+5
View File
@@ -50,6 +50,11 @@ struct vendor_id_payload_t {
* @return VID data, pointing to an internal chunk_t * @return VID data, pointing to an internal chunk_t
*/ */
chunk_t (*get_data)(vendor_id_payload_t *this); chunk_t (*get_data)(vendor_id_payload_t *this);
/**
* Destroy Vendor ID payload.
*/
void (*destroy)(vendor_id_payload_t *this);
}; };
/** /**