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

2005-11-04 Paul Jakma <paul.jakma@sun.com>

Browse Source 
* ospf_{dump,spf,vty}.c: Oops, use the internal tv_sub
	  function rather than unportable timersub.
This commit is contained in:
paul 2005-11-04 12:31:39 +00:00
parent 8570676c4f
commit c8c1521a7d
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ospfd/ChangeLog
View File

@ -1,3 +1,8 @@
2005-11-04 Paul Jakma <paul.jakma@sun.com>
* ospf_{dump,spf,vty}.c: Oops, use the internal tv_sub
function rather than unportable timersub.
2005-11-03 Paul Jakma <paul.jakma@sun.com> 2005-11-03 Paul Jakma <paul.jakma@sun.com>
* ospf_apiserver.c: (apiserver_sync_callback) stray semi-colon * ospf_apiserver.c: (apiserver_sync_callback) stray semi-colon
@ -6,7 +11,7 @@
* ospf_te.h: Add braces, quell warning. * ospf_te.h: Add braces, quell warning.
* ospf_packet.c: Change level of some warnings to * ospf_packet.c: Change level of some warnings to
informational. informational.
2005-10-29 Paul Jakma <paul.jakma@sun.com> 2005-10-29 Paul Jakma <paul.jakma@sun.com>
* (general) RFC3137 stub-router support * (general) RFC3137 stub-router support

4
ospfd/ospf_dump.c
View File

@ -297,12 +297,10 @@ const char *
ospf_timer_dump (struct thread *t, char *buf, size_t size) ospf_timer_dump (struct thread *t, char *buf, size_t size)
{ {
struct timeval result; struct timeval result;
if (!t) if (!t)
return "inactive"; return "inactive";
timersub (&t->u.sands, &recent_time, &result); result = tv_sub (t->u.sands, recent_time);
return ospf_timeval_dump (&result, buf, size); return ospf_timeval_dump (&result, buf, size);
} }

2
ospfd/ospf_spf.c
View File

@ -1171,7 +1171,7 @@ ospf_spf_calculate_schedule (struct ospf *ospf)
} }
/* XXX Monotic timers: we only care about relative time here. */ /* XXX Monotic timers: we only care about relative time here. */
timersub (&recent_time, &ospf->ts_spf, &result); result = tv_sub (recent_time, ospf->ts_spf);
elapsed = (result.tv_sec * 1000) + (result.tv_usec / 1000); elapsed = (result.tv_sec * 1000) + (result.tv_usec / 1000);
ht = ospf->spf_holdtime * ospf->spf_hold_multiplier; ht = ospf->spf_holdtime * ospf->spf_hold_multiplier;

2
ospfd/ospf_vty.c
View File

@ -2653,7 +2653,7 @@ DEFUN (show_ip_ospf,
vty_out (vty, " SPF algorithm "); vty_out (vty, " SPF algorithm ");
if (ospf->ts_spf.tv_sec || ospf->ts_spf.tv_usec) if (ospf->ts_spf.tv_sec || ospf->ts_spf.tv_usec)
{ {
timersub (&recent_time, &ospf->ts_spf, &result); result = tv_sub (recent_time, ospf->ts_spf);
vty_out (vty, "last executed %s ago%s", vty_out (vty, "last executed %s ago%s",
ospf_timeval_dump (&result, timebuf, sizeof (timebuf)), ospf_timeval_dump (&result, timebuf, sizeof (timebuf)),
VTY_NEWLINE); VTY_NEWLINE);