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

Migrated ike_sa_id_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-03 18:01:05 +02:00
parent e6c824959c
commit 6401b18f12
1 changed files with 42 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa_id.c
+42 -59
View File
@@ -46,42 +46,32 @@ struct private_ike_sa_id_t {
bool is_initiator_flag; bool is_initiator_flag;
}; };
/** METHOD(ike_sa_id_t, set_responder_spi, void,
* Implementation of ike_sa_id_t.set_responder_spi. private_ike_sa_id_t *this, u_int64_t responder_spi)
*/
static void set_responder_spi (private_ike_sa_id_t *this, u_int64_t responder_spi)
{ {
this->responder_spi = responder_spi; this->responder_spi = responder_spi;
} }
/** METHOD(ike_sa_id_t, set_initiator_spi, void,
* Implementation of ike_sa_id_t.set_initiator_spi. private_ike_sa_id_t *this, u_int64_t initiator_spi)
*/
static void set_initiator_spi(private_ike_sa_id_t *this, u_int64_t initiator_spi)
{ {
this->initiator_spi = initiator_spi; this->initiator_spi = initiator_spi;
} }
/** METHOD(ike_sa_id_t, get_initiator_spi, u_int64_t,
* Implementation of ike_sa_id_t.get_initiator_spi. private_ike_sa_id_t *this)
*/
static u_int64_t get_initiator_spi (private_ike_sa_id_t *this)
{ {
return this->initiator_spi; return this->initiator_spi;
} }
/** METHOD(ike_sa_id_t, get_responder_spi, u_int64_t,
* Implementation of ike_sa_id_t.get_responder_spi. private_ike_sa_id_t *this)
*/
static u_int64_t get_responder_spi (private_ike_sa_id_t *this)
{ {
return this->responder_spi; return this->responder_spi;
} }
/** METHOD(ike_sa_id_t, equals, bool,
* Implementation of ike_sa_id_t.equals. private_ike_sa_id_t *this, private_ike_sa_id_t *other)
*/
static bool equals (private_ike_sa_id_t *this, private_ike_sa_id_t *other)
{ {
if (other == NULL) if (other == NULL)
{ {
@@ -101,28 +91,22 @@ static bool equals (private_ike_sa_id_t *this, private_ike_sa_id_t *other)
} }
} }
/** METHOD(ike_sa_id_t, replace_values, void,
* Implementation of ike_sa_id_t.replace_values. private_ike_sa_id_t *this, private_ike_sa_id_t *other)
*/
static void replace_values(private_ike_sa_id_t *this, private_ike_sa_id_t *other)
{ {
this->initiator_spi = other->initiator_spi; this->initiator_spi = other->initiator_spi;
this->responder_spi = other->responder_spi; this->responder_spi = other->responder_spi;
this->is_initiator_flag = other->is_initiator_flag; this->is_initiator_flag = other->is_initiator_flag;
} }
/** METHOD(ike_sa_id_t, is_initiator, bool,
* Implementation of ike_sa_id_t.is_initiator. private_ike_sa_id_t *this)
*/
static bool is_initiator(private_ike_sa_id_t *this)
{ {
return this->is_initiator_flag; return this->is_initiator_flag;
} }
/** METHOD(ike_sa_id_t, switch_initiator, bool,
* Implementation of ike_sa_id_t.switch_initiator. private_ike_sa_id_t *this)
*/
static bool switch_initiator(private_ike_sa_id_t *this)
{ {
if (this->is_initiator_flag) if (this->is_initiator_flag)
{ {
@@ -135,18 +119,15 @@ static bool switch_initiator(private_ike_sa_id_t *this)
return this->is_initiator_flag; return this->is_initiator_flag;
} }
/** METHOD(ike_sa_id_t, clone_, ike_sa_id_t*,
* Implementation of ike_sa_id_t.clone. private_ike_sa_id_t *this)
*/
static ike_sa_id_t* clone_(private_ike_sa_id_t *this)
{ {
return ike_sa_id_create(this->initiator_spi, this->responder_spi, this->is_initiator_flag); return ike_sa_id_create(this->initiator_spi, this->responder_spi,
this->is_initiator_flag);
} }
/** METHOD(ike_sa_id_t, destroy, void,
* Implementation of ike_sa_id_t.destroy. private_ike_sa_id_t *this)
*/
static void destroy(private_ike_sa_id_t *this)
{ {
free(this); free(this);
} }
@@ -154,26 +135,28 @@ static void destroy(private_ike_sa_id_t *this)
/* /*
* Described in header. * Described in header.
*/ */
ike_sa_id_t * ike_sa_id_create(u_int64_t initiator_spi, u_int64_t responder_spi, bool is_initiator_flag) ike_sa_id_t * ike_sa_id_create(u_int64_t initiator_spi, u_int64_t responder_spi,
bool is_initiator_flag)
{ {
private_ike_sa_id_t *this = malloc_thing(private_ike_sa_id_t); private_ike_sa_id_t *this;
/* public functions */ INIT(this,
this->public.set_responder_spi = (void(*)(ike_sa_id_t*,u_int64_t)) set_responder_spi; .public = {
this->public.set_initiator_spi = (void(*)(ike_sa_id_t*,u_int64_t)) set_initiator_spi; .set_responder_spi = _set_responder_spi,
this->public.get_responder_spi = (u_int64_t(*)(ike_sa_id_t*)) get_responder_spi; .set_initiator_spi = _set_initiator_spi,
this->public.get_initiator_spi = (u_int64_t(*)(ike_sa_id_t*)) get_initiator_spi; .get_responder_spi = _get_responder_spi,
this->public.equals = (bool(*)(ike_sa_id_t*,ike_sa_id_t*)) equals; .get_initiator_spi = _get_initiator_spi,
this->public.replace_values = (void(*)(ike_sa_id_t*,ike_sa_id_t*)) replace_values; .equals = (void*)_equals,
this->public.is_initiator = (bool(*)(ike_sa_id_t*)) is_initiator; .replace_values = (void*)_replace_values,
this->public.switch_initiator = (bool(*)(ike_sa_id_t*)) switch_initiator; .is_initiator = _is_initiator,
this->public.clone = (ike_sa_id_t*(*)(ike_sa_id_t*)) clone_; .switch_initiator = _switch_initiator,
this->public.destroy = (void(*)(ike_sa_id_t*))destroy; .clone = _clone_,
.destroy = _destroy,
/* private data */ },
this->initiator_spi = initiator_spi; .initiator_spi = initiator_spi,
this->responder_spi = responder_spi; .responder_spi = responder_spi,
this->is_initiator_flag = is_initiator_flag; .is_initiator_flag = is_initiator_flag,
);
return &this->public; return &this->public;
} }