X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=options.h;h=96afcd2dda4730051d0ec272e9d6c4b420621683;hp=ea5082dcdf1b19ae69464fe76128a6447540d1e8;hb=99499fdbe5221847288a6d18edf1032d2702cff9;hpb=6e6afb0c7d4d69e4a48122664645c8de67f34c96

diff --git a/options.h b/options.h
index ea5082d..96afcd2 100644
--- a/options.h
+++ b/options.h
@@ -35,6 +35,8 @@
 #include <netinet/in.h>
 #include <netinet/ether.h>
 
+#include <time.h>
+
 #include <uci.h>
 
 #include <libubox/list.h>
@@ -79,6 +81,9 @@ enum fw3_default
 	FW3_DEFAULT_DROP_INVALID  = 15,
 };
 
+extern const char *fw3_flag_names[FW3_DEFAULT_DROP_INVALID + 1];
+
+
 enum fw3_limit_unit
 {
 	FW3_LIMIT_UNIT_SECOND = 0,
@@ -105,6 +110,12 @@ enum fw3_ipset_type
 	FW3_IPSET_TYPE_SET    = 5,
 };
 
+enum fw3_include_type
+{
+	FW3_INC_TYPE_SCRIPT   = 0,
+	FW3_INC_TYPE_RESTORE  = 1,
+};
+
 struct fw3_ipset_datatype
 {
 	struct list_head list;
@@ -127,6 +138,7 @@ struct fw3_address
 	struct list_head list;
 
 	bool set;
+	bool range;
 	bool invert;
 	enum fw3_family family;
 	int mask;
@@ -135,6 +147,11 @@ struct fw3_address
 		struct in6_addr v6;
 		struct ether_addr mac;
 	} address;
+	union {
+		struct in_addr v4;
+		struct in6_addr v6;
+		struct ether_addr mac;
+	} address2;
 };
 
 struct fw3_mac
@@ -187,6 +204,17 @@ struct fw3_limit
 	enum fw3_limit_unit unit;
 };
 
+struct fw3_time
+{
+	bool utc;
+	struct tm datestart;
+	struct tm datestop;
+	uint32_t timestart;
+	uint32_t timestop;
+	uint32_t monthdays; /* bit 0 is invert + 1 .. 31 */
+	uint8_t weekdays;   /* bit 0 is invert + 1 .. 7 */
+};
+
 struct fw3_defaults
 {
 	enum fw3_target policy_input;
@@ -200,7 +228,6 @@ struct fw3_defaults
 
 	bool tcp_syncookies;
 	bool tcp_ecn;
-	bool tcp_westwood;
 	bool tcp_window_scaling;
 
 	bool accept_redirects;
@@ -216,6 +243,7 @@ struct fw3_defaults
 struct fw3_zone
 {
 	struct list_head list;
+	struct list_head running_list;
 
 	const char *name;
 
@@ -276,9 +304,10 @@ struct fw3_rule
 
 	struct list_head icmp_type;
 
-	enum fw3_target target;
-
 	struct fw3_limit limit;
+	struct fw3_time time;
+
+	enum fw3_target target;
 
 	const char *extra;
 };
@@ -312,6 +341,8 @@ struct fw3_redirect
 	struct fw3_address ip_redir;
 	struct fw3_port port_redir;
 
+	struct fw3_time time;
+
 	enum fw3_target target;
 
 	const char *extra;
@@ -337,6 +368,7 @@ struct fw3_forward
 struct fw3_ipset
 {
 	struct list_head list;
+	struct list_head running_list;
 
 	const char *name;
 	enum fw3_family family;
@@ -344,7 +376,7 @@ struct fw3_ipset
 	enum fw3_ipset_method method;
 	struct list_head datatypes;
 
-	struct list_head iprange;
+	struct fw3_address iprange;
 	struct fw3_port portrange;
 
 	int netmask;
@@ -358,6 +390,18 @@ struct fw3_ipset
 	uint16_t flags;
 };
 
+struct fw3_include
+{
+	struct list_head list;
+	struct list_head running_list;
+
+	const char *name;
+	enum fw3_family family;
+
+	const char *path;
+	enum fw3_include_type type;
+};
+
 struct fw3_state
 {
 	struct uci_context *uci;
@@ -367,8 +411,14 @@ struct fw3_state
 	struct list_head redirects;
 	struct list_head forwards;
 	struct list_head ipsets;
+	struct list_head includes;
+
+	struct fw3_defaults running_defaults;
+	struct list_head running_zones;
+	struct list_head running_ipsets;
 
 	bool disable_ipsets;
+	bool statefile;
 };
 
 
@@ -400,10 +450,18 @@ bool fw3_parse_port(void *ptr, const char *val);
 bool fw3_parse_family(void *ptr, const char *val);
 bool fw3_parse_icmptype(void *ptr, const char *val);
 bool fw3_parse_protocol(void *ptr, const char *val);
+
 bool fw3_parse_ipset_method(void *ptr, const char *val);
 bool fw3_parse_ipset_datatype(void *ptr, const char *val);
 
-void fw3_parse_options(void *s, struct fw3_option *opts, int n,
+bool fw3_parse_include_type(void *ptr, const char *val);
+
+bool fw3_parse_date(void *ptr, const char *val);
+bool fw3_parse_time(void *ptr, const char *val);
+bool fw3_parse_weekdays(void *ptr, const char *val);
+bool fw3_parse_monthdays(void *ptr, const char *val);
+
+void fw3_parse_options(void *s, const struct fw3_option *opts,
                        struct uci_section *section);
 
 void fw3_format_in_out(struct fw3_device *in, struct fw3_device *out);
@@ -414,6 +472,7 @@ 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_comment(const char *comment, ...);
 #define fw3_format_comment(...) __fw3_format_comment(__VA_ARGS__, NULL)