X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=rules.c;h=8ecefb03bfed279ca2c85a28fb492ff30d91c182;hp=4750af7ef2d9dee6050d567c7c15c633a030ae54;hb=6d8d3d855e7ddef5f73b68847ddcbc6ba22379f8;hpb=aeba5741d7ed3b53fb4f1bb3679feb0fa526f4c6

diff --git a/rules.c b/rules.c
index 4750af7..8ecefb0 100644
--- a/rules.c
+++ b/rules.c
@@ -105,7 +105,12 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
 
 		rule->enabled = true;
 
-		fw3_parse_options(rule, fw3_rule_opts, s);
+		if (!fw3_parse_options(rule, fw3_rule_opts, s))
+		{
+			warn_elem(e, "skipped due to invalid options");
+			fw3_free_rule(rule);
+			continue;
+		}
 
 		if (!rule->enabled)
 		{
@@ -286,7 +291,8 @@ static void set_target(struct fw3_ipt_rule *r, struct fw3_rule *rule)
 		return;
 
 	case FW3_FLAG_NOTRACK:
-		fw3_ipt_rule_target(r, fw3_flag_names[rule->target]);
+		fw3_ipt_rule_target(r, "CT");
+		fw3_ipt_rule_addarg(r, false, "--notrack", NULL);
 		return;
 
 	case FW3_FLAG_ACCEPT:
@@ -295,7 +301,7 @@ static void set_target(struct fw3_ipt_rule *r, struct fw3_rule *rule)
 		break;
 
 	default:
-		name = "reject";
+		name = fw3_flag_names[FW3_FLAG_REJECT];
 		break;
 	}
 
@@ -303,8 +309,10 @@ static void set_target(struct fw3_ipt_rule *r, struct fw3_rule *rule)
 		fw3_ipt_rule_target(r, "zone_%s_dest_%s", rule->dest.name, name);
 	else if (need_src_action_chain(rule))
 		fw3_ipt_rule_target(r, "zone_%s_src_%s", rule->src.name, name);
-	else
+	else if (strcmp(name, "REJECT"))
 		fw3_ipt_rule_target(r, name);
+	else
+		fw3_ipt_rule_target(r, "reject");
 }
 
 static void