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

Migrated auth_payload to INIT/METHOD macros

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:50 +01:00
parent 64293410b7
commit 9c0ccf5e26
2 changed files with 68 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/payloads/auth_payload.c
+66 -121
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
* *
@@ -18,7 +19,6 @@
#include <encoding/payloads/encodings.h> #include <encoding/payloads/encodings.h>
typedef struct private_auth_payload_t private_auth_payload_t; typedef struct private_auth_payload_t private_auth_payload_t;
/** /**
@@ -66,27 +66,27 @@ struct private_auth_payload_t {
*/ */
encoding_rule_t auth_payload_encodings[] = { encoding_rule_t auth_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_auth_payload_t, next_payload) }, { U_INT_8, offsetof(private_auth_payload_t, next_payload) },
/* the critical bit */ /* the critical bit */
{ FLAG, offsetof(private_auth_payload_t, critical) }, { FLAG, offsetof(private_auth_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_auth_payload_t, payload_length)}, { PAYLOAD_LENGTH, offsetof(private_auth_payload_t, payload_length)},
/* 1 Byte AUTH type*/ /* 1 Byte AUTH type*/
{ U_INT_8, offsetof(private_auth_payload_t, auth_method) }, { U_INT_8, offsetof(private_auth_payload_t, auth_method) },
/* 3 reserved bytes */ /* 3 reserved bytes */
{ RESERVED_BYTE, 0 }, { RESERVED_BYTE, 0 },
{ RESERVED_BYTE, 0 }, { RESERVED_BYTE, 0 },
{ RESERVED_BYTE, 0 }, { RESERVED_BYTE, 0 },
/* some auth data bytes, length is defined in PAYLOAD_LENGTH */ /* some auth data bytes, length is defined in PAYLOAD_LENGTH */
{ AUTH_DATA, offsetof(private_auth_payload_t, auth_data) } { AUTH_DATA, offsetof(private_auth_payload_t, auth_data) }
}; };
/* /*
@@ -103,125 +103,73 @@ encoding_rule_t auth_payload_encodings[] = {
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/ */
/** METHOD(payload_t, verify, status_t,
* Implementation of payload_t.verify. private_auth_payload_t *this)
*/
static status_t verify(private_auth_payload_t *this)
{ {
if (this->auth_method == 0 ||
(this->auth_method >= 4 && this->auth_method <= 8) ||
(this->auth_method >= 12 && this->auth_method <= 200))
{
/* reserved IDs */
return FAILED;
}
return SUCCESS; return SUCCESS;
} }
/** METHOD(payload_t, get_encoding_rules, void,
* Implementation of auth_payload_t.get_encoding_rules. private_auth_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
*/
static void get_encoding_rules(private_auth_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
{ {
*rules = auth_payload_encodings; *rules = auth_payload_encodings;
*rule_count = sizeof(auth_payload_encodings) / sizeof(encoding_rule_t); *rule_count = countof(auth_payload_encodings);
} }
/** METHOD(payload_t, get_type, payload_type_t,
* Implementation of payload_t.get_type. private_auth_payload_t *this)
*/
static payload_type_t get_payload_type(private_auth_payload_t *this)
{ {
return AUTHENTICATION; return AUTHENTICATION;
} }
/** METHOD(payload_t, get_next_type, payload_type_t,
* Implementation of payload_t.get_next_type. private_auth_payload_t *this)
*/
static payload_type_t get_next_type(private_auth_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_auth_payload_t *this, payload_type_t type)
*/
static void set_next_type(private_auth_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_auth_payload_t *this)
*/
static size_t get_length(private_auth_payload_t *this)
{ {
return this->payload_length; return this->payload_length;
} }
/** METHOD(auth_payload_t, set_auth_method, void,
* Implementation of auth_payload_t.set_auth_method. private_auth_payload_t *this, auth_method_t method)
*/
static void set_auth_method (private_auth_payload_t *this, auth_method_t method)
{ {
this->auth_method = method; this->auth_method = method;
} }
/** METHOD(auth_payload_t, get_auth_method, auth_method_t,
* Implementation of auth_payload_t.get_auth_method. private_auth_payload_t *this)
*/
static auth_method_t get_auth_method (private_auth_payload_t *this)
{ {
return (this->auth_method); return this->auth_method;
} }
/** METHOD(auth_payload_t, set_data, void,
* Implementation of auth_payload_t.set_data. private_auth_payload_t *this, chunk_t data)
*/
static void set_data (private_auth_payload_t *this, chunk_t data)
{ {
if (this->auth_data.ptr != NULL) free(this->auth_data.ptr);
{ this->auth_data = chunk_clone(data);
chunk_free(&(this->auth_data));
}
this->auth_data.ptr = clalloc(data.ptr,data.len);
this->auth_data.len = data.len;
this->payload_length = AUTH_PAYLOAD_HEADER_LENGTH + this->auth_data.len; this->payload_length = AUTH_PAYLOAD_HEADER_LENGTH + this->auth_data.len;
} }
/** METHOD(auth_payload_t, get_data, chunk_t,
* Implementation of auth_payload_t.get_data. private_auth_payload_t *this)
*/
static chunk_t get_data (private_auth_payload_t *this)
{ {
return (this->auth_data); return this->auth_data;
} }
/** METHOD2(payload_t, auth_payload_t, destroy, void,
* Implementation of auth_payload_t.get_data_clone. private_auth_payload_t *this)
*/
static chunk_t get_data_clone (private_auth_payload_t *this)
{ {
chunk_t cloned_data; free(this->auth_data.ptr);
if (this->auth_data.ptr == NULL)
{
return (this->auth_data);
}
cloned_data.ptr = clalloc(this->auth_data.ptr,this->auth_data.len);
cloned_data.len = this->auth_data.len;
return cloned_data;
}
/**
* Implementation of payload_t.destroy and auth_payload_t.destroy.
*/
static void destroy(private_auth_payload_t *this)
{
if (this->auth_data.ptr != NULL)
{
chunk_free(&(this->auth_data));
}
free(this); free(this);
} }
@@ -230,30 +178,27 @@ static void destroy(private_auth_payload_t *this)
*/ */
auth_payload_t *auth_payload_create() auth_payload_t *auth_payload_create()
{ {
private_auth_payload_t *this = malloc_thing(private_auth_payload_t); private_auth_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_type,
/* public functions */ .destroy = _destroy,
this->public.destroy = (void (*) (auth_payload_t *)) destroy; },
this->public.set_auth_method = (void (*) (auth_payload_t *,auth_method_t)) set_auth_method; .set_auth_method = _set_auth_method,
this->public.get_auth_method = (auth_method_t (*) (auth_payload_t *)) get_auth_method; .get_auth_method = _get_auth_method,
this->public.set_data = (void (*) (auth_payload_t *,chunk_t)) set_data; .set_data = _set_data,
this->public.get_data_clone = (chunk_t (*) (auth_payload_t *)) get_data_clone; .get_data = _get_data,
this->public.get_data = (chunk_t (*) (auth_payload_t *)) get_data; .destroy = _destroy,
},
/* private variables */ .next_payload = NO_PAYLOAD,
this->critical = FALSE; .payload_length = AUTH_PAYLOAD_HEADER_LENGTH,
this->next_payload = NO_PAYLOAD; );
this->payload_length =AUTH_PAYLOAD_HEADER_LENGTH; return &this->public;
this->auth_data = chunk_empty;
return (&(this->public));
} }
src/libcharon/encoding/payloads/auth_payload.h
+2 -15
View File
@@ -62,27 +62,14 @@ struct auth_payload_t {
/** /**
* Set the AUTH data. * Set the AUTH data.
* *
* Data gets cloned. * @param data AUTH data as chunk_t, gets cloned
*
* @param data AUTH data as chunk_t
*/ */
void (*set_data) (auth_payload_t *this, chunk_t data); void (*set_data) (auth_payload_t *this, chunk_t data);
/** /**
* Get the AUTH data. * Get the AUTH data.
* *
* Returned data are a copy of the internal one. * @return AUTH data as chunk_t, internal data
*
* @return AUTH data as chunk_t
*/
chunk_t (*get_data_clone) (auth_payload_t *this);
/**
* Get the AUTH data.
*
* Returned data are NOT copied
*
* @return AUTH data as chunk_t
*/ */
chunk_t (*get_data) (auth_payload_t *this); chunk_t (*get_data) (auth_payload_t *this);