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

Migrated nonce_payload to INIT/METHOD macros

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:50 +01:00
parent 19ee0762e7
commit e3c4c6a5ac
1 changed files with 63 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/nonce_payload.c
+63 -92
View File
@@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2005-2006 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
* *
@@ -14,21 +15,19 @@
* for more details. * for more details.
*/ */
/* offsetof macro */
#include <stddef.h> #include <stddef.h>
#include "nonce_payload.h" #include "nonce_payload.h"
#include <encoding/payloads/encodings.h> #include <encoding/payloads/encodings.h>
typedef struct private_nonce_payload_t private_nonce_payload_t; typedef struct private_nonce_payload_t private_nonce_payload_t;
/** /**
* Private data of an nonce_payload_t object. * Private data of an nonce_payload_t object.
*
*/ */
struct private_nonce_payload_t { struct private_nonce_payload_t {
/** /**
* Public nonce_payload_t interface. * Public nonce_payload_t interface.
*/ */
@@ -60,25 +59,24 @@ struct private_nonce_payload_t {
* *
* The defined offsets are the positions in a object of type * The defined offsets are the positions in a object of type
* private_nonce_payload_t. * private_nonce_payload_t.
*
*/ */
encoding_rule_t nonce_payload_encodings[] = { encoding_rule_t nonce_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_nonce_payload_t, next_payload) }, { U_INT_8, offsetof(private_nonce_payload_t, next_payload) },
/* the critical bit */ /* the critical bit */
{ FLAG, offsetof(private_nonce_payload_t, critical) }, { FLAG, offsetof(private_nonce_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 nonce payload*/ /* Length of the whole nonce payload*/
{ PAYLOAD_LENGTH, offsetof(private_nonce_payload_t, payload_length) }, { PAYLOAD_LENGTH, offsetof(private_nonce_payload_t, payload_length) },
/* some nonce bytes, lenth is defined in PAYLOAD_LENGTH */ /* some nonce bytes, lenth is defined in PAYLOAD_LENGTH */
{ NONCE_DATA, offsetof(private_nonce_payload_t, nonce) }, { NONCE_DATA, offsetof(private_nonce_payload_t, nonce) },
}; };
/* 1 2 3 /* 1 2 3
@@ -92,10 +90,8 @@ encoding_rule_t nonce_payload_encodings[] = {
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/ */
/** METHOD(payload_t, verify, status_t,
* Implementation of payload_t.verify. private_nonce_payload_t *this)
*/
static status_t verify(private_nonce_payload_t *this)
{ {
if (this->nonce.len < 16 || this->nonce.len > 256) if (this->nonce.len < 16 || this->nonce.len > 256)
{ {
@@ -104,74 +100,54 @@ static status_t verify(private_nonce_payload_t *this)
return SUCCESS; return SUCCESS;
} }
/** METHOD(payload_t, get_encoding_rules, void,
* Implementation of nonce_payload_t.set_nonce. private_nonce_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
*/
static status_t set_nonce(private_nonce_payload_t *this, chunk_t nonce)
{
this->nonce = chunk_clone(nonce);
this->payload_length = NONCE_PAYLOAD_HEADER_LENGTH + nonce.len;
return SUCCESS;
}
/**
* Implementation of nonce_payload_t.get_nonce.
*/
static chunk_t get_nonce(private_nonce_payload_t *this)
{
return chunk_clone(this->nonce);
}
/**
* Implementation of nonce_payload_t.get_encoding_rules.
*/
static void get_encoding_rules(private_nonce_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
{ {
*rules = nonce_payload_encodings; *rules = nonce_payload_encodings;
*rule_count = sizeof(nonce_payload_encodings) / sizeof(encoding_rule_t); *rule_count = countof(nonce_payload_encodings);
} }
/** METHOD(payload_t, get_type, payload_type_t,
* Implementation of payload_t.get_type. private_nonce_payload_t *this)
*/
static payload_type_t get_type(private_nonce_payload_t *this)
{ {
return NONCE; return NONCE;
} }
/** METHOD(payload_t, get_next_type, payload_type_t,
* Implementation of payload_t.get_next_type. private_nonce_payload_t *this)
*/
static payload_type_t get_next_type(private_nonce_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_nonce_payload_t *this, payload_type_t type)
*/
static void set_next_type(private_nonce_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_nonce_payload_t *this)
*/
static size_t get_length(private_nonce_payload_t *this)
{ {
return this->payload_length; return this->payload_length;
} }
/** METHOD(nonce_payload_t, set_nonce, void,
* Implementation of payload_t.destroy and nonce_payload_t.destroy. private_nonce_payload_t *this, chunk_t nonce)
*/
static void destroy(private_nonce_payload_t *this)
{ {
if (this->nonce.ptr != NULL) this->nonce = chunk_clone(nonce);
{ this->payload_length = NONCE_PAYLOAD_HEADER_LENGTH + nonce.len;
free(this->nonce.ptr); }
}
METHOD(nonce_payload_t, get_nonce, chunk_t,
private_nonce_payload_t *this)
{
return chunk_clone(this->nonce);
}
METHOD2(payload_t, nonce_payload_t, destroy, void,
private_nonce_payload_t *this)
{
free(this->nonce.ptr);
free(this); free(this);
} }
@@ -180,30 +156,25 @@ static void destroy(private_nonce_payload_t *this)
*/ */
nonce_payload_t *nonce_payload_create() nonce_payload_t *nonce_payload_create()
{ {
private_nonce_payload_t *this = malloc_thing(private_nonce_payload_t); private_nonce_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_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_type,
/* public functions */ .destroy = _destroy,
this->public.destroy = (void (*) (nonce_payload_t *)) destroy; },
this->public.set_nonce = (void (*) (nonce_payload_t *,chunk_t)) set_nonce; .set_nonce = _set_nonce,
this->public.get_nonce = (chunk_t (*) (nonce_payload_t *)) get_nonce; .get_nonce = _get_nonce,
.destroy = _destroy,
/* private variables */ },
this->critical = FALSE; .next_payload = NO_PAYLOAD,
this->next_payload = NO_PAYLOAD; .payload_length = NONCE_PAYLOAD_HEADER_LENGTH,
this->payload_length = NONCE_PAYLOAD_HEADER_LENGTH; );
this->nonce.ptr = NULL; return &this->public;
this->nonce.len = 0;
return (&(this->public));
} }