summaryrefslogtreecommitdiff
path: root/ospf6d
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2007-03-08 17:50:01 +0000
committerPaul Jakma <paul.jakma@sun.com>2007-03-08 17:50:01 +0000
commitc136d24406b62510a8c7a3c89e7716d0819e8fc2 (patch)
tree65dc30951f154c2af9adc005a6041ca8994522ca /ospf6d
parent6502208c3217e52e693146e6b72e76fd76982a51 (diff)
[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.
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ChangeLog6
-rw-r--r--ospf6d/ospf6_neighbor.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index 766cecee..c5f24f7f 100644
--- 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 b0db345a..9c1cf236 100644
--- 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;