[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20071221061848.aefa4e6c.billfink@mindspring.com>
Date: Fri, 21 Dec 2007 06:18:48 -0500
From: Bill Fink <billfink@...dspring.com>
To: YOSHIFUJI Hideaki /
____________ <yoshfuji@...ux-ipv6.org>
Cc: satoru.satoh@...il.com, shemminger@...ux-foundation.org,
netdev@...r.kernel.org
Subject: Re: [PATCH] [IPROUTE]: A workaround to make larger rto_min printed
correctly
On Fri, 21 Dec 2007, YOSHIFUJI Hideaki wrote:
> In article <d72b7ace0712201824k3754962cse377256cb5452b8a@...l.gmail.com> (at Fri, 21 Dec 2007 11:24:54 +0900), "Satoru SATOH" <satoru.satoh@...il.com> says:
>
> > 2007/12/21, Jarek Poplawski <jarkao2@...il.com>:
> > > Jarek Poplawski wrote, On 12/20/2007 09:24 PM:
> > > ...
> > >
> > > > but since it's your patch, I hope you do some additional checking
> > > > if it's always like this...
> > >
> > >
> > > ...or maybe only changing this all a little bit will make it look safer!
> > >
> > > Jarek P.
> >
> >
> > OK, how about this?
> >
> > Signed-off-by: Satoru SATOH <satoru.satoh@...il.com>
> >
> > ip/iproute.c | 12 ++++++++----
> > 1 files changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/ip/iproute.c b/ip/iproute.c
> > index f4200ae..c771b34 100644
> > --- a/ip/iproute.c
> > +++ b/ip/iproute.c
> > @@ -510,16 +510,20 @@ int print_route(const struct sockaddr_nl *who,
> > struct nlmsghdr *n, void *arg)
> > fprintf(fp, " %u", *(unsigned*)RTA_DATA(mxrta[i]));
> > else {
> > unsigned val = *(unsigned*)RTA_DATA(mxrta[i]);
> > + unsigned hz1 = hz;
> > + if (hz1 > 1000)
>
> Why don't you simply use unsigned long long (or maybe uint64_t) here?
I was wondering that too. And maybe change the "(float)" cast
to "(double)" in the fprintf.
-Bill
> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org>
>
> ---
> diff --git a/ip/iproute.c b/ip/iproute.c
> index f4200ae..db9a3b6 100644
> --- a/ip/iproute.c
> +++ b/ip/iproute.c
> @@ -509,16 +509,21 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
> i != RTAX_RTO_MIN)
> fprintf(fp, " %u", *(unsigned*)RTA_DATA(mxrta[i]));
> else {
> - unsigned val = *(unsigned*)RTA_DATA(mxrta[i]);
> + unsigned long long val = *(unsigned*)RTA_DATA(mxrta[i]);
> + unsigned div = 1;
>
> - val *= 1000;
> if (i == RTAX_RTT)
> - val /= 8;
> + div = 8;
> else if (i == RTAX_RTTVAR)
> - val /= 4;
> - if (val >= hz)
> - fprintf(fp, " %ums", val/hz);
> + div = 4;
> else
> + div = 1;
> +
> + val = val * 1000ULL / div;
> +
> + if (val >= hz) {
> + fprintf(fp, " %llums", val/hz);
> + } else
> fprintf(fp, " %.2fms", (float)val/hz);
> }
> }
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists