diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-05-30 17:10:51 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-06-17 18:48:05 +0200 |
| commit | 8a78e41f295dbe16b590db411747ba6abb6c318c (patch) | |
| tree | e44b96a937b6380dd679a97d336d0c54124f667b | |
| parent | c0976a5e01f0ceacb9a7d44821a5afd7ad3cbdce (diff) | |
| download | strongswan-8a78e41f295dbe16b590db411747ba6abb6c318c.tar.bz2 strongswan-8a78e41f295dbe16b590db411747ba6abb6c318c.tar.xz | |
ike-rekey: Handle TEMPORARY_FAILURE notify
| -rw-r--r-- | src/libcharon/sa/ikev2/tasks/ike_rekey.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/src/libcharon/sa/ikev2/tasks/ike_rekey.c b/src/libcharon/sa/ikev2/tasks/ike_rekey.c index 9373e9643..89503fa86 100644 --- a/src/libcharon/sa/ikev2/tasks/ike_rekey.c +++ b/src/libcharon/sa/ikev2/tasks/ike_rekey.c @@ -70,6 +70,22 @@ struct private_ike_rekey_t { }; /** + * Schedule a retry if rekeying temporary failed + */ +static void schedule_delayed_rekey(private_ike_rekey_t *this) +{ + uint32_t retry; + job_t *job; + + retry = RETRY_INTERVAL - (random() % RETRY_JITTER); + job = (job_t*)rekey_ike_sa_job_create( + this->ike_sa->get_id(this->ike_sa), FALSE); + DBG1(DBG_IKE, "IKE_SA rekeying failed, trying again in %d seconds", retry); + this->ike_sa->set_state(this->ike_sa, IKE_ESTABLISHED); + lib->scheduler->schedule_job(lib->scheduler, job, retry); +} + +/** * Check if an IKE_SA has any queued tasks, return initiation job */ static job_t* check_queued_tasks(ike_sa_t *ike_sa) @@ -251,6 +267,11 @@ METHOD(task_t, process_i, status_t, this->ike_sa->get_id(this->ike_sa), TRUE)); return SUCCESS; } + if (message->get_notify(message, TEMPORARY_FAILURE)) + { + schedule_delayed_rekey(this); + return SUCCESS; + } switch (this->ike_init->task.process(&this->ike_init->task, message)) { @@ -260,14 +281,7 @@ METHOD(task_t, process_i, status_t, this->collision->get_type(this->collision) == TASK_IKE_DELETE || this->collision->get_type(this->collision) == TASK_IKE_REAUTH))) { - job_t *job; - uint32_t retry = RETRY_INTERVAL - (random() % RETRY_JITTER); - job = (job_t*)rekey_ike_sa_job_create( - this->ike_sa->get_id(this->ike_sa), FALSE); - DBG1(DBG_IKE, "IKE_SA rekeying failed, " - "trying again in %d seconds", retry); - this->ike_sa->set_state(this->ike_sa, IKE_ESTABLISHED); - lib->scheduler->schedule_job(lib->scheduler, job, retry); + schedule_delayed_rekey(this); } return SUCCESS; case NEED_MORE: |