lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20140825144808.25459645@urahara> Date: Mon, 25 Aug 2014 14:48:08 -0700 From: Stephen Hemminger <stephen@...workplumber.org> To: Eric Dumazet <eric.dumazet@...il.com> Cc: netdev <netdev@...r.kernel.org> Subject: Re: [PATCH iproute2] nstat: 64bit support on 32bit arches On Mon, 25 Aug 2014 07:27:54 -0700 Eric Dumazet <eric.dumazet@...il.com> wrote: > From: Eric Dumazet <edumazet@...gle.com> > > SNMP counters can be provided as 64bit numbers. > nstat needs to cope with this even if running in 32bit mode. > > Signed-off-by: Eric Dumazet <edumazet@...gle.com> > --- > misc/nstat.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/misc/nstat.c b/misc/nstat.c > index d3f8621..e54b3ae 100644 > --- a/misc/nstat.c > +++ b/misc/nstat.c > @@ -77,7 +77,6 @@ struct nstat_ent > struct nstat_ent *next; > char *id; > unsigned long long val; > - unsigned long ival; > double rate; > }; > > @@ -143,7 +142,6 @@ static void load_good_table(FILE *fp) > if ((n = malloc(sizeof(*n))) == NULL) > abort(); > n->id = strdup(idbuf); > - n->ival = (unsigned long)val; > n->val = val; > n->rate = rate; > n->next = db; > @@ -206,9 +204,8 @@ static void load_ugly_table(FILE *fp) > if (!p) > abort(); > *p = 0; > - if (sscanf(p+1, "%lu", &n->ival) != 1) > + if (sscanf(p+1, "%llu", &n->val) != 1) > abort(); > - n->val = n->ival; > /* Trick to skip "dummy" trailing ICMP MIB in 2.4 */ > if (strcmp(idbuf, "IcmpOutAddrMaskReps") == 0) > idbuf[5] = 0; > @@ -365,10 +362,10 @@ static void update_db(int interval) > for (h1 = h; h1; h1 = h1->next) { > if (strcmp(h1->id, n->id) == 0) { > double sample; > - unsigned long incr = h1->ival - n->ival; > - n->val += incr; > - n->ival = h1->ival; > - sample = (double)(incr*1000)/interval; > + unsigned long long incr = h1->val - n->val; > + > + n->val = h1->val; > + sample = (double)incr * 1000.0 / interval; > if (interval >= scan_interval) { > n->rate += W*(sample-n->rate); > } else if (interval >= 1000) { > > Maybe time to convert to using uint64_t and the printf formats in inttypes.h -- 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