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

Moved liveness checking task creation to protocol specific task manager

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:27 +01:00
parent 7d0a3a427d
commit 244d715de5
4 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+3 -20
View File
@@ -603,26 +603,9 @@ METHOD(ike_sa_t, send_dpd, status_t,
if (!delay || diff >= delay)
{
/* to long ago, initiate dead peer detection */
task_t *task;
ike_mobike_t *mobike;
if (supports_extension(this, EXT_MOBIKE) &&
has_condition(this, COND_NAT_HERE))
{
/* use mobike enabled DPD to detect NAT mapping changes */
mobike = ike_mobike_create(&this->public, TRUE);
mobike->dpd(mobike);
task = &mobike->task;
}
else
{
task = (task_t*)ike_dpd_create(TRUE);
}
diff = 0;
DBG1(DBG_IKE, "sending DPD request");
this->task_manager->queue_task(this->task_manager, task);
this->task_manager->initiate(this->task_manager);
this->task_manager->queue_dpd(this->task_manager);
diff = 0;
}
}
/* recheck in "interval" seconds */
@@ -631,7 +614,7 @@ METHOD(ike_sa_t, send_dpd, status_t,
job = (job_t*)send_dpd_job_create(this->ike_sa_id);
lib->scheduler->schedule_job(lib->scheduler, job, delay - diff);
}
return SUCCESS;
return this->task_manager->initiate(this->task_manager);
}
METHOD(ike_sa_t, get_state, ike_sa_state_t,