From 6b5effcaf26b9eaf8e6f63d9ad3570a045fb4f0c Mon Sep 17 00:00:00 2001 From: Harald WeltePablo Neira Date: Fri, 15 Apr 2005 09:35:50 +0000 Subject: omeone forgot to update ipt_conntrack.h header in user space. So, update it to use ip_conntrack_old_tuple. (Pablo Neira) --- include/linux/netfilter_ipv4/ipt_conntrack.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'include/linux/netfilter_ipv4') diff --git a/include/linux/netfilter_ipv4/ipt_conntrack.h b/include/linux/netfilter_ipv4/ipt_conntrack.h index 98770212..de1c81ff 100644 --- a/include/linux/netfilter_ipv4/ipt_conntrack.h +++ b/include/linux/netfilter_ipv4/ipt_conntrack.h @@ -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 -- cgit v1.2.3