proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 14:50:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: fix assertion in LSP refresh timer calculation

Browse Source 
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Christian Franke 2015-11-10 18:32:11 +01:00 committed by Donald Sharp
parent 414766a1e5
commit f3d2b2813d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
isisd/isis_lsp.c
View File

@ -1087,6 +1087,8 @@ lsp_rem_lifetime (struct isis_area *area, int level)
MAX_AGE_JITTER); MAX_AGE_JITTER);
/* No jitter if the max refresh will be less than configure gen interval */ /* No jitter if the max refresh will be less than configure gen interval */
/* N.B. this calucation is acceptable since rem_lifetime is in [332,65535] at
* this point */
if (area->lsp_gen_interval[level - 1] > (rem_lifetime - 300)) if (area->lsp_gen_interval[level - 1] > (rem_lifetime - 300))
rem_lifetime = area->max_lsp_lifetime[level - 1]; rem_lifetime = area->max_lsp_lifetime[level - 1];
@ -1110,7 +1112,8 @@ lsp_refresh_time (struct isis_lsp *lsp, u_int16_t rem_lifetime)
refresh_time > (rem_lifetime - 300)) refresh_time > (rem_lifetime - 300))
refresh_time = rem_lifetime - 300; refresh_time = rem_lifetime - 300;
assert (area->lsp_gen_interval[level - 1] < refresh_time); /* In cornercases, refresh_time might be <= lsp_gen_interval, however
* we accept this violation to satisfy refresh_time <= rem_lifetime - 300 */
return refresh_time; return refresh_time;
} }