iptables-1.3.2-20050720

[iptables.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 eb97456..eba410d 100644 (file)
--- a/include/linux/netfilter_ipv4/ipt_conntrack.h
+++ b/include/linux/netfilter_ipv4/ipt_conntrack.h
@@ -5,11 +5,29 @@
 #ifndef _IPT_CONNTRACK_H
 #define _IPT_CONNTRACK_H
 
+#include <linux/netfilter_ipv4/ip_conntrack.h>
+
+/* backwards compatibility crap. only exists in userspace - HW */
+#include <linux/version.h>
+#ifndef KERNEL_VERSION
+#define KERNEL_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
+#define IPS_EXPECTED   (1 << 0)
+#define IPS_SEEN_REPLY (1 << 1)
+#define IPS_ASSURED    (1 << 2)
+#define IP_CT_DIR_ORIGINAL     0
+#define IP_CT_DIR_REPLY                1
+#define IP_CT_DIR_MAX          2
+#endif
+
 #define IPT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1))
 #define IPT_CONNTRACK_STATE_INVALID (1 << 0)
 
 #define IPT_CONNTRACK_STATE_SNAT (1 << (IP_CT_NUMBER + 1))
 #define IPT_CONNTRACK_STATE_DNAT (1 << (IP_CT_NUMBER + 2))
+#define IPT_CONNTRACK_STATE_UNTRACKED (1 << (IP_CT_NUMBER + 3))
 
 /* flags, invflags: */
 #define IPT_CONNTRACK_STATE    0x01
@@ -21,14 +39,39 @@
 #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
+       unsigned long long expires_min, expires_max;
+#else
        unsigned long expires_min, expires_max;
+#endif
 
        /* Flags word */
        u_int8_t flags;
@@ -36,4 +79,3 @@ struct ipt_conntrack_info
        u_int8_t invflags;
 };
 #endif /*_IPT_CONNTRACK_H*/
-