X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=options.h;h=004eeeee1f8d63c8ff98b6dcbf712c242c978cbd;hp=e242f67d9a8ec87ba08fe9f481e0cf4a14a033ab;hb=35d57952d708007f5a08a72421fe55e775e3fd0f;hpb=b6bfb7a067c5699fd5aec28d407d773d3a022567

diff --git a/options.h b/options.h
index e242f67..004eeee 100644
--- a/options.h
+++ b/options.h
@@ -92,14 +92,21 @@ enum fw3_limit_unit
 	FW3_LIMIT_UNIT_MINUTE = 1,
 	FW3_LIMIT_UNIT_HOUR   = 2,
 	FW3_LIMIT_UNIT_DAY    = 3,
+
+	__FW3_LIMIT_UNIT_MAX
 };
 
+extern const char *fw3_limit_units[__FW3_LIMIT_UNIT_MAX];
+
+
 enum fw3_ipset_method
 {
 	FW3_IPSET_METHOD_UNSPEC = 0,
 	FW3_IPSET_METHOD_BITMAP = 1,
 	FW3_IPSET_METHOD_HASH   = 2,
 	FW3_IPSET_METHOD_LIST   = 3,
+
+	__FW3_IPSET_METHOD_MAX
 };
 
 enum fw3_ipset_type
@@ -110,8 +117,14 @@ enum fw3_ipset_type
 	FW3_IPSET_TYPE_MAC    = 3,
 	FW3_IPSET_TYPE_NET    = 4,
 	FW3_IPSET_TYPE_SET    = 5,
+
+	__FW3_IPSET_TYPE_MAX
 };
 
+extern const char *fw3_ipset_method_names[__FW3_IPSET_METHOD_MAX];
+extern const char *fw3_ipset_type_names[__FW3_IPSET_TYPE_MAX];
+
+
 enum fw3_include_type
 {
 	FW3_INC_TYPE_SCRIPT   = 0,
@@ -139,7 +152,7 @@ struct fw3_device
 	bool any;
 	bool invert;
 	char name[32];
-	struct fw3_device *network;
+	char network[32];
 };
 
 struct fw3_address
@@ -443,6 +456,13 @@ struct fw3_state
 	bool statefile;
 };
 
+struct fw3_chain_spec {
+	int family;
+	int table;
+	int flag;
+	const char *format;
+};
+
 
 struct fw3_option
 {
@@ -491,20 +511,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