From f42156a8c8f4d24927f397951b121aea5ce027f4 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 15 Mar 2011 11:51:53 +0100 Subject: [PATCH] Wrap IKE delete after rekey into rekey task for responder, too --- src/libcharon/sa/tasks/ike_rekey.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/libcharon/sa/tasks/ike_rekey.c b/src/libcharon/sa/tasks/ike_rekey.c index 82b0fb729..edaca0c0b 100644 --- a/src/libcharon/sa/tasks/ike_rekey.c +++ b/src/libcharon/sa/tasks/ike_rekey.c @@ -67,6 +67,18 @@ struct private_ike_rekey_t { task_t *collision; }; +METHOD(task_t, process_r_delete, status_t, + private_ike_rekey_t *this, message_t *message) +{ + return this->ike_delete->task.process(&this->ike_delete->task, message); +} + +METHOD(task_t, build_r_delete, status_t, + private_ike_rekey_t *this, message_t *message) +{ + return this->ike_delete->task.build(&this->ike_delete->task, message); +} + METHOD(task_t, build_i_delete, status_t, private_ike_rekey_t *this, message_t *message) { @@ -173,7 +185,12 @@ METHOD(task_t, build_r, status_t, this->ike_sa->get_other_host(this->ike_sa), this->ike_sa->get_other_id(this->ike_sa)); - return SUCCESS; + /* rekeying successful, delete the IKE_SA using a subtask */ + this->ike_delete = ike_delete_create(this->ike_sa, FALSE); + this->public.task.build = _build_r_delete; + this->public.task.process = _process_r_delete; + + return NEED_MORE; } METHOD(task_t, process_i, status_t,