diff options
| author | paul <paul> | 2005-10-21 20:04:41 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-10-21 20:04:41 +0000 |
| commit | ea4ffc9009ac4596fe865fd5f7e8363cdacbbd66 (patch) | |
| tree | e7281a93367a634b7d08fa45c24951dbb0bd444c | |
| parent | d24f6e2a34ca829bd2ff6adb98b49d4d2d9cb737 (diff) | |
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.
| -rw-r--r-- | ospfd/ChangeLog | 7 | ||||
| -rw-r--r-- | ospfd/ospf_dump.c | 4 | ||||
| -rw-r--r-- | ospfd/ospf_vty.c | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index 76c220aa..1a8817aa 100644 --- a/ospfd/ChangeLog +++ b/ospfd/ChangeLog @@ -1,5 +1,12 @@ 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, linear back-off holdtime. Prettification of ospf_timer_dump. * ospf_dump.c: (ospf_timeval_dump) new function. The guts of diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index 9ae87a61..2cccc143 100644 --- 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 5263f15c..2115b987 100644 --- 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) |