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/ike_sa.h | |
| 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/ike_sa.h')
| -rw-r--r-- | src/libcharon/sa/ike_sa.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libcharon/sa/ike_sa.h b/src/libcharon/sa/ike_sa.h index 988100bcc..69a74d8b7 100644 --- a/src/libcharon/sa/ike_sa.h +++ b/src/libcharon/sa/ike_sa.h @@ -912,9 +912,8 @@ struct ike_sa_t { * As this call may initiate inherited tasks, a status is returned. * * @param other other task to inherit from - * @return DESTROY_ME if initiation of inherited task failed */ - status_t (*inherit) (ike_sa_t *this, ike_sa_t *other); + void (*inherit) (ike_sa_t *this, ike_sa_t *other); /** * Reset the IKE_SA, useable when initiating fails |