diff options
| author | Martin Willi <martin@revosec.ch> | 2011-02-28 10:31:36 +0000 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-02-28 10:31:36 +0000 |
| commit | e44ebdcfc8b815ef0bbe56f33708f550a38041f9 (patch) | |
| tree | ecae3800a907b2f0396ce88d7a9b4caf7f158551 /src/libcharon/sa/ike_sa.c | |
| parent | d17304cd295e85833b8137f3f974d4dedff1e9c2 (diff) | |
| download | strongswan-e44ebdcf.tar.bz2 strongswan-e44ebdcf.tar.xz | |
Slightly change IKE_SA destruction order to inherit properly during ike_rekey task destruction
Diffstat (limited to 'src/libcharon/sa/ike_sa.c')
| -rw-r--r-- | src/libcharon/sa/ike_sa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c index 9b6f9d06d..2d51786ca 100644 --- a/src/libcharon/sa/ike_sa.c +++ b/src/libcharon/sa/ike_sa.c @@ -1989,6 +1989,7 @@ METHOD(ike_sa_t, destroy, void, charon->bus->set_sa(charon->bus, &this->public); set_state(this, IKE_DESTROYING); + this->task_manager->destroy(this->task_manager); /* remove attributes first, as we pass the IKE_SA to the handler */ while (this->attributes->remove_last(this->attributes, @@ -2006,7 +2007,6 @@ METHOD(ike_sa_t, destroy, void, /* unset SA after here to avoid usage by the listeners */ charon->bus->set_sa(charon->bus, NULL); - this->task_manager->destroy(this->task_manager); this->keymat->destroy(this->keymat); if (this->my_virtual_ip) |