X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=options.h;h=558013bd90ea2b9000f04f99f2b0da095278dff5;hp=f6168f55830b3068b2430d83a081bd6edd83e3fa;hb=9e7b8360c3f9c7d518322e732e6d8ddfbbf43c60;hpb=6b27a6665c288937eb5028063064e3350dcab545

diff --git a/options.h b/options.h
index f6168f5..558013b 100644
--- a/options.h
+++ b/options.h
@@ -141,7 +141,16 @@ struct fw3_ipset_datatype
 {
 	struct list_head list;
 	enum fw3_ipset_type type;
-	bool dest;
+	const char *dir;
+};
+
+struct fw3_setmatch
+{
+	bool set;
+	bool invert;
+	char name[32];
+	const char *dir[3];
+	struct fw3_ipset *ptr;
 };
 
 struct fw3_device
@@ -162,6 +171,7 @@ struct fw3_address
 	bool set;
 	bool range;
 	bool invert;
+	bool resolved;
 	enum fw3_family family;
 	int mask;
 	union {
@@ -319,9 +329,7 @@ struct fw3_rule
 
 	struct fw3_device src;
 	struct fw3_device dest;
-
-	struct fw3_ipset *_ipset;
-	struct fw3_device ipset;
+	struct fw3_setmatch ipset;
 
 	struct list_head proto;
 
@@ -359,9 +367,7 @@ struct fw3_redirect
 
 	struct fw3_device src;
 	struct fw3_device dest;
-
-	struct fw3_ipset *_ipset;
-	struct fw3_device ipset;
+	struct fw3_setmatch ipset;
 
 	struct list_head proto;
 
@@ -375,6 +381,7 @@ struct fw3_redirect
 	struct fw3_address ip_redir;
 	struct fw3_port port_redir;
 
+	struct fw3_limit limit;
 	struct fw3_time time;
 	struct fw3_mark mark;
 
@@ -456,6 +463,13 @@ struct fw3_state
 	bool statefile;
 };
 
+struct fw3_chain_spec {
+	int family;
+	int table;
+	int flag;
+	const char *format;
+};
+
 
 struct fw3_option
 {
@@ -497,6 +511,7 @@ bool fw3_parse_time(void *ptr, const char *val, bool is_list);
 bool fw3_parse_weekdays(void *ptr, const char *val, bool is_list);
 bool fw3_parse_monthdays(void *ptr, const char *val, bool is_list);
 bool fw3_parse_mark(void *ptr, const char *val, bool is_list);
+bool fw3_parse_setmatch(void *ptr, const char *val, bool is_list);
 
 void fw3_parse_options(void *s, const struct fw3_option *opts,
                        struct uci_section *section);
@@ -504,20 +519,4 @@ void fw3_parse_options(void *s, const struct fw3_option *opts,
 const char * fw3_address_to_string(struct fw3_address *address,
                                    bool allow_invert);
 
-void fw3_format_in_out(struct fw3_device *in, struct fw3_device *out);
-void fw3_format_src_dest(struct fw3_address *src, struct fw3_address *dest);
-void fw3_format_sport_dport(struct fw3_port *sp, struct fw3_port *dp);
-void fw3_format_mac(struct fw3_mac *mac);
-void fw3_format_protocol(struct fw3_protocol *proto, enum fw3_family family);
-void fw3_format_icmptype(struct fw3_icmptype *icmp, enum fw3_family family);
-void fw3_format_limit(struct fw3_limit *limit);
-void fw3_format_ipset(struct fw3_ipset *ipset, bool invert);
-void fw3_format_time(struct fw3_time *time);
-void fw3_format_mark(struct fw3_mark *mark);
-
-void __fw3_format_comment(const char *comment, ...);
-#define fw3_format_comment(...) __fw3_format_comment(__VA_ARGS__, NULL)
-
-void fw3_format_extra(const char *extra);
-
 #endif