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

ike: Restart inactivity counter after doing a CHILD_SA rekey

Browse Source 
When doing a rekey for a CHILD_SA, the use counters get reset. An inactivity
job is queued for a time unrelated to the rekey time, so it might happen
that the inactivity job gets executed just after rekeying. If this happens,
inactivity is detected even if we had traffic on the rekeyed CHILD_SA just
before rekeying.

This change implies that inactivity checks can't handle inactivity timeouts
for rekeyed CHILD_SAs, and therefore requires that inactivity timeout is shorter
than the rekey time to have any effect.
This commit is contained in:
Martin Willi
2014-01-23 16:19:22 +01:00
parent 763e035335
commit d048a319df
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/processing/jobs/inactivity_job.c
+3 -2
View File
@@ -73,12 +73,13 @@ METHOD(job_t, execute, job_requeue_t,
{
if (child_sa->get_reqid(child_sa) == this->reqid)
{
time_t in, out, diff;
time_t in, out, install, diff;
child_sa->get_usestats(child_sa, TRUE, &in, NULL, NULL);
child_sa->get_usestats(child_sa, FALSE, &out, NULL, NULL);
install = child_sa->get_installtime(child_sa);
diff = time_monotonic(NULL) - max(in, out);
diff = time_monotonic(NULL) - max(max(in, out), install);
if (diff >= this->timeout)
{