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

Send a delete for every CHILD_SA before deleting IKE_SA

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:30 +01:00
parent 6379c679ae
commit daee47ba46
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/task_manager_v1.c
+15 -3
View File
@@ -349,13 +349,13 @@ METHOD(task_manager_t, initiate, status_t,
new_mid = TRUE; new_mid = TRUE;
break; break;
} }
if (activate_task(this, TASK_ISAKMP_DELETE)) if (activate_task(this, TASK_QUICK_DELETE))
{ {
exchange = INFORMATIONAL_V1; exchange = INFORMATIONAL_V1;
new_mid = TRUE; new_mid = TRUE;
break; break;
} }
if (activate_task(this, TASK_QUICK_DELETE)) if (activate_task(this, TASK_ISAKMP_DELETE))
{ {
exchange = INFORMATIONAL_V1; exchange = INFORMATIONAL_V1;
new_mid = TRUE; new_mid = TRUE;
@@ -499,7 +499,7 @@ METHOD(task_manager_t, initiate, status_t,
break; break;
} }
} }
return SUCCESS; return initiate(this);
} }
/** /**
@@ -1075,6 +1075,18 @@ METHOD(task_manager_t, queue_ike_reauth, void,
METHOD(task_manager_t, queue_ike_delete, void, METHOD(task_manager_t, queue_ike_delete, void,
private_task_manager_t *this) private_task_manager_t *this)
{ {
enumerator_t *enumerator;
child_sa_t *child_sa;
enumerator = this->ike_sa->create_child_sa_enumerator(this->ike_sa);
while (enumerator->enumerate(enumerator, &child_sa))
{
queue_task(this, (task_t*)
quick_delete_create(this->ike_sa, child_sa->get_protocol(child_sa),
child_sa->get_spi(child_sa, TRUE), FALSE));
}
enumerator->destroy(enumerator);
queue_task(this, (task_t*)isakmp_delete_create(this->ike_sa, TRUE)); queue_task(this, (task_t*)isakmp_delete_create(this->ike_sa, TRUE));
} }