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

child-sa: Add a new state to track rekeyed IKEv1 CHILD_SAs

Browse Source 
This is needed to handle DELETEs properly, which was previously done via
CHILD_REKEYING, which we don't use anymore since 5c6a62ceb6 as it prevents
reauthentication.
This commit is contained in:
Tobias Brunner
2015-03-25 12:00:20 +01:00
parent 66147ef670
commit 70728eb1b6
7 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/processing/jobs/rekey_ike_sa_job.c
+2 -1
View File
@@ -67,7 +67,8 @@ static u_int32_t get_retry_delay(ike_sa_t *ike_sa)
enumerator = ike_sa->create_child_sa_enumerator(ike_sa);
while (enumerator->enumerate(enumerator, &child_sa))
{
if (child_sa->get_state(child_sa) != CHILD_INSTALLED)
if (child_sa->get_state(child_sa) != CHILD_INSTALLED &&
child_sa->get_state(child_sa) != CHILD_REKEYED)
{
retry = RETRY_INTERVAL - (random() % RETRY_JITTER);
DBG1(DBG_IKE, "unable to reauthenticate in CHILD_SA %N state, "