diff options
| author | Eric Leblond <eric@regit.org> | 2012-12-26 22:58:04 +0100 |
|---|---|---|
| committer | Eric Leblond <eric@regit.org> | 2012-12-26 23:28:07 +0100 |
| commit | 1266152b9ada2b0555274c894c24aadbdf52e397 (patch) | |
| tree | 7654e36d07eb3c94cbc2d05c76179f7e5729b91b /src | |
| parent | 6eabc608991c1383557c8e0abbd1506bb41b78dc (diff) | |
Fix packets and bytes inversion.
Pkts and bytes are inversed in some part of the code. This patch
fixes most of the occurence of this problem.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnetfilter_acct.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libnetfilter_acct.c b/src/libnetfilter_acct.c index 6a3a839..0abaeac 100644 --- a/src/libnetfilter_acct.c +++ b/src/libnetfilter_acct.c @@ -106,11 +106,11 @@ nfacct_attr_set(struct nfacct *nfacct, enum nfacct_attr_type type, nfacct->bitset |= (1 << NFACCT_ATTR_NAME); break; case NFACCT_ATTR_PKTS: - nfacct->bytes = *((uint64_t *) data); + nfacct->pkts = *((uint64_t *) data); nfacct->bitset |= (1 << NFACCT_ATTR_PKTS); break; case NFACCT_ATTR_BYTES: - nfacct->pkts = *((uint64_t *) data); + nfacct->bytes = *((uint64_t *) data); nfacct->bitset |= (1 << NFACCT_ATTR_BYTES); break; } @@ -237,9 +237,9 @@ nfacct_snprintf_plain(char *buf, size_t rem, struct nfacct *nfacct, ret = snprintf(buf, rem, "{ pkts = %.20llu, bytes = %.20llu } = %s;", (unsigned long long) - nfacct_attr_get_u64(nfacct, NFACCT_ATTR_BYTES), - (unsigned long long) nfacct_attr_get_u64(nfacct, NFACCT_ATTR_PKTS), + (unsigned long long) + nfacct_attr_get_u64(nfacct, NFACCT_ATTR_BYTES), nfacct_attr_get_str(nfacct, NFACCT_ATTR_NAME)); } else { ret = snprintf(buf, rem, "%s\n", @@ -426,7 +426,7 @@ void nfacct_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfacct *nfacct) mnl_attr_put_u64(nlh, NFACCT_PKTS, htobe64(nfacct->pkts)); if (nfacct->bitset & (1 << NFACCT_ATTR_BYTES)) - mnl_attr_put_u64(nlh, NFACCT_PKTS, htobe64(nfacct->bytes)); + mnl_attr_put_u64(nlh, NFACCT_BYTES, htobe64(nfacct->bytes)); } EXPORT_SYMBOL(nfacct_nlmsg_build_payload); |