Do not query CHILD_SA during delete if they already expired

This commit is contained in:
Martin Willi
2012-03-20 17:31:31 +01:00
parent 07202a2bf1
commit 3a925f74ab
18 changed files with 97 additions and 44 deletions
+5 -3
View File
@@ -825,7 +825,7 @@ static status_t process_request(private_task_manager_t *this,
else
{
task = (task_t*)child_delete_create(this->ike_sa,
PROTO_NONE, 0);
PROTO_NONE, 0, FALSE);
}
break;
}
@@ -1308,9 +1308,11 @@ METHOD(task_manager_t, queue_child_rekey, void,
}
METHOD(task_manager_t, queue_child_delete, void,
private_task_manager_t *this, protocol_id_t protocol, u_int32_t spi)
private_task_manager_t *this, protocol_id_t protocol, u_int32_t spi,
bool expired)
{
queue_task(this, (task_t*)child_delete_create(this->ike_sa, protocol, spi));
queue_task(this, (task_t*)child_delete_create(this->ike_sa,
protocol, spi, expired));
}
METHOD(task_manager_t, queue_dpd, void,