diff options
| author | Vincent Jardin <vincent.jardin@6wind.com> | 2007-04-11 15:12:05 +0000 |
|---|---|---|
| committer | Vincent Jardin <vincent.jardin@6wind.com> | 2007-04-11 15:12:05 +0000 |
| commit | a1fdf9479637642ae3de0ee6ef5c0958d6e687d8 (patch) | |
| tree | 28dfc85b9bfcbbf5064703484fc60a01c904e5e9 /ripd | |
| parent | f5e004f74fecaf84b50f8c1823432077ad7e15b7 (diff) | |
Fix the display of route timeout in "show ip rip". (Use thread_timer_remain_second)
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/ChangeLog | 5 | ||||
| -rw-r--r-- | ripd/ripd.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ripd/ChangeLog b/ripd/ChangeLog index b776c551..066c5271 100644 --- a/ripd/ChangeLog +++ b/ripd/ChangeLog @@ -1,3 +1,8 @@ +2007-04-11 Emmanuel Vize <emmanuel.vize@6wind.com> + + * ripd.c: (rip_vty_out_uptime) Use new thread_timer_remain_second + to display properly the route timeout, displayed by "show ip rip" + 2007-03-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu> * ripd.c: (show_ip_rip_status) Use new thread_timer_remain_second diff --git a/ripd/ripd.c b/ripd/ripd.c index f656073a..fb5b1777 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -3389,14 +3389,14 @@ rip_vty_out_uptime (struct vty *vty, struct rip_info *rinfo) if ((thread = rinfo->t_timeout) != NULL) { - clock = thread->u.sands.tv_sec - timer_now.tv_sec; + clock = thread_timer_remain_second (thread); tm = gmtime (&clock); strftime (timebuf, TIME_BUF, "%M:%S", tm); vty_out (vty, "%5s", timebuf); } else if ((thread = rinfo->t_garbage_collect) != NULL) { - clock = thread->u.sands.tv_sec - timer_now.tv_sec; + clock = thread_timer_remain_second (thread); tm = gmtime (&clock); strftime (timebuf, TIME_BUF, "%M:%S", tm); vty_out (vty, "%5s", timebuf); |