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

Trigger DPD not before IKE_SA state gets updated

Browse Source
This commit is contained in:
Martin Willi
2012-02-02 10:35:50 +01:00
parent 916cdca851
commit 85dd6a8deb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+8 -6
View File
@@ -619,6 +619,8 @@ METHOD(ike_sa_t, get_state, ike_sa_state_t,
METHOD(ike_sa_t, set_state, void, METHOD(ike_sa_t, set_state, void,
private_ike_sa_t *this, ike_sa_state_t state) private_ike_sa_t *this, ike_sa_state_t state)
{ {
bool trigger_dpd = FALSE;
DBG2(DBG_IKE, "IKE_SA %s[%d] state change: %N => %N", DBG2(DBG_IKE, "IKE_SA %s[%d] state change: %N => %N",
get_name(this), this->unique_id, get_name(this), this->unique_id,
ike_sa_state_names, this->state, ike_sa_state_names, this->state,
@@ -679,12 +681,7 @@ METHOD(ike_sa_t, set_state, void,
lib->scheduler->schedule_job(lib->scheduler, job, t); lib->scheduler->schedule_job(lib->scheduler, job, t);
DBG1(DBG_IKE, "maximum IKE_SA lifetime %ds", t); DBG1(DBG_IKE, "maximum IKE_SA lifetime %ds", t);
} }
trigger_dpd = this->peer_cfg->get_dpd(this->peer_cfg);
/* start DPD checks */
if (this->peer_cfg->get_dpd(this->peer_cfg))
{
send_dpd(this);
}
} }
break; break;
} }
@@ -701,6 +698,11 @@ METHOD(ike_sa_t, set_state, void,
} }
charon->bus->ike_state_change(charon->bus, &this->public, state); charon->bus->ike_state_change(charon->bus, &this->public, state);
this->state = state; this->state = state;
if (trigger_dpd)
{
send_dpd(this);
}
} }
METHOD(ike_sa_t, reset, void, METHOD(ike_sa_t, reset, void,