X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=iptables.h;h=96d71bf850f3c485fd80576fa208c4f1e68b05a7;hp=c8c86eca0058a3deff1c78361401363a56012691;hb=be44720d8b80add13448a297c9c1b3716ca38e4f;hpb=1ce8986798f2003a9b2084a987971deedf52228e

diff --git a/iptables.h b/iptables.h
index c8c86ec..96d71bf 100644
--- a/iptables.h
+++ b/iptables.h
@@ -23,15 +23,21 @@
 #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 */
 #define FW3_IPT_MODULES			\
@@ -58,11 +64,18 @@ extern struct xtables_target *xtables_pending_targets;
 	__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
 
@@ -74,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,8 +117,9 @@ struct fw3_ipt_handle *fw3_ipt_open(enum fw3_family family,
 void fw3_ipt_set_policy(struct fw3_ipt_handle *h, const char *chain,
                         enum fw3_flag policy);
 
+
+void fw3_ipt_flush_chain(struct fw3_ipt_handle *h, const char *chain);
 void fw3_ipt_delete_chain(struct fw3_ipt_handle *h, const char *chain);
-void fw3_ipt_delete_rules(struct fw3_ipt_handle *h, const char *target);
 
 void fw3_ipt_create_chain(struct fw3_ipt_handle *h, const char *fmt, ...);
 
@@ -110,6 +127,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);
@@ -129,8 +148,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);
 
@@ -150,7 +168,14 @@ struct fw3_ipt_rule * fw3_ipt_rule_create(struct fw3_ipt_handle *handle,
                                           struct fw3_address *src,
                                           struct fw3_address *dest);
 
-void fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...);
+void __fw3_ipt_rule_append(struct fw3_ipt_rule *r, bool repl,
+                           const char *fmt, ...);
+
+#define fw3_ipt_rule_append(rule, ...) \
+	__fw3_ipt_rule_append(rule, false, __VA_ARGS__)
+
+#define fw3_ipt_rule_replace(rule, ...) \
+	__fw3_ipt_rule_append(rule, true, __VA_ARGS__)
 
 static inline void
 fw3_ipt_rule_target(struct fw3_ipt_rule *r, const char *fmt, ...)