summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org </C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org>2007-07-24 05:55:12 +0000
committer/C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org </C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org>2007-07-24 05:55:12 +0000
commit25ee718700952ea8e3e154ba15df5cd4d8994428 (patch)
tree54a3e393b567200f07ca377eb8f5c615a714c6f0
parent3f7f9a483b6405d6a2debf16db27182443f483a0 (diff)
Moves IPPROTO_* and IP[6]T_LIB_DIR definitions to xtables.h
-rw-r--r--include/ip6tables.h12
-rw-r--r--include/iptables.h12
-rw-r--r--include/xtables.h14
3 files changed, 16 insertions, 22 deletions
diff --git a/include/ip6tables.h b/include/ip6tables.h
index 90e3283..b0de395 100644
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -7,17 +7,7 @@
#include "libiptc/libip6tc.h"
#ifndef IP6T_LIB_DIR
-#define IP6T_LIB_DIR "/usr/local/lib/iptables"
-#endif
-
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
-#ifndef IPPROTO_DCCP
-#define IPPROTO_DCCP 33
-#endif
-#ifndef IPPROTO_UDPLITE
-#define IPPROTO_UDPLITE 136
+#define IP6T_LIB_DIR XT_LIB_DIR
#endif
#ifndef IP6T_SO_GET_REVISION_MATCH /* Old kernel source. */
diff --git a/include/iptables.h b/include/iptables.h
index 1f92977..83b7363 100644
--- a/include/iptables.h
+++ b/include/iptables.h
@@ -6,17 +6,7 @@
#include "libiptc/libiptc.h"
#ifndef IPT_LIB_DIR
-#define IPT_LIB_DIR "/usr/local/lib/iptables"
-#endif
-
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
-#ifndef IPPROTO_DCCP
-#define IPPROTO_DCCP 33
-#endif
-#ifndef IPPROTO_UDPLITE
-#define IPPROTO_UDPLITE 136
+#define IPT_LIB_DIR XT_LIB_DIR
#endif
#ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */
diff --git a/include/xtables.h b/include/xtables.h
index 5ae3001..43de25c 100644
--- a/include/xtables.h
+++ b/include/xtables.h
@@ -5,6 +5,20 @@
#include <linux/netfilter/x_tables.h>
#include <libiptc/libxtc.h>
+#ifndef XT_LIB_DIR
+#define XT_LIB_DIR "/usr/local/lib/iptables"
+#endif
+
+#ifndef IPPROTO_SCTP
+#define IPPROTO_SCTP 132
+#endif
+#ifndef IPPROTO_DCCP
+#define IPPROTO_DCCP 33
+#endif
+#ifndef IPPROTO_UDPLITE
+#define IPPROTO_UDPLITE 136
+#endif
+
/* protocol family dependent informations */
struct afinfo {
/* protocol family */