From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Date: Fri, 4 Nov 2016 13:41:10 +0000 (+0100)
Subject: iptables: add support for version 1.6.0
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dd013720b42d6df91176dc9e87f815dcd5d69519;p=oweals%2Ffirewall3.git

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 2a0d0ee..95fc0d4 100644
--- 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 892a0d4..bcd302d 100644
--- 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"