aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/sa/ikev1/task_manager_v1.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2012-01-02 15:40:31 +0100
committerMartin Willi <martin@revosec.ch>2012-03-20 17:31:31 +0100
commit3a925f74ab3cc43bafa409b89feaa32caeb33364 (patch)
tree22dbb61589d391aa028ff6137c274841c6672561 /src/libcharon/sa/ikev1/task_manager_v1.c
parent07202a2bf1b4caf3ceabe016128c890ec27ccb91 (diff)
downloadstrongswan-3a925f74ab3cc43bafa409b89feaa32caeb33364.tar.bz2
strongswan-3a925f74ab3cc43bafa409b89feaa32caeb33364.tar.xz
Do not query CHILD_SA during delete if they already expired
Diffstat (limited to 'src/libcharon/sa/ikev1/task_manager_v1.c')
-rw-r--r--src/libcharon/sa/ikev1/task_manager_v1.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index ea4cb8a1b..3a6cf5163 100644
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1141,7 +1141,7 @@ METHOD(task_manager_t, queue_ike_delete, void,
{
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));
+ child_sa->get_spi(child_sa, TRUE), FALSE, FALSE));
}
enumerator->destroy(enumerator);
@@ -1190,10 +1190,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*)quick_delete_create(this->ike_sa, protocol,
- spi, FALSE));
+ spi, FALSE, expired));
}
METHOD(task_manager_t, queue_dpd, void,