From 40d54756cd8a2705e22b36f7aef03bb2c472a10b Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 18 Apr 2007 07:00:36 +0000
Subject: Use nf_conntrack headers instead of ip_conntrack ones and add
 sanitized versions.

---
 extensions/libip6t_state.c     | 2 +-
 extensions/libipt_DNAT.c       | 2 +-
 extensions/libipt_MASQUERADE.c | 2 +-
 extensions/libipt_NETMAP.c     | 2 +-
 extensions/libipt_REDIRECT.c   | 2 +-
 extensions/libipt_SAME.c       | 2 +-
 extensions/libipt_SNAT.c       | 2 +-
 extensions/libipt_connbytes.c  | 2 +-
 extensions/libipt_connrate.c   | 2 +-
 extensions/libipt_conntrack.c  | 2 +-
 extensions/libipt_state.c      | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'extensions')

diff --git a/extensions/libip6t_state.c b/extensions/libip6t_state.c
index 84fd1a43..a4477cec 100644
--- a/extensions/libip6t_state.c
+++ b/extensions/libip6t_state.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <ip6tables.h>
-#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter/nf_conntrack_common.h>
 #include <linux/netfilter_ipv4/ipt_state.h>
 
 #ifndef IPT_STATE_UNTRACKED
diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c
index bdc15eb8..3cf839e6 100644
--- a/extensions/libipt_DNAT.c
+++ b/extensions/libipt_DNAT.c
@@ -6,7 +6,7 @@
 #include <getopt.h>
 #include <iptables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ip_nat_rule.h>
+#include <linux/netfilter/nf_nat.h>
 
 /* Dest NAT data consists of a multi-range, indicating where to map
    to. */
diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c
index e06333ab..48cff9a8 100644
--- a/extensions/libipt_MASQUERADE.c
+++ b/extensions/libipt_MASQUERADE.c
@@ -6,7 +6,7 @@
 #include <getopt.h>
 #include <iptables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ip_nat_rule.h>
+#include <linux/netfilter/nf_nat.h>
 
 /* Function which prints out usage message. */
 static void
diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c
index 8cecb4d3..4b4b14dd 100644
--- a/extensions/libipt_NETMAP.c
+++ b/extensions/libipt_NETMAP.c
@@ -9,7 +9,7 @@
 #include <getopt.h>
 #include <iptables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ip_nat_rule.h>
+#include <linux/netfilter/nf_nat.h>
 
 #define MODULENAME "NETMAP"
 
diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c
index 13195b0c..c94bb592 100644
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -6,7 +6,7 @@
 #include <getopt.h>
 #include <iptables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ip_nat_rule.h>
+#include <linux/netfilter/nf_nat.h>
 
 /* Function which prints out usage message. */
 static void
diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c
index 625a78a7..4bbed908 100644
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -6,7 +6,7 @@
 #include <getopt.h>
 #include <iptables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ip_nat_rule.h>
+#include <linux/netfilter/nf_nat.h>
 /* For 64bit kernel / 32bit userspace */
 #include "../include/linux/netfilter_ipv4/ipt_SAME.h"
 
diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c
index 36147397..d52c1810 100644
--- a/extensions/libipt_SNAT.c
+++ b/extensions/libipt_SNAT.c
@@ -6,7 +6,7 @@
 #include <getopt.h>
 #include <iptables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ip_nat_rule.h>
+#include <linux/netfilter/nf_nat.h>
 
 #define IPT_SNAT_OPT_SOURCE 0x01
 #ifdef IP_NAT_RANGE_PROTO_RANDOM
diff --git a/extensions/libipt_connbytes.c b/extensions/libipt_connbytes.c
index 42e1ab57..f6439c2d 100644
--- a/extensions/libipt_connbytes.c
+++ b/extensions/libipt_connbytes.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <iptables.h>
-#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter/nf_conntrack_common.h>
 #include <linux/netfilter_ipv4/ipt_connbytes.h>
 
 /* Function which prints out usage message. */
diff --git a/extensions/libipt_connrate.c b/extensions/libipt_connrate.c
index 47c5fcbb..5abe3c4d 100644
--- a/extensions/libipt_connrate.c
+++ b/extensions/libipt_connrate.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <iptables.h>
-#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter/nf_conntrack_common.h>
 #include <linux/netfilter_ipv4/ipt_connrate.h>
 
 /* Function which prints out usage message. */
diff --git a/extensions/libipt_conntrack.c b/extensions/libipt_conntrack.c
index cdb86c4e..f187e41d 100644
--- a/extensions/libipt_conntrack.c
+++ b/extensions/libipt_conntrack.c
@@ -9,7 +9,7 @@
 #include <getopt.h>
 #include <ctype.h>
 #include <iptables.h>
-#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter/nf_conntrack_common.h>
 #include <linux/netfilter_ipv4/ip_conntrack_tuple.h>
 /* For 64bit kernel / 32bit userspace */
 #include "../include/linux/netfilter_ipv4/ipt_conntrack.h"
diff --git a/extensions/libipt_state.c b/extensions/libipt_state.c
index acafe9a7..6a784ffc 100644
--- a/extensions/libipt_state.c
+++ b/extensions/libipt_state.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <iptables.h>
-#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter/nf_conntrack_common.h>
 #include <linux/netfilter_ipv4/ipt_state.h>
 
 #ifndef IPT_STATE_UNTRACKED
-- 
cgit v1.2.3