diff options
| author | Acee <aceelindem@gmail.com> | 2024-11-05 10:03:28 -0500 |
|---|---|---|
| committer | Acee <aceelindem@gmail.com> | 2024-11-05 10:03:28 -0500 |
| commit | 64c67c1ce090085501d56b3b9a0aa2100d82c8ec (patch) | |
| tree | 7dbcf7d11418ea3e9643970c1b7fbc18e00151cd /ospfd | |
| parent | 960462aadedbc921a80c20c231cfcf6e94b5a98b (diff) | |
ospfd: Fix assert in LSA refresh interval setting
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>
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_lsa.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c index f175bbf9e4..1350487898 100644 --- a/ospfd/ospf_lsa.c +++ b/ospfd/ospf_lsa.c @@ -106,7 +106,7 @@ int tv2msec(struct timeval tv) int msecs; msecs = tv.tv_sec * 1000; - msecs += tv.tv_usec / 1000; + msecs += (tv.tv_usec + 1000) / 1000; 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", 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; |