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

Migrated configuration_attribute to INIT/METHOD macros

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:50 +01:00
parent 1cc58e7ed2
commit bda62cedb9
1 changed files with 39 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/configuration_attribute.c
+39 -60
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
* *
@@ -22,14 +23,13 @@
#include <library.h> #include <library.h>
#include <daemon.h> #include <daemon.h>
typedef struct private_configuration_attribute_t private_configuration_attribute_t; typedef struct private_configuration_attribute_t private_configuration_attribute_t;
/** /**
* Private data of an configuration_attribute_t object. * Private data of an configuration_attribute_t object.
*
*/ */
struct private_configuration_attribute_t { struct private_configuration_attribute_t {
/** /**
* Public configuration_attribute_t interface. * Public configuration_attribute_t interface.
*/ */
@@ -80,10 +80,8 @@ encoding_rule_t configuration_attribute_encodings[] = {
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/ */
/** METHOD(payload_t, verify, status_t,
* Implementation of payload_t.verify. private_configuration_attribute_t *this)
*/
static status_t verify(private_configuration_attribute_t *this)
{ {
bool failed = FALSE; bool failed = FALSE;
@@ -151,69 +149,51 @@ static status_t verify(private_configuration_attribute_t *this)
return SUCCESS; return SUCCESS;
} }
/** METHOD(payload_t, get_encoding_rules, void,
* Implementation of payload_t.get_encoding_rules. private_configuration_attribute_t *this, encoding_rule_t **rules,
*/ size_t *rule_count)
static void get_encoding_rules(private_configuration_attribute_t *this,
encoding_rule_t **rules, size_t *rule_count)
{ {
*rules = configuration_attribute_encodings; *rules = configuration_attribute_encodings;
*rule_count = sizeof(configuration_attribute_encodings) / sizeof(encoding_rule_t); *rule_count = countof(configuration_attribute_encodings);
} }
/** METHOD(payload_t, get_type, payload_type_t,
* Implementation of payload_t.get_type. private_configuration_attribute_t *this)
*/
static payload_type_t get_type(private_configuration_attribute_t *this)
{ {
return CONFIGURATION_ATTRIBUTE; return CONFIGURATION_ATTRIBUTE;
} }
/** METHOD(payload_t, get_next_type, payload_type_t,
* Implementation of payload_t.get_next_type. private_configuration_attribute_t *this)
*/
static payload_type_t get_next_type(private_configuration_attribute_t *this)
{ {
return NO_PAYLOAD; return NO_PAYLOAD;
} }
/** METHOD(payload_t, set_next_type, void,
* Implementation of payload_t.set_next_type. private_configuration_attribute_t *this, payload_type_t type)
*/
static void set_next_type(private_configuration_attribute_t *this,
payload_type_t type)
{ {
} }
/** METHOD(payload_t, get_length, size_t,
* Implementation of configuration_attribute_t.get_length. private_configuration_attribute_t *this)
*/
static size_t get_length(private_configuration_attribute_t *this)
{ {
return this->value.len + CONFIGURATION_ATTRIBUTE_HEADER_LENGTH; return this->value.len + CONFIGURATION_ATTRIBUTE_HEADER_LENGTH;
} }
/** METHOD(configuration_attribute_t, get_cattr_type, configuration_attribute_type_t,
* Implementation of configuration_attribute_t.get_type. private_configuration_attribute_t *this)
*/
static configuration_attribute_type_t get_configuration_attribute_type(
private_configuration_attribute_t *this)
{ {
return this->type; return this->type;
} }
/** METHOD(configuration_attribute_t, get_value, chunk_t,
* Implementation of configuration_attribute_t.get_value. private_configuration_attribute_t *this)
*/
static chunk_t get_value(private_configuration_attribute_t *this)
{ {
return this->value; return this->value;
} }
/** METHOD2(payload_t, configuration_attribute_t, destroy, void,
* Implementation of configuration_attribute_t.destroy and payload_t.destroy. private_configuration_attribute_t *this)
*/
static void destroy(private_configuration_attribute_t *this)
{ {
free(this->value.ptr); free(this->value.ptr);
free(this); free(this);
@@ -226,23 +206,22 @@ configuration_attribute_t *configuration_attribute_create()
{ {
private_configuration_attribute_t *this; private_configuration_attribute_t *this;
this = malloc_thing(private_configuration_attribute_t); 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,
this->public.get_value = (chunk_t(*)(configuration_attribute_t *))get_value; .destroy = _destroy,
this->public.get_type = (configuration_attribute_type_t(*)(configuration_attribute_t *))get_configuration_attribute_type; },
this->public.destroy = (void (*)(configuration_attribute_t*))destroy; .get_value = _get_value,
.get_type = _get_cattr_type,
this->type = 0; .destroy = _destroy,
this->value = chunk_empty; },
this->length = 0; );
return &this->public; return &this->public;
} }