[netfilter-cvslog] r6720 - in trunk/libnetfilter_conntrack/src: . conntrack

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2006-12-29 22:57:46 +0100 (Fri, 29 Dec 2006)
New Revision: 6720

Modified:
   trunk/libnetfilter_conntrack/src/conntrack/parse.c
   trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
Log:
Minor fix in the counter parsing: replace htonl by ntonl, anyway they are actually the same function so this should not break anything.



Modified: trunk/libnetfilter_conntrack/src/conntrack/parse.c
===================================================================
--- trunk/libnetfilter_conntrack/src/conntrack/parse.c	2006-12-29 21:21:45 UTC (rev 6719)
+++ trunk/libnetfilter_conntrack/src/conntrack/parse.c	2006-12-29 21:57:46 UTC (rev 6720)
@@ -193,7 +193,7 @@
 	nfnl_parse_nested(tb, CTA_COUNTERS_MAX, attr);
 	if (tb[CTA_COUNTERS32_PACKETS-1]) {
 		ct->counters[dir].packets
-			= htonl(*(u_int32_t *)
+			= ntohl(*(u_int32_t *)
 				NFA_DATA(tb[CTA_COUNTERS32_PACKETS-1]));
 		switch(dir) {
 		case __DIR_ORIG:
@@ -206,7 +206,7 @@
 	}
 	if (tb[CTA_COUNTERS32_BYTES-1]) {
 		ct->counters[dir].bytes
-			= htonl(*(u_int32_t *)
+			= ntohl(*(u_int32_t *)
 				NFA_DATA(tb[CTA_COUNTERS32_BYTES-1]));
 		switch(dir) {
 		case __DIR_ORIG:

Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2006-12-29 21:21:45 UTC (rev 6719)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2006-12-29 21:57:46 UTC (rev 6720)
@@ -476,11 +476,11 @@
 					NFA_DATA(tb[CTA_COUNTERS_BYTES-1]));
 	if (tb[CTA_COUNTERS32_PACKETS-1])
 		ct->counters[dir].packets
-			= htonl(*(u_int32_t *)
+			= ntohl(*(u_int32_t *)
 				NFA_DATA(tb[CTA_COUNTERS32_PACKETS-1]));
 	if (tb[CTA_COUNTERS32_BYTES-1])
 		ct->counters[dir].bytes
-			= htonl(*(u_int32_t *)
+			= ntohl(*(u_int32_t *)
 				NFA_DATA(tb[CTA_COUNTERS32_BYTES-1]));
 }