From 3ced6b51e462201c32954ae9cb23449a377be3fa Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 15 Mar 2011 15:20:09 +0100 Subject: Move establish/inherit of rekeyed IKE_SAs to delete messages Having the inherit() function delayed to the IKE_SA establish procedure was problematic. The task destroy function was never a good place and results in locking/cleanup problems. After establishing the SA, it should be really checked in ASAP to avoid any triggered DPD checks to get lost. --- src/libcharon/sa/tasks/child_rekey.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/libcharon/sa/tasks/child_rekey.c') diff --git a/src/libcharon/sa/tasks/child_rekey.c b/src/libcharon/sa/tasks/child_rekey.c index e74ca4eef..33b5b5215 100644 --- a/src/libcharon/sa/tasks/child_rekey.c +++ b/src/libcharon/sa/tasks/child_rekey.c @@ -412,6 +412,8 @@ static void collide(private_child_rekey_t *this, task_t *other) other->destroy(other); return; } + DBG1(DBG_IKE, "detected %N collision with %N", task_type_names, CHILD_REKEY, + task_type_names, other->get_type(other)); DESTROY_IF(this->collision); this->collision = other; } -- cgit v1.2.3