proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 20:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: Fix json Crash with inactive timer

Browse Source 
When nbr->t_inactivity is not active, and
you do a show json over the neighbor it
will crash ospfd.  Fix the code so it
prints out -1 when the timer is inactive.

Ticket:CM-13835
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>
(cherry picked from commit 78d8fcb9623ab4d9cebf6187a451448e056a84bf)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
Donald Sharp 2016-12-02 08:19:26 -05:00 committed by David Lamparter
parent db2d8df649
commit 45d430e81d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ospfd/ospf_vty.c
View File

@ -4590,10 +4590,15 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi,
/* Show Router Dead interval timer. */ /* Show Router Dead interval timer. */
if (use_json) if (use_json)
{ {
struct timeval res = tv_sub (nbr->t_inactivity->u.sands, recent_relative_time ()); if (nbr->t_inactivity)
unsigned long time_store = 0; {
time_store = (1000 * res.tv_sec) + (res.tv_usec / 1000); struct timeval res = tv_sub (nbr->t_inactivity->u.sands, recent_relative_time ());
json_object_int_add(json_sub, "routerDeadIntervalTimerDueMsec", time_store); unsigned long time_store = 0;
time_store = (1000 * res.tv_sec) + (res.tv_usec / 1000);
json_object_int_add(json_sub, "routerDeadIntervalTimerDueMsec", time_store);
}
else
json_object_int_add(json_sub, "routerDeadIntervalTimerDueMsec", -1);
} }
else else
vty_out (vty, " Dead timer due in %s%s", vty_out (vty, " Dead timer due in %s%s",