sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-06 00:00:47 -04:00
Code Issues 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:33:40 +01:00
parent 5ed4b727d0
commit f98af1ddd5
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libcharon/sa/ike_sa.c
View File

@ -606,6 +606,8 @@ METHOD(ike_sa_t, get_state, ike_sa_state_t,
METHOD(ike_sa_t, set_state, void,
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",
get_name(this), this->unique_id,
ike_sa_state_names, this->state,
@ -667,19 +669,7 @@ METHOD(ike_sa_t, set_state, void,
DBG1(DBG_IKE, "maximum IKE_SA lifetime %ds", t);
}
/* start DPD checks */
if (this->peer_cfg->get_dpd(this->peer_cfg))
{
if (supports_extension(this, EXT_DPD))
{
this->state = state;
send_dpd(this);
}
else
{
DBG1(DBG_IKE, "DPD not supported by peer, disabled");
}
}
trigger_dpd = this->peer_cfg->get_dpd(this->peer_cfg);
}
break;
}
@ -696,6 +686,18 @@ METHOD(ike_sa_t, set_state, void,
}
charon->bus->ike_state_change(charon->bus, &this->public, state);
this->state = state;
if (trigger_dpd)
{
if (supports_extension(this, EXT_DPD))
{
send_dpd(this);
}
else
{
DBG1(DBG_IKE, "DPD not supported by peer, disabled");
}
}
}
METHOD(ike_sa_t, reset, void,