iptables: add support for version 1.6.0

Account for the struct xtables_globals change and add API version 11 to
the supported APIs.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>

diff --git a/iptables.c b/iptables.c
index 2a0d0ee29f453dba28025a269c917e76f9f7bb2c..95fc0d45835d565217d8caad63dc4486a92c426b 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -29,12 +29,18 @@ static struct xtables_globals xtg = {
        .option_offset = 0,
        .program_version = "4",
        .orig_opts = base_opts,
+#if XTABLES_VERSION_CODE > 10
+       .compat_rev = xtables_compatible_revision,
+#endif
 };
 
 static struct xtables_globals xtg6 = {
        .option_offset = 0,
        .program_version = "6",
        .orig_opts = base_opts,
+#if XTABLES_VERSION_CODE > 10
+       .compat_rev = xtables_compatible_revision,
+#endif
 };
 
 static struct {

diff --git a/iptables.h b/iptables.h
index 892a0d45e31abb92cd4490cdd9ea1aada2c3c4e6..bcd302d841d145208254e933d1ae062a0948c3bb 100644 (file)
--- a/iptables.h
+++ b/iptables.h
@@ -34,7 +34,7 @@
 #define FW3_ID_MASK            0xffffff00
 
 /* xtables interface */
-#if (XTABLES_VERSION_CODE == 10)
+#if (XTABLES_VERSION_CODE == 10 || XTABLES_VERSION_CODE == 11)
 # include "xtables-10.h"
 #elif (XTABLES_VERSION_CODE == 5)
 # include "xtables-5.h"