X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=iptables.h;h=c8d1add9ce452920044b8e395c6d30bdc9ea0bfc;hp=226e1169622058ec6a8e3acbf1c3a1a7dc23fbbc;hb=3a3d85b3c787271e4860ca590d716cf557c1fb7e;hpb=2bcf21ee2e44e9e4158ae4a36a5d73832cd99587

diff --git a/iptables.h b/iptables.h
index 226e116..c8d1add 100644
--- a/iptables.h
+++ b/iptables.h
@@ -23,40 +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 libip6t_icmp6_init(void);
-void libip6t_LOG_init(void);
-void libipt_DNAT_init(void);
-void libipt_icmp_init(void);
-void libipt_LOG_init(void);
-void libipt_MASQUERADE_init(void);
-void libipt_REDIRECT_init(void);
-void libipt_REJECT_init(void);
-void libipt_SNAT_init(void);
-void libxt_comment_init(void);
-void libxt_conntrack_init(void);
-void libxt_CT_init(void);
-void libxt_limit_init(void);
-void libxt_mac_init(void);
-void libxt_mark_init(void);
-void libxt_MARK_init(void);
-void libxt_set_init(void);
-void libxt_SET_init(void);
-void libxt_standard_init(void);
-void libxt_TCPMSS_init(void);
-void libxt_tcp_init(void);
-void libxt_time_init(void);
-void libxt_udp_init(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;
@@ -65,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 {
@@ -101,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);
@@ -120,8 +147,7 @@ void fw3_ipt_rule_icmptype(struct fw3_ipt_rule *r, struct fw3_icmptype *icmp);
 
 void fw3_ipt_rule_limit(struct fw3_ipt_rule *r, struct fw3_limit *limit);
 
-void fw3_ipt_rule_ipset(struct fw3_ipt_rule *r, struct fw3_ipset *ipset,
-                        bool invert);
+void fw3_ipt_rule_ipset(struct fw3_ipt_rule *r, struct fw3_setmatch *match);
 
 void fw3_ipt_rule_time(struct fw3_ipt_rule *r, struct fw3_time *time);