[IPTABLES] [PATCH] fix ipt_conntrack leftover

[IPTABLES] [PATCH] fix ipt_conntrack leftover

[Pablo Neira]

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

This patch is for iptables.

someone forgot to update ipt_conntrack.h header in user space. So, 
update it to use ip_conntrack_old_tuple.

--
Pablo

[-- Attachment #2: x --]
[-- Type: text/plain, Size: 916 bytes --]

Index: include/linux/netfilter_ipv4/ipt_conntrack.h
===================================================================
--- include/linux/netfilter_ipv4/ipt_conntrack.h	(revision 3827)
+++ include/linux/netfilter_ipv4/ipt_conntrack.h	(working copy)
@@ -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

Re: [IPTABLES] [PATCH] fix ipt_conntrack leftover

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]

On Fri, Apr 08, 2005 at 10:42:09AM +0200, Pablo Neira wrote:
> This patch is for iptables.
> 
> someone forgot to update ipt_conntrack.h header in user space. So,
> update it to use ip_conntrack_old_tuple.

thanks, applied.
-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]