};
+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)
{
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)
{
setbit(rule->_dest->flags[0], rule->target);
setbit(rule->_dest->flags[1], rule->target);
}
- else if (rule->_src)
+ 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));
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:
break;
default:
- name = "reject";
+ name = fw3_flag_names[FW3_FLAG_REJECT];
break;
}
if (rule->dest.set && !rule->dest.any)
fw3_ipt_rule_target(r, "zone_%s_dest_%s", rule->dest.name, name);
- else if (rule->src.set && !rule->src.any)
+ 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