From 07095794a1ecee5b084c5b69f7d5a9fefd737c9e Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 14 Dec 2011 15:33:06 +0100 Subject: Close IKE_SA directly after sending the delete --- src/libcharon/sa/task_manager_v1.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/libcharon/sa/task_manager_v1.c b/src/libcharon/sa/task_manager_v1.c index bdb55a07e..494fe84c3 100755 --- a/src/libcharon/sa/task_manager_v1.c +++ b/src/libcharon/sa/task_manager_v1.c @@ -462,11 +462,19 @@ METHOD(task_manager_t, initiate, status_t, this->initiating.packet->destroy(this->initiating.packet); this->initiating.packet = NULL; - /* close after sending an INFORMATIONAL error but not yet established */ - if (exchange == INFORMATIONAL_V1 && - this->ike_sa->get_state(this->ike_sa) == IKE_CONNECTING) + if (exchange == INFORMATIONAL_V1) { - return FAILED; + switch (this->ike_sa->get_state(this->ike_sa)) + { + case IKE_CONNECTING: + /* close after sending an INFORMATIONAL when unestablished */ + return FAILED; + case IKE_DELETING: + /* close after sending a DELETE */ + return DESTROY_ME; + default: + break; + } } return SUCCESS; } -- cgit v1.2.3