[netfilter-cvslog] r6335 - trunk/libnetfilter_conntrack/include/libnetfilter_conntrack

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2005-12-21 10:02:49 +0100 (Wed, 21 Dec 2005)
New Revision: 6335

Modified:
   trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
Log:
Yasuyuki confirmed that l3protonum must be u_int8_t instead of u_int16t.
Another reason to use such type: the nfnetlink header uses u_int8_t to set
the layer 3 protocol family, so let's keep some consistency.



Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2005-12-19 20:46:36 UTC (rev 6334)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2005-12-21 09:02:49 UTC (rev 6335)
@@ -50,18 +50,16 @@
 	} sctp;
 };
 
+union nfct_address {
+	u_int32_t v4;
+	u_int32_t v6[4];
+};
+
 struct nfct_tuple {
-	union {
-		u_int32_t v4;
-		u_int32_t v6[4];
-	} src;
+	union nfct_address src;
+	union nfct_address dst;
 
-	union {
-		u_int32_t v4;
-		u_int32_t v6[4];
-	} dst;
-
-	u_int16_t l3protonum;
+	u_int8_t l3protonum;
 	u_int8_t protonum;
 	union nfct_l4 l4src;
 	union nfct_l4 l4dst;