X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=iptables.h;h=5dfb54a9d8276c2fe5bdfbc005024c9f2d3adba9;hb=be8ead27f625b3e4ed383f270dcfee2d158231ec;hp=3c52942b0055810604ccc588527eaad57d039024;hpb=95cc95c7fec2d68fa8e27cc8e8e4b8dbacababf8;p=project%2Ffirewall3.git

diff --git a/iptables.h b/iptables.h
index 3c52942..5dfb54a 100644
--- a/iptables.h
+++ b/iptables.h
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -30,6 +30,9 @@
 
 #include "options.h"
 
+#define FW3_ID_MAGIC	0x66773300	/* 'f' 'w' '3' */
+#define FW3_ID_MASK		0xffffff00
+
 /* xtables interface */
 #if (XTABLES_VERSION_CODE == 10)
 # include "xtables-10.h"
@@ -39,47 +42,10 @@
 # error "Unsupported xtables version"
 #endif
 
-/* libext.a interface */
-#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(NOTRACK)		\
-	__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
-
+/* libipt*ext.so interfaces */
+extern void init_extensions(void);
+extern void init_extensions4(void);
+extern void init_extensions6(void);
 
 /* Required by certain extensions like SNAT and DNAT */
 extern int kernel_version;
@@ -105,6 +71,8 @@ struct fw3_ipt_rule {
 	struct xtables_rule_match *matches;
 	struct xtables_target *target;
 
+	int id;
+
 	int argc;
 	char **argv;
 
@@ -122,10 +90,14 @@ void fw3_ipt_set_policy(struct fw3_ipt_handle *h, const char *chain,
 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_id_rules(struct fw3_ipt_handle *h, const char *chain);
+
 void fw3_ipt_create_chain(struct fw3_ipt_handle *h, const char *fmt, ...);
 
 void fw3_ipt_flush(struct fw3_ipt_handle *h);
 
+void fw3_ipt_gc(struct fw3_ipt_handle *h);
+
 void fw3_ipt_commit(struct fw3_ipt_handle *h);
 
 void fw3_ipt_close(struct fw3_ipt_handle *h);
@@ -143,6 +115,8 @@ void fw3_ipt_rule_src_dest(struct fw3_ipt_rule *r,
 void fw3_ipt_rule_sport_dport(struct fw3_ipt_rule *r,
                               struct fw3_port *sp, struct fw3_port *dp);
 
+void fw3_ipt_rule_device(struct fw3_ipt_rule *r, const char *device, bool out);
+
 void fw3_ipt_rule_mac(struct fw3_ipt_rule *r, struct fw3_mac *mac);
 
 void fw3_ipt_rule_icmptype(struct fw3_ipt_rule *r, struct fw3_icmptype *icmp);