[ospf6d] Bug 322: ospf6d show ipv6 neighbour showing wrong times

2007-03-08 David Siebörger d.sieborger@ru.ac.za

	* ospf6_neighbor.c: (ospf6_neighbor_show) Fix bug #322, ospf6d
	  wasn't updated to match thread times changing to relative
	  time.

diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index 766cecee8a9af1af67d06ecc9bf15f248f3d970b..c5f24f7fa20158b171c994a66243c9a0cbc8fb54 100644 (file)
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-08 David Siebörger d.sieborger@ru.ac.za
+
+       * ospf6_neighbor.c: (ospf6_neighbor_show) Fix bug #322, ospf6d
+         wasn't updated to match thread times changing to relative
+         time.
+
 2007-02-27  Pavol Rusnak <prusnak@suse.cz>
 
        * ospf6_lsa.c: (ospf6_lsa_handler_name) Fix bug: must use strcmp

diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index b0db345a651c3af9c6bea7d5d2783a803832903d..9c1cf2363fd0c8f99fe7bbeaecd34de7089a205c 100644 (file)
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -574,7 +574,7 @@ ospf6_neighbor_show (struct vty *vty, struct ospf6_neighbor *on)
   h = m = s = 0;
   if (on->inactivity_timer)
     {
-      s = on->inactivity_timer->u.sands.tv_sec - now.tv_sec;
+      s = on->inactivity_timer->u.sands.tv_sec - recent_relative_time().tv_sec;
       h = s / 3600;
       s -= h * 3600;
       m = s / 60;