diff options
| author | Martin Willi <martin@revosec.ch> | 2011-12-20 18:02:01 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:29 +0100 |
| commit | d9c1dae2938154828c363b3d0f15d74ced54a18f (patch) | |
| tree | 834ea256cdcb146ba39cd07c9b48d144a09f1030 | |
| parent | 94450913ef0e75945e95631db8151e2d7c9e77a3 (diff) | |
| download | strongswan-d9c1dae2938154828c363b3d0f15d74ced54a18f.tar.bz2 strongswan-d9c1dae2938154828c363b3d0f15d74ced54a18f.tar.xz | |
Implemented resetting of IKEv1 task manager, enabling additional keyingtries
| -rw-r--r-- | src/libcharon/sa/ike_sa.c | 2 | ||||
| -rw-r--r-- | src/libcharon/sa/ikev1/task_manager_v1.c | 28 |
2 files changed, 29 insertions, 1 deletions
diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c index 5916116e5..78ffbe5b9 100644 --- a/src/libcharon/sa/ike_sa.c +++ b/src/libcharon/sa/ike_sa.c @@ -1488,7 +1488,7 @@ METHOD(ike_sa_t, retransmit, status_t, { case IKE_CONNECTING: { - /* retry IKE_SA_INIT if we have multiple keyingtries */ + /* retry IKE_SA_INIT/Main Mode if we have multiple keyingtries */ u_int32_t tries = this->peer_cfg->get_keyingtries(this->peer_cfg); this->keyingtry++; if (tries == 0 || tries > this->keyingtry) diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c index dfc960891..37c3f76fb 100644 --- a/src/libcharon/sa/ikev1/task_manager_v1.c +++ b/src/libcharon/sa/ikev1/task_manager_v1.c @@ -1103,6 +1103,34 @@ METHOD(task_manager_t, incr_mid, void, METHOD(task_manager_t, reset, void, private_task_manager_t *this, u_int32_t initiate, u_int32_t respond) { + enumerator_t *enumerator; + task_t *task; + + /* reset message counters and retransmit packets */ + DESTROY_IF(this->responding.packet); + DESTROY_IF(this->initiating.packet); + this->responding.packet = NULL; + this->initiating.packet = NULL; + this->initiating.mid = 0; + this->initiating.seqnr = 0; + this->initiating.retransmitted = 0; + this->initiating.type = EXCHANGE_TYPE_UNDEFINED; + + /* reset queued tasks */ + enumerator = this->queued_tasks->create_enumerator(this->queued_tasks); + while (enumerator->enumerate(enumerator, &task)) + { + task->migrate(task, this->ike_sa); + } + enumerator->destroy(enumerator); + + /* reset active tasks */ + while (this->active_tasks->remove_last(this->active_tasks, + (void**)&task) == SUCCESS) + { + task->migrate(task, this->ike_sa); + this->queued_tasks->insert_first(this->queued_tasks, task); + } } METHOD(task_manager_t, create_task_enumerator, enumerator_t*, |