2005-10-21 Paul Jakma <paul.jakma@sun.com>

	* ospf_dump.c: (ospf_timeval_dump) fix ms adjustment, thanks to
	  Andrew Schorr.
	* ospf_vty.c: (ospf_config_write) fix write out of spf timers
	  configuration.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 76c220aa79e5fe5d9abb5831820d9cd9edf5a2f3..1a8817aab811fa271f0aa46938786bbece13b03b 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-21 Paul Jakma <paul.jakma@sun.com>
+
+       * ospf_dump.c: (ospf_timeval_dump) fix ms adjustment, thanks to
+         Andrew Schorr.
+       * ospf_vty.c: (ospf_config_write) fix write out of spf timers
+         configuration.
+
 2005-10-21 Paul Jakma <paul.jakma@sun.com>
 
        * (general) SPF millisecond resolution timer with adaptive,

diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index 9ae87a61e7568f07fe294d46929b3594d58c728a..2cccc143e7532621d8c5d8aaa415fb929628abb0 100644 (file)
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -249,8 +249,8 @@ ospf_timeval_dump (struct timeval *t, char *buf, size_t size)
   
   if (ms >= 1000)
     {
-      t->tv_sec = ms / 1000;
-      ms =- t->tv_sec * 1000;
+      t->tv_sec += ms / 1000;
+      ms %= 1000;
     }
   
   if (t->tv_sec > WEEK_IN_SECONDS)

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 5263f15ca72e0c2089aeed6e4158a22afb5ca906..2115b987f25426085a06cde9d86cba67fc6484ea 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -7603,9 +7603,11 @@ ospf_config_write (struct vty *vty)
 
       /* SPF timers print. */
       if (ospf->spf_delay != OSPF_SPF_DELAY_DEFAULT ||
-         ospf->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT)
-       vty_out (vty, " timers spf %d %d%s",
-                ospf->spf_delay, ospf->spf_holdtime, VTY_NEWLINE);
+         ospf->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT ||
+         ospf->spf_max_holdtime != OSPF_SPF_MAX_HOLDTIME_DEFAULT)
+       vty_out (vty, " timers throttle spf %d %d %d%s",
+                ospf->spf_delay, ospf->spf_holdtime, 
+                ospf->spf_max_holdtime, VTY_NEWLINE);
 
       /* SPF refresh parameters print. */
       if (ospf->lsa_refresh_interval != OSPF_LSA_REFRESH_INTERVAL_DEFAULT)