Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[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 413c565..cde6762 100644 (file)
--- a/include/linux/netfilter_ipv4/ipt_conntrack.h
+++ b/include/linux/netfilter_ipv4/ipt_conntrack.h
@@ -5,56 +5,24 @@
 #ifndef _IPT_CONNTRACK_H
 #define _IPT_CONNTRACK_H
 
-#define IPT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1))
-#define IPT_CONNTRACK_STATE_INVALID (1 << 0)
+#include <linux/netfilter/xt_conntrack.h>
 
-#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))
+#define IPT_CONNTRACK_STATE_BIT(ctinfo) XT_CONNTRACK_STATE_BIT(ctinfo)
+#define IPT_CONNTRACK_STATE_INVALID    XT_CONNTRACK_STATE_INVALID
 
-/* flags, invflags: */
-#define IPT_CONNTRACK_STATE    0x01
-#define IPT_CONNTRACK_PROTO    0x02
-#define IPT_CONNTRACK_ORIGSRC  0x04
-#define IPT_CONNTRACK_ORIGDST  0x08
-#define IPT_CONNTRACK_REPLSRC  0x10
-#define IPT_CONNTRACK_REPLDST  0x20
-#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;
-};
+#define IPT_CONNTRACK_STATE_SNAT       XT_CONNTRACK_STATE_SNAT
+#define IPT_CONNTRACK_STATE_DNAT       XT_CONNTRACK_STATE_DNAT
+#define IPT_CONNTRACK_STATE_UNTRACKED  XT_CONNTRACK_STATE_UNTRACKED
 
-struct ipt_conntrack_info
-{
-       unsigned int statemask, statusmask;
-
-       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;
-
-       /* Flags word */
-       u_int8_t flags;
-       /* Inverse flags */
-       u_int8_t invflags;
-};
+/* flags, invflags: */
+#define IPT_CONNTRACK_STATE            XT_CONNTRACK_STATE
+#define IPT_CONNTRACK_PROTO            XT_CONNTRACK_PROTO
+#define IPT_CONNTRACK_ORIGSRC          XT_CONNTRACK_ORIGSRC
+#define IPT_CONNTRACK_ORIGDST          XT_CONNTRACK_ORIGDST
+#define IPT_CONNTRACK_REPLSRC          XT_CONNTRACK_REPLSRC
+#define IPT_CONNTRACK_REPLDST          XT_CONNTRACK_REPLDST
+#define IPT_CONNTRACK_STATUS           XT_CONNTRACK_STATUS
+#define IPT_CONNTRACK_EXPIRES          XT_CONNTRACK_EXPIRES
+
+#define ipt_conntrack_info             xt_conntrack_info
 #endif /*_IPT_CONNTRACK_H*/