Moves IPPROTO_* and IP[6]T_LIB_DIR definitions to xtables.h

diff --git a/include/ip6tables.h b/include/ip6tables.h
index 90e32836f9e41fec6ff7caca592767c5e1e8c543..b0de395d40b2d48e8ed6aaf922e5e1e1cbbf147c 100644 (file)
--- 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 1f929772bedce37fa0fd829b9326ba2a955bde04..83b7363b91bd997413cae0c6d0c3683bb0d3bc41 100644 (file)
--- 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 5ae30014a18085d01698cfd1c256c4a5d8260af8..43de25ce999d27a2354ecf7cac7a64155d25761d 100644 (file)
--- 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 */