Decouple handle destroying from committing, add fw3_ipt_close() instead

[project/firewall3.git] / iptables.h

diff --git a/iptables.h b/iptables.h
index 4731104..b97e5c5 100644 (file)
--- a/iptables.h
+++ b/iptables.h
@@ -23,20 +23,62 @@
 #include <libiptc/libip6tc.h>
 #include <xtables.h>
 
+#include <dlfcn.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <sys/utsname.h>
 
 #include "options.h"
 
-
-extern struct xtables_match *xtables_pending_matches;
-extern struct xtables_target *xtables_pending_targets;
+/* xtables interface */
+#if (XTABLES_VERSION_CODE == 10)
+# include "xtables-10.h"
+#elif (XTABLES_VERSION_CODE == 5)
+# include "xtables-5.h"
+#else
+# error "Unsupported xtables version"
+#endif
 
 /* libext.a interface */
-void init_extensions(void);
-void init_extensions4(void);
-void init_extensions6(void);
+#define FW3_IPT_MODULES                        \
+       __ipt_module(comment)           \
+       __ipt_module(conntrack)         \
+       __ipt_module(icmp)                      \
+       __ipt_module(icmp6)                     \
+       __ipt_module(limit)                     \
+       __ipt_module(mac)                       \
+       __ipt_module(mark)                      \
+       __ipt_module(set)                       \
+       __ipt_module(standard)          \
+       __ipt_module(tcp)                       \
+       __ipt_module(time)                      \
+       __ipt_module(udp)                       \
+       __ipt_module(CT)                        \
+       __ipt_module(DNAT)                      \
+       __ipt_module(LOG)                       \
+       __ipt_module(MARK)                      \
+       __ipt_module(MASQUERADE)        \
+       __ipt_module(REDIRECT)          \
+       __ipt_module(REJECT)            \
+       __ipt_module(SET)                       \
+       __ipt_module(SNAT)                      \
+       __ipt_module(TCPMSS)
+
+#ifdef DISABLE_IPV6
+#undef __ipt_module
+#define __ipt_module(x) \
+       extern void libxt_##x##_init(void) __attribute__((weak)); \
+       extern void libipt_##x##_init(void) __attribute__((weak));
+#else
+#undef __ipt_module
+#define __ipt_module(x) \
+       extern void libxt_##x##_init(void) __attribute__((weak)); \
+       extern void libipt_##x##_init(void) __attribute__((weak)); \
+       extern void libip6t_##x##_init(void) __attribute__((weak));
+#endif
+
+FW3_IPT_MODULES
+
 
 /* Required by certain extensions like SNAT and DNAT */
 extern int kernel_version;
@@ -45,7 +87,10 @@ void get_kernel_version(void);
 struct fw3_ipt_handle {
        enum fw3_family family;
        enum fw3_table table;
-       struct xtc_handle *handle;
+       void *handle;
+
+       int libc;
+       void **libv;
 };
 
 struct fw3_ipt_rule {
@@ -81,6 +126,8 @@ void fw3_ipt_flush(struct fw3_ipt_handle *h);
 
 void fw3_ipt_commit(struct fw3_ipt_handle *h);
 
+void fw3_ipt_close(struct fw3_ipt_handle *h);
+
 struct fw3_ipt_rule *fw3_ipt_rule_new(struct fw3_ipt_handle *h);
 
 void fw3_ipt_rule_proto(struct fw3_ipt_rule *r, struct fw3_protocol *proto);