X-Git-Url: https://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=rules.c;h=c3f03cf76377eba22235cf3fa873734ed3bcb965;hp=bc983a6a7b8177b58118f6d656009aaa0184f335;hb=54c0625e83a5ddf77e1753885c96f488ba38f78a;hpb=df1bb55631c967aa0e4ee49cd29cf463fb86c85b

diff --git a/rules.c b/rules.c
index bc983a6..c3f03cf 100644
--- a/rules.c
+++ b/rules.c
@@ -19,31 +19,43 @@
 #include "rules.h"
 
 
-static struct fw3_option rule_opts[] = {
-	FW3_OPT("name",                string,   rule,     name),
-	FW3_OPT("family",              family,   rule,     family),
+const struct fw3_option fw3_rule_opts[] = {
+	FW3_OPT("enabled",             bool,      rule,     enabled),
 
-	FW3_OPT("src",                 device,   rule,     src),
-	FW3_OPT("dest",                device,   rule,     dest),
+	FW3_OPT("name",                string,    rule,     name),
+	FW3_OPT("family",              family,    rule,     family),
 
-	FW3_OPT("ipset",               device,   rule,     ipset),
+	FW3_OPT("src",                 device,    rule,     src),
+	FW3_OPT("dest",                device,    rule,     dest),
 
-	FW3_LIST("proto",              protocol, rule,     proto),
+	FW3_OPT("ipset",               device,    rule,     ipset),
 
-	FW3_LIST("src_ip",             address,  rule,     ip_src),
-	FW3_LIST("src_mac",            mac,      rule,     mac_src),
-	FW3_LIST("src_port",           port,     rule,     port_src),
+	FW3_LIST("proto",              protocol,  rule,     proto),
 
-	FW3_LIST("dest_ip",            address,  rule,     ip_dest),
-	FW3_LIST("dest_port",          port,     rule,     port_dest),
+	FW3_LIST("src_ip",             address,   rule,     ip_src),
+	FW3_LIST("src_mac",            mac,       rule,     mac_src),
+	FW3_LIST("src_port",           port,      rule,     port_src),
 
-	FW3_LIST("icmp_type",          icmptype, rule,     icmp_type),
-	FW3_OPT("extra",               string,   rule,     extra),
+	FW3_LIST("dest_ip",            address,   rule,     ip_dest),
+	FW3_LIST("dest_port",          port,      rule,     port_dest),
 
-	FW3_OPT("limit",               limit,    rule,     limit),
-	FW3_OPT("limit_burst",         int,      rule,     limit.burst),
+	FW3_LIST("icmp_type",          icmptype,  rule,     icmp_type),
+	FW3_OPT("extra",               string,    rule,     extra),
 
-	FW3_OPT("target",              target,   rule,     target),
+	FW3_OPT("limit",               limit,     rule,     limit),
+	FW3_OPT("limit_burst",         int,       rule,     limit.burst),
+
+	FW3_OPT("utc_time",            bool,      rule,     time.utc),
+	FW3_OPT("start_date",          date,      rule,     time.datestart),
+	FW3_OPT("stop_date",           date,      rule,     time.datestop),
+	FW3_OPT("start_time",          time,      rule,     time.timestart),
+	FW3_OPT("stop_time",           time,      rule,     time.timestop),
+	FW3_OPT("weekdays",            weekdays,  rule,     time.weekdays),
+	FW3_OPT("monthdays",           monthdays, rule,     time.monthdays),
+
+	FW3_OPT("target",              target,    rule,     target),
+
+	{ }
 };
 
 
@@ -81,7 +93,15 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
 
 		INIT_LIST_HEAD(&rule->icmp_type);
 
-		fw3_parse_options(rule, rule_opts, ARRAY_SIZE(rule_opts), s);
+		rule->enabled = true;
+
+		fw3_parse_options(rule, fw3_rule_opts, s);
+
+		if (!rule->enabled)
+		{
+			fw3_free_rule(rule);
+			continue;
+		}
 
 		if (rule->src.invert || rule->dest.invert)
 		{
@@ -90,14 +110,14 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
 			continue;
 		}
 		else if (rule->src.set && !rule->src.any &&
-		         !(rule->_src = fw3_lookup_zone(state, rule->src.name)))
+		         !(rule->_src = fw3_lookup_zone(state, rule->src.name, false)))
 		{
 			warn_elem(e, "refers to not existing zone '%s'", rule->src.name);
 			fw3_free_rule(rule);
 			continue;
 		}
 		else if (rule->dest.set && !rule->dest.any &&
-		         !(rule->_dest = fw3_lookup_zone(state, rule->dest.name)))
+		         !(rule->_dest = fw3_lookup_zone(state, rule->dest.name, false)))
 		{
 			warn_elem(e, "refers to not existing zone '%s'", rule->dest.name);
 			fw3_free_rule(rule);
@@ -110,7 +130,7 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
 			continue;
 		}
 		else if (rule->ipset.set && !rule->ipset.any &&
-		         !(rule->_ipset = fw3_lookup_ipset(state, rule->ipset.name)))
+		         !(rule->_ipset = fw3_lookup_ipset(state, rule->ipset.name, false)))
 		{
 			warn_elem(e, "refers to unknown ipset '%s'", rule->ipset.name);
 			fw3_free_rule(rule);
@@ -240,6 +260,7 @@ print_rule(enum fw3_table table, enum fw3_family family,
 	fw3_format_icmptype(icmptype, family);
 	fw3_format_mac(mac);
 	fw3_format_limit(&rule->limit);
+	fw3_format_time(&rule->time);
 	fw3_format_extra(rule->extra);
 	fw3_format_comment(rule->name);
 	print_target(rule);
@@ -331,20 +352,3 @@ fw3_print_rules(enum fw3_table table, enum fw3_family family,
 	list_for_each_entry(rule, &state->rules, list)
 		expand_rule(table, family, rule, num++);
 }
-
-void
-fw3_free_rule(struct fw3_rule *rule)
-{
-	fw3_free_list(&rule->proto);
-
-	fw3_free_list(&rule->ip_src);
-	fw3_free_list(&rule->mac_src);
-	fw3_free_list(&rule->port_dest);
-
-	fw3_free_list(&rule->ip_dest);
-	fw3_free_list(&rule->port_dest);
-
-	fw3_free_list(&rule->icmp_type);
-
-	free(rule);
-}