diff options
| author | Martin Willi <martin@revosec.ch> | 2011-03-15 15:20:09 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-03-15 15:20:09 +0100 |
| commit | 3ced6b51e462201c32954ae9cb23449a377be3fa (patch) | |
| tree | 82a50c1d93c4297cde095db4a7e8b14ed866ea5c /src/libcharon/sa/tasks/child_rekey.c | |
| parent | f42156a8c8f4d24927f397951b121aea5ce027f4 (diff) | |
| download | strongswan-3ced6b51e462201c32954ae9cb23449a377be3fa.tar.bz2 strongswan-3ced6b51e462201c32954ae9cb23449a377be3fa.tar.xz | |
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.
Diffstat (limited to 'src/libcharon/sa/tasks/child_rekey.c')
| -rw-r--r-- | src/libcharon/sa/tasks/child_rekey.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |