libxtables: decouple non-xtables parts from header

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/.gitignore b/.gitignore
index 116de2c347ba68c5618d69c47bc7e5fd85d9d67f..97c30045dd35ad922ed9c77bc79c9b173fcbfa53 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@ Makefile.in
 /extensions/targets?.man
 
 /include/xtables.h
-/include/xtables/internal.h
+/include/iptables/internal.h
 
 /aclocal.m4
 /autom4te*.cache

diff --git a/Makefile.am b/Makefile.am
index 23489762ff042c7db517d73184a97e592bfe3dd0..0e247176af5a7e68bae768fbf3dd0a8b616c75e1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,7 +105,7 @@ tarball:
        tar -C /tmp -cjf ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.bz2 --owner=root --group=root ${PACKAGE_TARNAME}-${PACKAGE_VERSION}/;
        rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION};
 
-config.status: include/xtables.h.in
+config.status: include/xtables.h.in include/iptables/internal.h.in
 
 # ldconfig may fail when we are not root (as is the case in build systems)
 # so add appropriate protection that it does not let `make` fail.

diff --git a/configure.ac b/configure.ac
index bb32130c791163040c73169b5673facdd1511312..888ba4293903b9f832c0226f5a9293ec0056234b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,5 +79,5 @@ libxtables_vmajor=$(($libxtables_vcurrent - $libxtables_vage));
 AC_SUBST([libxtables_vmajor])
 
 AC_CONFIG_FILES([Makefile extensions/GNUmakefile libipq/Makefile
-       include/xtables.h include/xtables/internal.h xtables.pc])
+       include/xtables.h include/iptables/internal.h xtables.pc])
 AC_OUTPUT

diff --git a/include/ip6tables.h b/include/ip6tables.h
index 1956cf0693f8607a5830fa9143de54483cb2283c..663da9caae19fe8f24ad8d1d586c11f642de9192 100644 (file)
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -4,6 +4,7 @@
 #include <netinet/ip.h>
 #include <xtables.h>
 #include <libiptc/libip6tc.h>
+#include <iptables/internal.h>
 
 #ifndef IP6T_SO_GET_REVISION_MATCH /* Old kernel source. */
 #define IP6T_SO_GET_REVISION_MATCH     68

diff --git a/include/iptables.h b/include/iptables.h
index f7ae0cc5f6e14e91ae6b4716baba425aaa5a7211..ee769a585b08464b72a51ef29ef05c1c7a72d1e3 100644 (file)
--- a/include/iptables.h
+++ b/include/iptables.h
@@ -4,6 +4,7 @@
 #include <netinet/ip.h>
 #include <xtables.h>
 #include <libiptc/libiptc.h>
+#include <iptables/internal.h>
 
 #ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */
 #define IPT_SO_GET_REVISION_MATCH      (IPT_BASE_CTL + 2)

diff --git a/include/xtables/internal.h.in b/include/iptables/internal.h.in
similarity index 54%
rename from include/xtables/internal.h.in
rename to include/iptables/internal.h.in
index 5e34694ae0b951aa17a160e5c19f11dfc2305d4a..849e1722389f83b251e165484bfe31815d7676b5 100644 (file)
--- a/include/xtables/internal.h.in
+++ b/include/iptables/internal.h.in
@@ -1,5 +1,5 @@
-#ifndef _XTABLES_INTERNAL_H
-#define _XTABLES_INTERNAL_H 1
+#ifndef IPTABLES_INTERNAL_H
+#define IPTABLES_INTERNAL_H 1
 
 #define IPTABLES_VERSION "@PACKAGE_VERSION@"
 
@@ -8,6 +8,4 @@
  */
 extern const char *program_name, *program_version;
 
-extern void _init(void);
-
-#endif /* _XTABLES_INTERNAL_H */
+#endif /* IPTABLES_INTERNAL_H */

diff --git a/include/xtables.h.in b/include/xtables.h.in
index 02750fb9736742ea2516fae5cedc352f2c8773fe..1455e9cdee595c3b23dd232066592b6f966c0259 100644 (file)
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -258,10 +258,15 @@ extern const struct xtables_pprot xtables_chain_protos[];
 extern u_int16_t xtables_parse_protocol(const char *s);
 
 #ifdef XTABLES_INTERNAL
+
+/* Shipped modules rely on this... */
+
 #      ifndef ARRAY_SIZE
 #              define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
 #      endif
-#      include <xtables/internal.h>
+
+extern void _init(void);
+
 #endif
 
 #endif /* _XTABLES_H */