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

Migrated child_delete to INIT/METHOD macros

Browse Source
This commit is contained in:
Andreas Steffen
2011-10-04 08:05:27 +02:00
parent 0fc9dd1194
commit 4fb6b7a12c
1 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/tasks/child_delete.c
+35 -48
View File
@@ -261,10 +261,8 @@ static void log_children(private_child_delete_t *this)
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
} }
/** METHOD(task_t, build_i, status_t,
* Implementation of task_t.build for initiator private_child_delete_t *this, message_t *message)
*/
static status_t build_i(private_child_delete_t *this, message_t *message)
{ {
child_sa_t *child_sa; child_sa_t *child_sa;
@@ -291,10 +289,8 @@ static status_t build_i(private_child_delete_t *this, message_t *message)
return NEED_MORE; return NEED_MORE;
} }
/** METHOD(task_t, process_i, status_t,
* Implementation of task_t.process for initiator private_child_delete_t *this, message_t *message)
*/
static status_t process_i(private_child_delete_t *this, message_t *message)
{ {
/* flush the list before adding new SAs */ /* flush the list before adding new SAs */
this->child_sas->destroy(this->child_sas); this->child_sas->destroy(this->child_sas);
@@ -305,20 +301,16 @@ static status_t process_i(private_child_delete_t *this, message_t *message)
return destroy_and_reestablish(this); return destroy_and_reestablish(this);
} }
/** METHOD(task_t, process_r, status_t,
* Implementation of task_t.process for initiator private_child_delete_t *this, message_t *message)
*/
static status_t process_r(private_child_delete_t *this, message_t *message)
{ {
process_payloads(this, message); process_payloads(this, message);
log_children(this); log_children(this);
return NEED_MORE; return NEED_MORE;
} }
/** METHOD(task_t, build_r, status_t,
* Implementation of task_t.build for responder private_child_delete_t *this, message_t *message)
*/
static status_t build_r(private_child_delete_t *this, message_t *message)
{ {
/* if we are rekeying, we send an empty informational */ /* if we are rekeying, we send an empty informational */
if (this->ike_sa->get_state(this->ike_sa) != IKE_REKEYING) if (this->ike_sa->get_state(this->ike_sa) != IKE_REKEYING)
@@ -329,28 +321,22 @@ static status_t build_r(private_child_delete_t *this, message_t *message)
return destroy_and_reestablish(this); return destroy_and_reestablish(this);
} }
/** METHOD(task_t, get_type, task_type_t,
* Implementation of task_t.get_type private_child_delete_t *this)
*/
static task_type_t get_type(private_child_delete_t *this)
{ {
return CHILD_DELETE; return CHILD_DELETE;
} }
/** METHOD(child_delete_t , get_child, child_sa_t*,
* Implementation of child_delete_t.get_child private_child_delete_t *this)
*/
static child_sa_t* get_child(private_child_delete_t *this)
{ {
child_sa_t *child_sa = NULL; child_sa_t *child_sa = NULL;
this->child_sas->get_first(this->child_sas, (void**)&child_sa); this->child_sas->get_first(this->child_sas, (void**)&child_sa);
return child_sa; return child_sa;
} }
/** METHOD(task_t, migrate, void,
* Implementation of task_t.migrate private_child_delete_t *this, ike_sa_t *ike_sa)
*/
static void migrate(private_child_delete_t *this, ike_sa_t *ike_sa)
{ {
this->check_delete_action = FALSE; this->check_delete_action = FALSE;
this->ike_sa = ike_sa; this->ike_sa = ike_sa;
@@ -359,10 +345,8 @@ static void migrate(private_child_delete_t *this, ike_sa_t *ike_sa)
this->child_sas = linked_list_create(); this->child_sas = linked_list_create();
} }
/** METHOD(task_t, destroy, void,
* Implementation of task_t.destroy private_child_delete_t *this)
*/
static void destroy(private_child_delete_t *this)
{ {
this->child_sas->destroy(this->child_sas); this->child_sas->destroy(this->child_sas);
free(this); free(this);
@@ -374,30 +358,33 @@ static void destroy(private_child_delete_t *this)
child_delete_t *child_delete_create(ike_sa_t *ike_sa, protocol_id_t protocol, child_delete_t *child_delete_create(ike_sa_t *ike_sa, protocol_id_t protocol,
u_int32_t spi) u_int32_t spi)
{ {
private_child_delete_t *this = malloc_thing(private_child_delete_t); private_child_delete_t *this;
this->public.get_child = (child_sa_t*(*)(child_delete_t*))get_child; INIT(this,
this->public.task.get_type = (task_type_t(*)(task_t*))get_type; .public = {
this->public.task.migrate = (void(*)(task_t*,ike_sa_t*))migrate; .task = {
this->public.task.destroy = (void(*)(task_t*))destroy; .get_type = _get_type,
.migrate = _migrate,
this->ike_sa = ike_sa; .destroy = _destroy,
this->check_delete_action = FALSE; },
this->child_sas = linked_list_create(); .get_child = _get_child,
this->protocol = protocol; },
this->spi = spi; .ike_sa = ike_sa,
this->rekeyed = FALSE; .child_sas = linked_list_create(),
.protocol = protocol,
.spi = spi,
);
if (protocol != PROTO_NONE) if (protocol != PROTO_NONE)
{ {
this->public.task.build = (status_t(*)(task_t*,message_t*))build_i; this->public.task.build = _build_i;
this->public.task.process = (status_t(*)(task_t*,message_t*))process_i; this->public.task.process = _process_i;
this->initiator = TRUE; this->initiator = TRUE;
} }
else else
{ {
this->public.task.build = (status_t(*)(task_t*,message_t*))build_r; this->public.task.build = _build_r;
this->public.task.process = (status_t(*)(task_t*,message_t*))process_r; this->public.task.process = _process_r;
this->initiator = FALSE; this->initiator = FALSE;
} }
return &this->public; return &this->public;