Skip rules with invalid options

[project/firewall3.git] / rules.c

diff --git a/rules.c b/rules.c
index a251f7c..8ecefb0 100644 (file)
--- a/rules.c
+++ b/rules.c
@@ -63,6 +63,12 @@ const struct fw3_option fw3_rule_opts[] = {
 };
 
 
+static bool
+need_src_action_chain(struct fw3_rule *r)
+{
+       return (r->_src && r->_src->log && (r->target > FW3_FLAG_ACCEPT));
+}
+
 void
 fw3_load_rules(struct fw3_state *state, struct uci_package *p)
 {
@@ -99,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)
                {
@@ -200,6 +211,11 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
                        setbit(rule->_dest->flags[0], rule->target);
                        setbit(rule->_dest->flags[1], rule->target);
                }
+               else if (need_src_action_chain(rule))
+               {
+                       setbit(rule->_src->flags[0], fw3_to_src_target(rule->target));
+                       setbit(rule->_src->flags[1], fw3_to_src_target(rule->target));
+               }
 
                list_add_tail(&rule->list, &state->rules);
                continue;
@@ -274,9 +290,13 @@ static void set_target(struct fw3_ipt_rule *r, struct fw3_rule *rule)
                fw3_ipt_rule_addarg(r, false, name, buf);
                return;
 
+       case FW3_FLAG_NOTRACK:
+               fw3_ipt_rule_target(r, "CT");
+               fw3_ipt_rule_addarg(r, false, "--notrack", NULL);
+               return;
+
        case FW3_FLAG_ACCEPT:
        case FW3_FLAG_DROP:
-       case FW3_FLAG_NOTRACK:
                name = fw3_flag_names[rule->target];
                break;
 
@@ -287,10 +307,12 @@ static void set_target(struct fw3_ipt_rule *r, struct fw3_rule *rule)
 
        if (rule->dest.set && !rule->dest.any)
                fw3_ipt_rule_target(r, "zone_%s_dest_%s", rule->dest.name, name);
-       else if (rule->target == FW3_FLAG_REJECT)
-               fw3_ipt_rule_target(r, "reject");
-       else
+       else if (need_src_action_chain(rule))
+               fw3_ipt_rule_target(r, "zone_%s_src_%s", rule->src.name, name);
+       else if (strcmp(name, "REJECT"))
                fw3_ipt_rule_target(r, name);
+       else
+               fw3_ipt_rule_target(r, "reject");
 }
 
 static void