X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=rules.c;h=7f748ebb043fb96028d3598fc5f93c94ace3d137;hp=e733cd9848944ccd45a6aa349e662b4b7f5b9005;hb=78e134ba7cdc473e7cdf0422b863579ac700ac13;hpb=fe3ecee341da8542aa25b962dcb8bcc628fcdd1e

diff --git a/rules.c b/rules.c
index e733cd9..7f748eb 100644
--- a/rules.c
+++ b/rules.c
@@ -20,6 +20,8 @@
 
 
 const struct fw3_option fw3_rule_opts[] = {
+	FW3_OPT("enabled",             bool,      rule,     enabled),
+
 	FW3_OPT("name",                string,    rule,     name),
 	FW3_OPT("family",              family,    rule,     family),
 
@@ -51,6 +53,10 @@ const struct fw3_option fw3_rule_opts[] = {
 	FW3_OPT("weekdays",            weekdays,  rule,     time.weekdays),
 	FW3_OPT("monthdays",           monthdays, rule,     time.monthdays),
 
+	FW3_OPT("mark",                mark,      rule,     mark),
+	FW3_OPT("set_mark",            mark,      rule,     set_mark),
+	FW3_OPT("set_xmark",           mark,      rule,     set_xmark),
+
 	FW3_OPT("target",              target,    rule,     target),
 
 	{ }
@@ -91,8 +97,16 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
 
 		INIT_LIST_HEAD(&rule->icmp_type);
 
+		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)
 		{
 			warn_elem(e, "must not have inverted 'src' or 'dest' options");
@@ -100,14 +114,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, false)))
+		         !(rule->_src = fw3_lookup_zone(state, rule->src.name)))
 		{
 			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, false)))
+		         !(rule->_dest = fw3_lookup_zone(state, rule->dest.name)))
 		{
 			warn_elem(e, "refers to not existing zone '%s'", rule->dest.name);
 			fw3_free_rule(rule);
@@ -120,39 +134,72 @@ 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, false)))
+		         !(rule->_ipset = fw3_lookup_ipset(state, rule->ipset.name)))
 		{
 			warn_elem(e, "refers to unknown ipset '%s'", rule->ipset.name);
 			fw3_free_rule(rule);
 			continue;
 		}
 
-		if (!rule->_src && rule->target == FW3_TARGET_NOTRACK)
+		if (!rule->_src && rule->target == FW3_FLAG_NOTRACK)
 		{
 			warn_elem(e, "is set to target NOTRACK but has no source assigned");
 			fw3_free_rule(rule);
 			continue;
 		}
 
+		if (!rule->set_mark.set && !rule->set_xmark.set &&
+		    rule->target == FW3_FLAG_MARK)
+		{
+			warn_elem(e, "is set to target MARK but specifies neither "
+			             "'set_mark' nor 'set_xmark' option");
+			fw3_free_rule(rule);
+			continue;
+		}
+
+		if (rule->_dest && rule->target == FW3_FLAG_MARK)
+		{
+			warn_elem(e, "must not specify 'dest' for MARK target");
+			fw3_free_rule(rule);
+			continue;
+		}
+
+		if (rule->set_mark.invert || rule->set_xmark.invert)
+		{
+			warn_elem(e, "must not have inverted 'set_mark' or 'set_xmark'");
+			fw3_free_rule(rule);
+			continue;
+		}
+
 		if (!rule->_src && !rule->_dest && !rule->src.any && !rule->dest.any)
 		{
 			warn_elem(e, "has neither a source nor a destination zone assigned "
 			             "- assuming an output rule");
 		}
 
-		if (rule->target == FW3_TARGET_UNSPEC)
+		if (list_empty(&rule->proto))
+		{
+			warn_elem(e, "does not specify a protocol, assuming TCP+UDP");
+			fw3_parse_protocol(&rule->proto, "tcpudp", true);
+		}
+
+		if (rule->target == FW3_FLAG_UNSPEC)
 		{
 			warn_elem(e, "has no target specified, defaulting to REJECT");
-			rule->target = FW3_TARGET_REJECT;
+			rule->target = FW3_FLAG_REJECT;
 		}
-		else if (rule->target > FW3_TARGET_NOTRACK)
+		else if (rule->target > FW3_FLAG_MARK)
 		{
 			warn_elem(e, "has invalid target specified, defaulting to REJECT");
-			rule->target = FW3_TARGET_REJECT;
+			rule->target = FW3_FLAG_REJECT;
 		}
 
+		/* NB: rule family... */
 		if (rule->_dest)
-			setbit(rule->_dest->dst_flags, rule->target);
+		{
+			setbit(rule->_dest->flags[0], rule->target);
+			setbit(rule->_dest->flags[1], rule->target);
+		}
 
 		list_add_tail(&rule->list, &state->rules);
 		continue;
@@ -167,10 +214,14 @@ print_chain(struct fw3_rule *rule)
 
 	sprintf(chain, "delegate_output");
 
-	if (rule->target == FW3_TARGET_NOTRACK)
+	if (rule->target == FW3_FLAG_NOTRACK)
 	{
 		sprintf(chain, "zone_%s_notrack", rule->src.name);
 	}
