summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
author/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net </C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net>2007-04-18 07:00:36 +0000
committer/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net </C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net>2007-04-18 07:00:36 +0000
commit0683cde43e5e8851c5c66bde60a175c70818872d (patch)
tree2113b4b2f9ce713701631cd87f225cdec9f956bd /extensions
parent33ca7c7198cfd4aac92350765b4dd12ab8ce0211 (diff)
Use nf_conntrack headers instead of ip_conntrack ones and add sanitized versions.
Diffstat (limited to 'extensions')
-rw-r--r--extensions/libip6t_state.c2
-rw-r--r--extensions/libipt_DNAT.c2
-rw-r--r--extensions/libipt_MASQUERADE.c2
-rw-r--r--extensions/libipt_NETMAP.c2
-rw-r--r--extensions/libipt_REDIRECT.c2
-rw-r--r--extensions/libipt_SAME.c2
-rw-r--r--extensions/libipt_SNAT.c2
-rw-r--r--extensions/libipt_connbytes.c2
-rw-r--r--extensions/libipt_connrate.c2
-rw-r--r--extensions/libipt_conntrack.c2
-rw-r--r--extensions/libipt_state.c2
11 files changed, 11 insertions, 11 deletions
diff --git a/extensions/libip6t_state.c b/extensions/libip6t_state.c
index 84fd1a4..a4477ce 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 bdc15eb..3cf839e 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 e06333a..48cff9a 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 8cecb4d..4b4b14d 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 13195b0..c94bb59 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 625a78a..4bbed90 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 3614739..d52c181 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 42e1ab5..f6439c2 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 47c5fcb..5abe3c4 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 cdb86c4..f187e41 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 acafe9a..6a784ff 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