X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=iptables.h;h=ca39809856cd1f92af1e0fb331785eea84773884;hb=HEAD;hp=a2c733dce7d0f51230444d238d6343a36fcd85b0;hpb=786b15ff1460e8611eaa35ec024efe08fd3a5ebe;p=project%2Ffirewall3.git

diff --git a/iptables.h b/iptables.h
index a2c733d..ca39809 100644
--- a/iptables.h
+++ b/iptables.h
@@ -19,28 +19,6 @@
 #ifndef __FW3_IPTABLES_H
 #define __FW3_IPTABLES_H
 
-#define _GNU_SOURCE /* RTLD_NEXT */
-
-#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 || XTABLES_VERSION_CODE == 11)
-# include "xtables-10.h"
-#elif (XTABLES_VERSION_CODE == 5)
-# include "xtables-5.h"
-#else
-# error "Unsupported xtables version"
-#endif
-
 #ifndef DISABLE_STATIC_EXTENSIONS
 /* libipt*ext.so interfaces */
 extern void init_extensions(void);
@@ -62,23 +40,7 @@ struct fw3_ipt_handle {
 	void *handle;
 };
 
-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);
@@ -88,11 +50,13 @@ 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_chain(struct fw3_ipt_handle *h, bool if_unused,
+                          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_create_chain(struct fw3_ipt_handle *h, bool ignore_existing,
+                          const char *chain);
 
 void fw3_ipt_flush(struct fw3_ipt_handle *h);
 
@@ -125,10 +89,14 @@ 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_setmatch *match);
 
+void fw3_ipt_rule_helper(struct fw3_ipt_rule *r, struct fw3_cthelpermatch *match);
+
 void fw3_ipt_rule_time(struct fw3_ipt_rule *r, struct fw3_time *time);
 
 void fw3_ipt_rule_mark(struct fw3_ipt_rule *r, struct fw3_mark *mark);
 
+void fw3_ipt_rule_dscp(struct fw3_ipt_rule *r, struct fw3_dscp *dscp);
+
 void fw3_ipt_rule_comment(struct fw3_ipt_rule *r, const char *fmt, ...);
 
 void fw3_ipt_rule_extra(struct fw3_ipt_rule *r, const char *extra);
@@ -165,7 +133,4 @@ 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