X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=iptables.h;h=8a4ce8f64780b87476fce1a45127fe56f1e9ae09;hp=61a292e758c9591318d5782e33a9647958d64804;hb=0a7d36d8cf56f160b531f3db9f045e3f9315dd15;hpb=dfc0ed16992e4610a2128ae8a14b7b51c4ceeab5

diff --git a/iptables.h b/iptables.h
index 61a292e..8a4ce8f 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,69 +19,17 @@
 #ifndef __FW3_IPTABLES_H
 #define __FW3_IPTABLES_H
 
-#include <libiptc/libiptc.h>
-#include <libiptc/libip6tc.h>
-#include <xtables.h>
-
-#include <dlfcn.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <sys/utsname.h>
-
-#include "options.h"
-
-/* 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			\
-	__ipt_module(comment)		\
-	__ipt_module(conntrack)		\
-	__ipt_module(icmp)			\
-	__ipt_module(icmp6)			\
-	__ipt_module(limit)			\
-	__ipt_module(connlimit)			\
-	__ipt_module(mac)			\
-	__ipt_module(mark)			\
-	__ipt_module(multiport)			\
-	__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);
@@ -90,28 +38,9 @@ struct fw3_ipt_handle {
 	enum fw3_family family;
 	enum fw3_table table;
 	void *handle;
-
-	int libc;
-	void **libv;
 };
 
-struct fw3_ipt_rule {
-	struct fw3_ipt_handle *h;
-
-	union {
-		struct ipt_entry e;
-		struct ip6t_entry e6;
-	};
-
-	struct xtables_rule_match *matches;
-	struct xtables_target *target;
-
-	int argc;
-	char **argv;
-
-	uint32_t protocol;
-	bool protocol_loaded;
-};
+struct fw3_ipt_rule;
 
 struct fw3_ipt_handle *fw3_ipt_open(enum fw3_family family,
                                     enum fw3_table table);
@@ -123,10 +52,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);