diff options
| author | paul <paul> | 2005-10-23 15:23:05 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-10-23 15:23:05 +0000 |
| commit | b8ad39d47a0fea7a336305cfd04f059c8e797aad (patch) | |
| tree | 8387ae1ff1f397c79c035b3b303e8ea74b53a451 /ospfd | |
| parent | ea4ffc9009ac4596fe865fd5f7e8363cdacbbd66 (diff) | |
2005-10-23 Paul Jakma <paul.jakma@sun.com>
* ospf_vty.c: (show_ip_ospf) fix display of SPF timer if it
has not yet been run.
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ChangeLog | 5 | ||||
| -rw-r--r-- | ospfd/ospf_vty.c | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index 1a8817aa..a4461258 100644 --- a/ospfd/ChangeLog +++ b/ospfd/ChangeLog @@ -1,3 +1,8 @@ +2005-10-23 Paul Jakma <paul.jakma@sun.com> + + * ospf_vty.c: (show_ip_ospf) fix display of SPF timer if it + has not yet been run. + 2005-10-21 Paul Jakma <paul.jakma@sun.com> * ospf_dump.c: (ospf_timeval_dump) fix ms adjustment, thanks to diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 2115b987..e56027be 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -2617,10 +2617,16 @@ DEFUN (show_ip_ospf, ospf->spf_holdtime, VTY_NEWLINE, ospf->spf_max_holdtime, VTY_NEWLINE, ospf->spf_hold_multiplier, VTY_NEWLINE); - timersub (&recent_time, &ospf->ts_spf, &result); - vty_out (vty, " SPF algorithm last executed %s ago%s", - ospf_timeval_dump (&result, timebuf, sizeof (timebuf)), - VTY_NEWLINE); + vty_out (vty, " SPF algorithm "); + if (ospf->ts_spf.tv_sec || ospf->ts_spf.tv_usec) + { + timersub (&recent_time, &ospf->ts_spf, &result); + vty_out (vty, "last executed %s ago%s", + ospf_timeval_dump (&result, timebuf, sizeof (timebuf)), + VTY_NEWLINE); + } + else + vty_out (vty, "has not been run%s", VTY_NEWLINE); vty_out (vty, " SPF timer %s%s%s", (ospf->t_spf_calc ? "due in " : "is "), ospf_timer_dump (ospf->t_spf_calc, timebuf, sizeof (timebuf)), |