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

ike-sa: Add option to force the destruction of an IKE_SA after initiating a delete

Browse Source
This commit is contained in:
Tobias Brunner
2018-05-22 10:06:07 +02:00
parent c58434aeff
commit a79d510354
11 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+28 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2006-2017 Tobias Brunner
* Copyright (C) 2006-2018 Tobias Brunner
* Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005-2009 Martin Willi
* Copyright (C) 2005 Jan Hutter
@@ -1793,8 +1793,10 @@ METHOD(ike_sa_t, destroy_child_sa, status_t,
}
METHOD(ike_sa_t, delete_, status_t,
private_ike_sa_t *this)
private_ike_sa_t *this, bool force)
{
status_t status = DESTROY_ME;
switch (this->state)
{
case IKE_ESTABLISHED:
@@ -1806,19 +1808,38 @@ METHOD(ike_sa_t, delete_, status_t,
charon->bus->alert(charon->bus, ALERT_IKE_SA_EXPIRED);
}
this->task_manager->queue_ike_delete(this->task_manager);
return this->task_manager->initiate(this->task_manager);
status = this->task_manager->initiate(this->task_manager);
break;
case IKE_CREATED:
DBG1(DBG_IKE, "deleting unestablished IKE_SA");
break;
case IKE_PASSIVE:
break;
default:
DBG1(DBG_IKE, "destroying IKE_SA in state %N "
"without notification", ike_sa_state_names, this->state);
charon->bus->ike_updown(charon->bus, &this->public, FALSE);
DBG1(DBG_IKE, "destroying IKE_SA in state %N without notification",
ike_sa_state_names, this->state);
force = TRUE;
break;
}
return DESTROY_ME;
if (force)
{
status = DESTROY_ME;
if (this->version == IKEV2)
{ /* for IKEv1 we trigger this in the ISAKMP delete task */
switch (this->state)
{
case IKE_ESTABLISHED:
case IKE_REKEYING:
case IKE_DELETING:
charon->bus->ike_updown(charon->bus, &this->public, FALSE);
default:
break;
}
}
}
return status;
}
METHOD(ike_sa_t, rekey, status_t,