vserver 1.9.5.x5

[linux-2.6.git] / include / linux / netfilter_ipv4 / ipt_conntrack.h

diff --git a/include/linux/netfilter_ipv4/ipt_conntrack.h b/include/linux/netfilter_ipv4/ipt_conntrack.h
index 5f2e911..413c565 100644 (file)
--- 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 {
+               __u32 ip;
+               union {
+                       __u16 all;
+               } u;
+       } src;
+
+       struct {
+               __u32 ip;
+               union {
+                       __u16 all;
+               } u;
+
+               /* The protocol. */
+               u16 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];
 
        unsigned long expires_min, expires_max;