Skip to contentSkip to conversation

nfacct: correct regressions in v1.0.1

PATCH In review Mr Dash Four 2 participants 6 messages Mar 5, 2013 – Mar 16, 2013 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfacct: correct regressions in v1.0.1

This patch fixes regressions present in v1.0.1, introduced as a result of commit d17c772c98057b2cc0118274605d292809ff6b1e.

---
 src/nfacct.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
src/nfacct.c +3 -2
index 4ce817d..21d4df8 100644
@@ -218,7 +218,8 @@ static int nfacct_cmd_list(int argc, char *argv[])
 	return 0;
 }
 
-static int _nfacct_cmd_add(char *name, int pkts, int bytes)
+static int _nfacct_cmd_add(char *name,
+			   long long unsigned pkts, long long unsigned bytes)
 {
 	struct mnl_socket *nl;
 	char buf[MNL_SOCKET_BUFFER_SIZE];
@@ -536,7 +537,7 @@ static int nfacct_cmd_restore(int argc, char *argv[])
 			return -1;
 		}
 		*semicolon = 0;
-		ret = sscanf(buffer, "{ pkts = %lu, bytes = %lu } = %s",
+		ret = sscanf(buffer, "{ pkts = %llu, bytes = %llu } = %s",
 		       &pkts, &bytes, name);
 		if (ret != 3) {
 			nfacct_perror("error reading input");
#1 lore raw
Quoted 13 lines · Mr Dash Four

This patch fixes regressions present in v1.0.1, introduced as a result of commit d17c772c98057b2cc0118274605d292809ff6b1e.

---
 src/nfacct.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
src/nfacct.c +0 -0
index 4ce817d..21d4df8 100644

src/nfacct.c static int nfacct_cmd_list(int argc, char *argv[]) · line 222

Quoted 6 lines
src/nfacct.c +2 -1
@@ -218,7 +218,8 @@ static int nfacct_cmd_list(int argc, char *argv[])
 	return 0;
 }
 
-static int _nfacct_cmd_add(char *name, int pkts, int bytes)
+static int _nfacct_cmd_add(char *name,
+			   long long unsigned pkts, long long unsigned bytes)

those are still signed, should be unsigned.

src/nfacct.c static int nfacct_cmd_restore(int argc, char *argv[]) · line 540

Quoted 9 lines
src/nfacct.c +1 -1
 {
 	struct mnl_socket *nl;
 	char buf[MNL_SOCKET_BUFFER_SIZE];
@@ -536,7 +537,7 @@ static int nfacct_cmd_restore(int argc, char *argv[])
 			return -1;
 		}
 		*semicolon = 0;
-		ret = sscanf(buffer, "{ pkts = %lu, bytes = %lu } = %s",
+		ret = sscanf(buffer, "{ pkts = %llu, bytes = %llu } = %s",

Better use %"PRIu64" given that we're using uint64_t.

I have applied a patch based on yours.

Thanks.

#2 lore raw
Quoted 8 lines

src/nfacct.c static int nfacct_cmd_list(int argc, char *argv[]) · line 222

Quoted 5 lines
src/nfacct.c +2 -1
-static int _nfacct_cmd_add(char *name, int pkts, int bytes)
+static int _nfacct_cmd_add(char *name,
+			   long long unsigned pkts, long long unsigned bytes)

those are still signed, should be unsigned.

Noted.

Quoted 6 lines

src/nfacct.c static int nfacct_cmd_restore(int argc, char *argv[]) · line 540

Quoted 3 lines
src/nfacct.c +1 -1
-		ret = sscanf(buffer, "{ pkts = %lu, bytes = %lu } = %s",
+		ret = sscanf(buffer, "{ pkts = %llu, bytes = %llu } = %s",

Better use %"PRIu64" given that we're using uint64_t.

You learn something new every day. If this is indeed the case, then another patch coming up in a minute.

Quoted 2 lines

I have applied a patch based on yours.

Thanks.

#3 lore raw

PATCH 1/1 libnetfilter_acct: use PRIu64 and remove unnecessary cast

In reply to Pablo Neira Ayuso

This patch corrects all nfacct_snprintf_* functions to use PRIu64, given that we are using uint64_t type variables and also removes the unnecessary casts.

---
 src/libnetfilter_acct.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
src/libnetfilter_acct.c +4 -7
index 0abaeac..ba89e2d 100644
@@ -13,6 +13,7 @@
 #include <endian.h>
 #include <stdlib.h>
 #include <string.h>
+#include <inttypes.h>
 
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nfnetlink.h>
@@ -235,10 +236,8 @@ nfacct_snprintf_plain(char *buf, size_t rem, struct nfacct *nfacct,
 
 	if (flags & NFACCT_SNPRINTF_F_FULL) {
 		ret = snprintf(buf, rem,
-			"{ pkts = %.20llu, bytes = %.20llu } = %s;",
-			(unsigned long long)
+			"{ pkts = %.20"PRIu64", bytes = %.20"PRIu64" } = %s;",
 			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 {
@@ -296,12 +295,10 @@ nfacct_snprintf_xml(char *buf, size_t rem, struct nfacct *nfacct,
 
 	ret = snprintf(buf, rem,
 			"<obj><name>%s</name>"
-			"<pkts>%.20llu</pkts>"
-			"<bytes>%.20llu</bytes>",
+			"<pkts>%.20"PRIu64"</pkts>"
+			"<bytes>%.20"PRIu64"</bytes>",
 			nfacct_attr_get_str(nfacct, NFACCT_ATTR_NAME),
-			(unsigned long long)
 			nfacct_attr_get_u64(nfacct, NFACCT_ATTR_BYTES),
-			(unsigned long long)
 			nfacct_attr_get_u64(nfacct, NFACCT_ATTR_PKTS));
 	BUFFER_SIZE(ret, size, rem, offset);
 
maintainer Applied
#4 lore raw

Re: [PATCH] libnetfilter_acct: use PRIu64 and remove unnecessary cast

Quoted 3 lines · Mr Dash Four

This patch corrects all nfacct_snprintf_* functions to use PRIu64, given that we are using uint64_t type variables and also removes the unnecessary casts.

Applied, thanks.

#5 lore raw

Re: [PATCH] libnetfilter_acct: use PRIu64 and remove unnecessary cast

Quoted 9 lines · Pablo Neira Ayuso
Quoted 4 lines · Mr Dash Four

This patch corrects all nfacct_snprintf_* functions to use PRIu64, given that we are using uint64_t type variables and also removes the unnecessary casts.

Applied, thanks.

Applied where Pablo? I can't see any commits done on the main libnetfilter_acct tree for 13 days?