ACK On Wed, May 27, 2015 at 8:08 AM, Paul Jakma <[email protected]> wrote:
> * bgpd.c: (peer_uptime) Wraps after 1 year, and doesn't indicate years. > Fix. Assume a year is 365 days, for an easy life - not displaying the > hours in that case anyway. > > Fixes: Bug #836 > Reported-by: Rolf Hanßen > --- > bgpd/bgpd.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c > index 4de854e..047e781 100644 > --- a/bgpd/bgpd.c > +++ b/bgpd/bgpd.c > @@ -4699,10 +4699,11 @@ peer_uptime (time_t uptime2, char *buf, size_t len) > uptime1 = bgp_clock (); > uptime1 -= uptime2; > tm = gmtime (&uptime1); > - > + > /* Making formatted timer strings. */ > #define ONE_DAY_SECOND 60*60*24 > -#define ONE_WEEK_SECOND 60*60*24*7 > +#define ONE_WEEK_SECOND ONE_DAY_SECOND*7 > +#define ONE_YEAR_SECOND ONE_DAY_SECOND*365 > > if (uptime1 < ONE_DAY_SECOND) > snprintf (buf, len, "%02d:%02d:%02d", > @@ -4710,9 +4711,13 @@ peer_uptime (time_t uptime2, char *buf, size_t len) > else if (uptime1 < ONE_WEEK_SECOND) > snprintf (buf, len, "%dd%02dh%02dm", > tm->tm_yday, tm->tm_hour, tm->tm_min); > - else > + else if (uptime1 < ONE_YEAR_SECOND) > snprintf (buf, len, "%02dw%dd%02dh", > tm->tm_yday/7, tm->tm_yday - ((tm->tm_yday/7) * 7), > tm->tm_hour); > + else if > + snprintf (buf, len, "%02dy%02dw%dd", > + tm->tm_year - 70, tm->tm_yday/7, > + tm->tm_yday - ((tm->tm_yday/7) * 7)); > return buf; > } > > -- > 2.1.0 > > > _______________________________________________ > Quagga-dev mailing list > [email protected] > https://lists.quagga.net/mailman/listinfo/quagga-dev >
_______________________________________________ Quagga-dev mailing list [email protected] https://lists.quagga.net/mailman/listinfo/quagga-dev