+	else if (rule->target == FW3_FLAG_MARK)
+	{
+		sprintf(chain, "fwmark");
+	}
 	else
 	{
 		if (rule->src.set)
@@ -204,28 +255,38 @@ static void print_target(struct fw3_rule *rule)
 
 	switch(rule->target)
 	{
-	case FW3_TARGET_ACCEPT:
-	case FW3_TARGET_DROP:
-	case FW3_TARGET_NOTRACK:
+	case FW3_FLAG_MARK:
+		if (rule->set_mark.set)
+			fw3_pr(" -j MARK --set-mark 0x%x/0x%x\n",
+			       rule->set_mark.mark, rule->set_mark.mask);
+		else
+			fw3_pr(" -j MARK --set-xmark 0x%x/0x%x\n",
+			       rule->set_xmark.mark, rule->set_xmark.mask);
+		return;
+
+	case FW3_FLAG_ACCEPT:
+	case FW3_FLAG_DROP:
+	case FW3_FLAG_NOTRACK:
 		target = fw3_flag_names[rule->target];
 		break;
 
 	default:
-		target = fw3_flag_names[FW3_TARGET_REJECT];
+		target = fw3_flag_names[FW3_FLAG_REJECT];
 		break;
 	}
 
 	if (rule->dest.set && !rule->dest.any)
 		fw3_pr(" -j zone_%s_dest_%s\n", rule->dest.name, target);
-	else if (rule->target == FW3_TARGET_REJECT)
+	else if (rule->target == FW3_FLAG_REJECT)
 		fw3_pr(" -j reject\n");
 	else
 		fw3_pr(" -j %s\n", target);
 }
 
 static void
-print_rule(enum fw3_table table, enum fw3_family family,
-           struct fw3_rule *rule, struct fw3_protocol *proto,
+print_rule(struct fw3_state *state, enum fw3_family family,
+           enum fw3_table table, struct fw3_rule *rule,
+           struct fw3_protocol *proto,
            struct fw3_address *sip, struct fw3_address *dip,
            struct fw3_port *sport, struct fw3_port *dport,
            struct fw3_mac *mac, struct fw3_icmptype *icmptype)
@@ -251,14 +312,15 @@ print_rule(enum fw3_table table, enum fw3_family family,
 	fw3_format_mac(mac);
 	fw3_format_limit(&rule->limit);
 	fw3_format_time(&rule->time);
+	fw3_format_mark(&rule->mark);
 	fw3_format_extra(rule->extra);
 	fw3_format_comment(rule->name);
 	print_target(rule);
 }
 
 static void
-expand_rule(enum fw3_table table, enum fw3_family family,
-            struct fw3_rule *rule, int num)
+expand_rule(struct fw3_state *state, enum fw3_family family,
+            enum fw3_table table, struct fw3_rule *rule, int num)
 {
 	struct fw3_protocol *proto;
 	struct fw3_address *sip;
@@ -278,8 +340,9 @@ expand_rule(enum fw3_table table, enum fw3_family family,
 	if (!fw3_is_family(rule, family))
 		return;
 
-	if ((table == FW3_TABLE_RAW && rule->target != FW3_TARGET_NOTRACK) ||
-	    (table != FW3_TABLE_FILTER))
+	if ((rule->target == FW3_FLAG_NOTRACK && table != FW3_TABLE_RAW) ||
+	    (rule->target == FW3_FLAG_MARK && table != FW3_TABLE_MANGLE) ||
+		(rule->target < FW3_FLAG_NOTRACK && table != FW3_TABLE_FILTER))
 		return;
 
 	if (rule->name)
@@ -302,7 +365,15 @@ expand_rule(enum fw3_table table, enum fw3_family family,
 			return;
 		}
 
-		setbit(rule->_ipset->flags, family);
+		if (!fw3_check_ipset(rule->_ipset))
+		{
+			info("     ! Skipping due to missing ipset '%s'",
+			     rule->_ipset->external
+					? rule->_ipset->external : rule->_ipset->name);
+			return;
+		}
+
+		set(rule->_ipset->flags, family, family);
 	}
 
 	list_for_each_entry(proto, &rule->proto, list)
@@ -327,18 +398,18 @@ expand_rule(enum fw3_table table, enum fw3_family family,
 		fw3_foreach(dport, dports)
 		fw3_foreach(mac, &rule->mac_src)
 		fw3_foreach(icmptype, icmptypes)
-			print_rule(table, family, rule, proto, sip, dip, sport, dport,
-			           mac, icmptype);
+			print_rule(state, family, table, rule, proto, sip, dip,
+			           sport, dport, mac, icmptype);
 	}
 }
 
 void
-fw3_print_rules(enum fw3_table table, enum fw3_family family,
-                struct fw3_state *state)
+fw3_print_rules(struct fw3_state *state, enum fw3_family family,
+                enum fw3_table table)
 {
 	int num = 0;
 	struct fw3_rule *rule;
 
 	list_for_each_entry(rule, &state->rules, list)
-		expand_rule(table, family, rule, num++);
+		expand_rule(state, family, table, rule, num++);
 }