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

Support manually triggerd DPD check, even if DPD disabled in config

Browse Source
This commit is contained in:
Martin Willi
2011-01-05 16:45:40 +01:00
parent 3f759bb75b
commit 6c2d466b90
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+10 -11
View File
@@ -559,13 +559,6 @@ METHOD(ike_sa_t, send_dpd, status_t,
time_t diff, delay; time_t diff, delay;
delay = this->peer_cfg->get_dpd(this->peer_cfg); delay = this->peer_cfg->get_dpd(this->peer_cfg);
if (delay == 0)
{
/* DPD disabled */
return SUCCESS;
}
if (this->task_manager->busy(this->task_manager)) if (this->task_manager->busy(this->task_manager))
{ {
/* an exchange is in the air, no need to start a DPD check */ /* an exchange is in the air, no need to start a DPD check */
@@ -578,7 +571,7 @@ METHOD(ike_sa_t, send_dpd, status_t,
last_in = get_use_time(this, TRUE); last_in = get_use_time(this, TRUE);
now = time_monotonic(NULL); now = time_monotonic(NULL);
diff = now - last_in; diff = now - last_in;
if (diff >= delay) if (!delay || diff >= delay)
{ {
/* to long ago, initiate dead peer detection */ /* to long ago, initiate dead peer detection */
task_t *task; task_t *task;
@@ -604,8 +597,11 @@ METHOD(ike_sa_t, send_dpd, status_t,
} }
} }
/* recheck in "interval" seconds */ /* recheck in "interval" seconds */
job = (job_t*)send_dpd_job_create(this->ike_sa_id); if (delay)
lib->scheduler->schedule_job(lib->scheduler, job, delay - diff); {
job = (job_t*)send_dpd_job_create(this->ike_sa_id);
lib->scheduler->schedule_job(lib->scheduler, job, delay - diff);
}
return SUCCESS; return SUCCESS;
} }
@@ -680,7 +676,10 @@ METHOD(ike_sa_t, set_state, void,
} }
/* start DPD checks */ /* start DPD checks */
send_dpd(this); if (this->peer_cfg->get_dpd(this->peer_cfg))
{
send_dpd(this);
}
} }
break; break;
} }