From 63965deb5fff9f06b72dd71abf6596d46cdfea5c Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org" Date: Tue, 29 May 2007 15:10:45 +0000 Subject: add support for 64 bits counters (Krzysztof Oledzki) --- src/conntrack/parse.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/conntrack/parse.c b/src/conntrack/parse.c index b9bc095..db04789 100644 --- a/src/conntrack/parse.c +++ b/src/conntrack/parse.c @@ -182,10 +182,18 @@ static void __parse_counters(const struct nfattr *attr, struct nfattr *tb[CTA_COUNTERS_MAX]; nfnl_parse_nested(tb, CTA_COUNTERS_MAX, attr); - if (tb[CTA_COUNTERS32_PACKETS-1]) { - ct->counters[dir].packets - = ntohl(*(u_int32_t *) - NFA_DATA(tb[CTA_COUNTERS32_PACKETS-1])); + if (tb[CTA_COUNTERS_PACKETS-1] || tb[CTA_COUNTERS32_PACKETS-1]) { + + if (tb[CTA_COUNTERS32_PACKETS-1]) + ct->counters[dir].packets + = ntohl(*(u_int32_t *) + NFA_DATA(tb[CTA_COUNTERS32_PACKETS-1])); + + if (tb[CTA_COUNTERS_PACKETS-1]) + ct->counters[dir].packets + = __be64_to_cpu(*(u_int64_t *) + NFA_DATA(tb[CTA_COUNTERS_PACKETS-1])); + switch(dir) { case __DIR_ORIG: set_bit(ATTR_ORIG_COUNTER_PACKETS, ct->set); @@ -195,10 +203,18 @@ static void __parse_counters(const struct nfattr *attr, break; } } - if (tb[CTA_COUNTERS32_BYTES-1]) { - ct->counters[dir].bytes - = ntohl(*(u_int32_t *) - NFA_DATA(tb[CTA_COUNTERS32_BYTES-1])); + if (tb[CTA_COUNTERS_BYTES-1] || tb[CTA_COUNTERS32_BYTES-1]) { + + if (tb[CTA_COUNTERS32_BYTES-1]) + ct->counters[dir].bytes + = ntohl(*(u_int32_t *) + NFA_DATA(tb[CTA_COUNTERS32_BYTES-1])); + + if (tb[CTA_COUNTERS_BYTES-1]) + ct->counters[dir].bytes + = __be64_to_cpu(*(u_int64_t *) + NFA_DATA(tb[CTA_COUNTERS_BYTES-1])); + switch(dir) { case __DIR_ORIG: set_bit(ATTR_ORIG_COUNTER_BYTES, ct->set); -- cgit v1.2.3