matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ospfd: Fix assert in LSA refresh interval setting

Browse source 
Under certain timing conditions, the current logic asserts in
ospf_lsa_refresh_delay(). While this isn't readily reproducible,
the only explanation is that the conversion from struct timeval
to milliseconds is 0 due to rounding off the microseconds.

Signed-off-by: Acee <aceelindem@gmail.com>
This commit is contained in:
Acee 2024-11-05 10:03:28 -05:00
parent 960462aade
commit 64c67c1ce0
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ospfd/ospf_lsa.c
View file

@ -106,7 +106,7 @@ int tv2msec(struct timeval tv)
int msecs; int msecs;
msecs = tv.tv_sec * 1000; msecs = tv.tv_sec * 1000;
msecs += tv.tv_usec / 1000; msecs += (tv.tv_usec + 1000) / 1000;
return msecs; return msecs;
} }
@ -126,7 +126,12 @@ int ospf_lsa_refresh_delay(struct ospf *ospf, struct ospf_lsa *lsa)
zlog_debug("LSA[Type%d:%pI4]: Refresh timer delay %d milliseconds", zlog_debug("LSA[Type%d:%pI4]: Refresh timer delay %d milliseconds",
lsa->data->type, &lsa->data->id, delay); lsa->data->type, &lsa->data->id, delay);
assert(delay > 0); if (delay <= 0) {
zlog_warn("LSA[Type%d:%pI4]: Invalid refresh timer delay %d milliseconds Seq: 0x%x Age:%u",
lsa->data->type, &lsa->data->id, delay,
ntohl(lsa->data->ls_seqnum), ntohs(lsa->data->ls_age));
delay = 0;
}
} }
return delay; return delay;