diff options
| author | Martin Willi <martin@revosec.ch> | 2011-12-20 18:01:12 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:29 +0100 |
| commit | bce22af29e340b92d98d3937e6ef6d694ee125c9 (patch) | |
| tree | 1f137db0c3874ec51caf86878d0dfb0b8c84d7dc /src | |
| parent | ca037076bfd31578410af900a3a667efa165df78 (diff) | |
| download | strongswan-bce22af29e340b92d98d3937e6ef6d694ee125c9.tar.bz2 strongswan-bce22af29e340b92d98d3937e6ef6d694ee125c9.tar.xz | |
Implemented migration of quick mode task
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/sa/ikev1/tasks/quick_mode.c | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c index df7b6375f..13db2bb91 100644 --- a/src/libcharon/sa/ikev1/tasks/quick_mode.c +++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c @@ -114,11 +114,6 @@ struct private_quick_mode_t { */ u_int64_t lifebytes; - /** - * Notify type in case of error - */ - notify_type_t notify_type; - /** states of quick mode */ enum { QM_INIT, @@ -895,7 +890,30 @@ METHOD(task_t, get_type, task_type_t, METHOD(task_t, migrate, void, private_quick_mode_t *this, ike_sa_t *ike_sa) { + chunk_free(&this->nonce_i); + chunk_free(&this->nonce_r); + DESTROY_IF(this->tsi); + DESTROY_IF(this->tsr); + DESTROY_IF(this->proposal); + DESTROY_IF(this->child_sa); + DESTROY_IF(this->dh); + this->ike_sa = ike_sa; + this->keymat = (keymat_v1_t*)ike_sa->get_keymat(ike_sa); + this->state = QM_INIT; + this->tsi = NULL; + this->tsr = NULL; + this->proposal = NULL; + this->child_sa = NULL; + this->dh = NULL; + this->spi_i = 0; + this->spi_r = 0; + + if (!this->initiator) + { + DESTROY_IF(this->config); + this->config = NULL; + } } METHOD(task_t, destroy, void, |