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

[ripd] Fix "show ip rip status" display of time until next update

Browse Source 
2007-03-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* ripd.c: (show_ip_rip_status) Use new thread_timer_remain_second
	  function instead of rip_next_thread_timer to display the time until
	  next update properly.
	  (rip_next_thread_timer) Remove obsolete function.
This commit is contained in:
Andrew J. Schorr 2007-03-21 18:57:38 +00:00
parent afb88a6691
commit a4c648281d
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ripd/ChangeLog
View File

@ -1,3 +1,10 @@
2007-03-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ripd.c: (show_ip_rip_status) Use new thread_timer_remain_second
function instead of rip_next_thread_timer to display the time until
next update properly.
(rip_next_thread_timer) Remove obsolete function.
2006-12-12 Andrew J. Schorr <ajschorr@alumni.princeton.edu> 2006-12-12 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* rip_interface.c: (rip_interface_multicast_set) Use new CONNECTED_ID * rip_interface.c: (rip_interface_multicast_set) Use new CONNECTED_ID

15
ripd/ripd.c
View File

@ -3500,17 +3500,6 @@ DEFUN (show_ip_rip,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
/* Return next event time. */
static int
rip_next_thread_timer (struct thread *thread)
{
struct timeval timer_now;
gettimeofday (&timer_now, NULL);
return thread->u.sands.tv_sec - timer_now.tv_sec;
}
/* Vincent: formerly, it was show_ip_protocols_rip: "show ip protocols" */ /* Vincent: formerly, it was show_ip_protocols_rip: "show ip protocols" */
DEFUN (show_ip_rip_status, DEFUN (show_ip_rip_status,
show_ip_rip_status_cmd, show_ip_rip_status_cmd,
@ -3533,8 +3522,8 @@ DEFUN (show_ip_rip_status,
vty_out (vty, "Routing Protocol is \"rip\"%s", VTY_NEWLINE); vty_out (vty, "Routing Protocol is \"rip\"%s", VTY_NEWLINE);
vty_out (vty, " Sending updates every %ld seconds with +/-50%%,", vty_out (vty, " Sending updates every %ld seconds with +/-50%%,",
rip->update_time); rip->update_time);
vty_out (vty, " next due in %d seconds%s", vty_out (vty, " next due in %lu seconds%s",
rip_next_thread_timer (rip->t_update), thread_timer_remain_second(rip->t_update),
VTY_NEWLINE); VTY_NEWLINE);
vty_out (vty, " Timeout after %ld seconds,", rip->timeout_time); vty_out (vty, " Timeout after %ld seconds,", rip->timeout_time);
vty_out (vty, " garbage collect after %ld seconds%s", rip->garbage_time, vty_out (vty, " garbage collect after %ld seconds%s", rip->garbage_time,