[netfilter-cvslog] r3849 - trunk/iptables/include/linux/netfilter_ipv4

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-04-10 23:05:37 +0200 (Sun, 10 Apr 2005)
New Revision: 3849

Modified:
   trunk/iptables/include/linux/netfilter_ipv4/ipt_conntrack.h
Log:
omeone forgot to update ipt_conntrack.h header in user space. So, update it to use ip_conntrack_old_tuple. (Pablo Neira)


Modified: trunk/iptables/include/linux/netfilter_ipv4/ipt_conntrack.h
===================================================================
--- trunk/iptables/include/linux/netfilter_ipv4/ipt_conntrack.h	2005-04-10 21:05:03 UTC (rev 3848)
+++ trunk/iptables/include/linux/netfilter_ipv4/ipt_conntrack.h	2005-04-10 21:05:37 UTC (rev 3849)
@@ -22,11 +22,32 @@
 #define IPT_CONNTRACK_STATUS	0x40
 #define IPT_CONNTRACK_EXPIRES	0x80
 
+/* This is exposed to userspace, so remains frozen in time. */
+struct ip_conntrack_old_tuple
+{
+	struct {
+		u_int32_t ip;
+		union {
+			u_int16_t all;
+		} u;
+	} src;
+
+	struct {
+		u_int32_t ip;
+		union {
+			u_int16_t all;
+		} u;
+
+		/* The protocol. */
+		u_int16_t protonum;
+	} dst;
+};
+
 struct ipt_conntrack_info
 {
 	unsigned int statemask, statusmask;
 
-	struct ip_conntrack_tuple tuple[IP_CT_DIR_MAX];
+	struct ip_conntrack_old_tuple tuple[IP_CT_DIR_MAX];
 	struct in_addr sipmsk[IP_CT_DIR_MAX], dipmsk[IP_CT_DIR_MAX];
 
 #ifdef KERNEL_64_USERSPACE_32