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

Migrated packet_t to METHOD/INIT macros

Browse Source
This commit is contained in:
Martin Willi
2010-02-26 11:44:32 +01:00
parent dab0560497
commit 147dd96376
1 changed files with 39 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/network/packet.c
+39 -60
View File
@@ -44,95 +44,73 @@ struct private_packet_t {
chunk_t data; chunk_t data;
}; };
/** METHOD(packet_t, set_source, void,
* Implements packet_t.get_source private_packet_t *this, host_t *source)
*/
static void set_source(private_packet_t *this, host_t *source)
{ {
DESTROY_IF(this->source); DESTROY_IF(this->source);
this->source = source; this->source = source;
} }
/** METHOD(packet_t, set_destination, void,
* Implements packet_t.set_destination private_packet_t *this, host_t *destination)
*/
static void set_destination(private_packet_t *this, host_t *destination)
{ {
DESTROY_IF(this->destination); DESTROY_IF(this->destination);
this->destination = destination; this->destination = destination;
} }
/** METHOD(packet_t, get_source, host_t*,
* Implements packet_t.get_source private_packet_t *this)
*/
static host_t *get_source(private_packet_t *this)
{ {
return this->source; return this->source;
} }
/** METHOD(packet_t, get_destination, host_t*,
* Implements packet_t.get_destination private_packet_t *this)
*/
static host_t *get_destination(private_packet_t *this)
{ {
return this->destination; return this->destination;
} }
/** METHOD(packet_t, get_data, chunk_t,
* Implements packet_t.get_data private_packet_t *this)
*/
static chunk_t get_data(private_packet_t *this)
{ {
return this->data; return this->data;
} }
/** METHOD(packet_t, set_data, void,
* Implements packet_t.set_data private_packet_t *this, chunk_t data)
*/
static void set_data(private_packet_t *this, chunk_t data)
{ {
free(this->data.ptr); free(this->data.ptr);
this->data = data; this->data = data;
} }
/** METHOD(packet_t, destroy, void,
* Implements packet_t.destroy. private_packet_t *this)
*/
static void destroy(private_packet_t *this)
{ {
if (this->source != NULL) DESTROY_IF(this->source);
{ DESTROY_IF(this->destination);
this->source->destroy(this->source);
}
if (this->destination != NULL)
{
this->destination->destroy(this->destination);
}
free(this->data.ptr); free(this->data.ptr);
free(this); free(this);
} }
/** METHOD(packet_t, clone_, packet_t*,
* Implements packet_t.clone. private_packet_t *this)
*/
static packet_t *clone_(private_packet_t *this)
{ {
private_packet_t *other = (private_packet_t*)packet_create(); packet_t *other;
other = packet_create();
if (this->destination != NULL) if (this->destination != NULL)
{ {
other->destination = this->destination->clone(this->destination); other->set_destination(other, this->destination->clone(this->destination));
} }
if (this->source != NULL) if (this->source != NULL)
{ {
other->source = this->source->clone(this->source); other->set_source(other, this->source->clone(this->source));
} }
if (this->data.ptr != NULL) if (this->data.ptr != NULL)
{ {
other->data.ptr = clalloc(this->data.ptr,this->data.len); other->set_data(other, chunk_clone(this->data));
other->data.len = this->data.len;
} }
return &(other->public); return other;
} }
/* /*
@@ -140,20 +118,21 @@ static packet_t *clone_(private_packet_t *this)
*/ */
packet_t *packet_create(void) packet_t *packet_create(void)
{ {
private_packet_t *this = malloc_thing(private_packet_t); private_packet_t *this;
this->public.set_data = (void(*) (packet_t *,chunk_t)) set_data; INIT(this,
this->public.get_data = (chunk_t(*) (packet_t *)) get_data; .public = {
this->public.set_source = (void(*) (packet_t *,host_t*)) set_source; .set_data = _set_data,
this->public.get_source = (host_t*(*) (packet_t *)) get_source; .get_data = _get_data,
this->public.set_destination = (void(*) (packet_t *,host_t*)) set_destination; .set_source = _set_source,
this->public.get_destination = (host_t*(*) (packet_t *)) get_destination; .get_source = _get_source,
this->public.clone = (packet_t*(*) (packet_t *))clone_; .set_destination = _set_destination,
this->public.destroy = (void(*) (packet_t *)) destroy; .get_destination = _get_destination,
.clone = _clone_,
.destroy = _destroy,
},
);
this->destination = NULL; return &this->public;
this->source = NULL;
this->data = chunk_empty;
return &(this->public);
} }