iptables: remove usage of xt_id

[project/firewall3.git] / iptables.h

diff --git a/iptables.h b/iptables.h
index 892a0d45e31abb92cd4490cdd9ea1aada2c3c4e6..a2c733dce7d0f51230444d238d6343a36fcd85b0 100644 (file)
--- a/iptables.h
+++ b/iptables.h
@@ -19,6 +19,8 @@
 #ifndef __FW3_IPTABLES_H
 #define __FW3_IPTABLES_H
 
+#define _GNU_SOURCE /* RTLD_NEXT */
+
 #include <libiptc/libiptc.h>
 #include <libiptc/libip6tc.h>
 #include <xtables.h>
@@ -30,11 +32,8 @@
 
 #include "options.h"
 
-#define FW3_ID_MAGIC   0x66773300      /* 'f' 'w' '3' */
-#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"
@@ -42,10 +41,16 @@
 # error "Unsupported xtables version"
 #endif
 
+#ifndef DISABLE_STATIC_EXTENSIONS
 /* libipt*ext.so interfaces */
 extern void init_extensions(void);
 extern void init_extensions4(void);
 extern void init_extensions6(void);
+#else
+static inline void init_extensions(void) { }
+static inline void init_extensions4(void) { }
+static inline void init_extensions6(void) { }
+#endif
 
 /* Required by certain extensions like SNAT and DNAT */
 extern int kernel_version;
@@ -68,8 +73,6 @@ struct fw3_ipt_rule {
        struct xtables_rule_match *matches;
        struct xtables_target *target;
 
-       int id;
-
        int argc;
        char **argv;