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.
This commit is contained in:
Martin Willi
2011-03-15 15:20:09 +01:00
parent f42156a8c8
commit 3ced6b51e4
5 changed files with 54 additions and 58 deletions
+2
View File
@@ -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;
}