denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only initiate an exchange from send_dpd() if a task was actually queued

Browse Source 
Otherwise, the initiator would prematurely initiate Quick Mode if it has
DPD enabled and XAuth is used.
This commit is contained in:
Tobias Brunner
2012-09-07 18:05:22 +02:00
parent ccba4f1533
commit bcf8cdd556
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+8 -2
View File
@@ -575,6 +575,7 @@ METHOD(ike_sa_t, send_dpd, status_t,
{ {
job_t *job; job_t *job;
time_t diff, delay; time_t diff, delay;
bool task_queued = FALSE;
if (this->state == IKE_PASSIVE) if (this->state == IKE_PASSIVE)
{ {
@@ -595,9 +596,10 @@ METHOD(ike_sa_t, send_dpd, status_t,
diff = now - last_in; diff = now - last_in;
if (!delay || diff >= delay) if (!delay || diff >= delay)
{ {
/* to long ago, initiate dead peer detection */ /* too long ago, initiate dead peer detection */
DBG1(DBG_IKE, "sending DPD request"); DBG1(DBG_IKE, "sending DPD request");
this->task_manager->queue_dpd(this->task_manager); this->task_manager->queue_dpd(this->task_manager);
task_queued = TRUE;
diff = 0; diff = 0;
} }
} }
@@ -607,7 +609,11 @@ METHOD(ike_sa_t, send_dpd, status_t,
job = (job_t*)send_dpd_job_create(this->ike_sa_id); job = (job_t*)send_dpd_job_create(this->ike_sa_id);
lib->scheduler->schedule_job(lib->scheduler, job, delay - diff); lib->scheduler->schedule_job(lib->scheduler, job, delay - diff);
} }
return this->task_manager->initiate(this->task_manager); if (task_queued)
{
return this->task_manager->initiate(this->task_manager);
}
return SUCCESS;
} }
METHOD(ike_sa_t, get_state, ike_sa_state_t, METHOD(ike_sa_t, get_state, ike_sa_state_t,