X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=iptables.h;h=491e59880714230c8d5ad038b72162fdd4e78d67;hb=6015fc07618173bc9cc44890e0f9c86081c80848;hp=96d71bf850f3c485fd80576fa208c4f1e68b05a7;hpb=c67adbd07bb3dfd2d04f0f9a3cfe6cef56670ebd;p=project%2Ffirewall3.git

diff --git a/iptables.h b/iptables.h
index 96d71bf..491e598 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
@@ -19,6 +19,11 @@
 #ifndef __FW3_IPTABLES_H
 #define __FW3_IPTABLES_H
 
+#define _GNU_SOURCE /* RTLD_NEXT */
+
+#define _LINUX_IF_H
+#define _LINUX_IN_H
+#define _LINUX_IN6_H
 #include <libiptc/libiptc.h>
 #include <libiptc/libip6tc.h>
 #include <xtables.h>
@@ -31,7 +36,7 @@
 #include "options.h"
 
 /* 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"
@@ -39,47 +44,17 @@
 # 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(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));
+#ifndef DISABLE_STATIC_EXTENSIONS
+/* libipt*ext.so interfaces */
+extern void init_extensions(void);
+extern void init_extensions4(void);
+extern void init_extensions6(void);
 #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));
+static inline void init_extensions(void) { }
+static inline void init_extensions4(void) { }
+static inline void init_extensions6(void) { }
 #endif
 
-FW3_IPT_MODULES
-
-
 /* Required by certain extensions like SNAT and DNAT */
 extern int kernel_version;
 void get_kernel_version(void);
@@ -88,9 +63,6 @@ struct fw3_ipt_handle {
 	enum fw3_family family;
 	enum fw3_table table;
 	void *handle;
-
-	int libc;
-	void **libv;
 };
 
 struct fw3_ipt_rule {
@@ -121,10 +93,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);
@@ -142,6 +118,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);
@@ -190,4 +168,7 @@ fw3_ipt_rule_target(struct fw3_ipt_rule *r, const char *fmt, ...)
 	fw3_ipt_rule_addarg(r, false, "-j", buf);
 }
 
+void xtables_register_match(struct xtables_match *me);
+void xtables_register_target(struct xtables_target *me);
+
 #endif