X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=options.h;h=fe9816e495e30b647696696728ab909fe6b7366e;hb=6c5c240d7a1710c53e7a18af6612404753729cf7;hp=8115afc20f4c9b0d09ca9a180e113f904e2470c7;hpb=5df8137ebc5db2bc9c6e71b2d154a5f77679d9d8;p=project%2Ffirewall3.git

diff --git a/options.h b/options.h
index 8115afc..fe9816e 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>
@@ -130,6 +132,7 @@ struct fw3_address
 	struct list_head list;
 
 	bool set;
+	bool range;
 	bool invert;
 	enum fw3_family family;
 	int mask;
@@ -138,6 +141,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
@@ -190,6 +198,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;
@@ -280,9 +299,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;
 };
@@ -316,6 +336,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;
@@ -349,7 +371,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;
@@ -410,9 +432,15 @@ 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);
 
+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);
 
@@ -424,6 +452,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)