FW3_OPT("src", device, rule, src),
FW3_OPT("dest", device, rule, dest),
- FW3_OPT("ipset", device, rule, ipset),
+ FW3_OPT("ipset", setmatch, rule, ipset),
FW3_LIST("proto", protocol, rule, proto),
};
+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)
{
fw3_free_rule(rule);
continue;
}
- else if (rule->ipset.set && !rule->ipset.any &&
- !(rule->_ipset = fw3_lookup_ipset(state, rule->ipset.name)))
+ else if (rule->ipset.set &&
+ !(rule->ipset.ptr = fw3_lookup_ipset(state, rule->ipset.name)))
{
warn_elem(e, "refers to unknown ipset '%s'", rule->ipset.name);
fw3_free_rule(rule);
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;
}
if (rule->dest.set && !rule->src.set)
- snprintf(chain, sizeof(chain), "zone_%s_output", rule->dest.name);
+ {
+ if (rule->dest.any)
+ snprintf(chain, sizeof(chain), "delegate_output");
+ else
+ snprintf(chain, sizeof(chain), "zone_%s_output",
+ rule->dest.name);
+ }
}
fw3_ipt_rule_append(r, chain);
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;
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
if (!fw3_is_family(sip, handle->family) ||
!fw3_is_family(dip, handle->family))
{
- info(" ! Skipping due to different family of ip address");
+ if ((sip && !sip->resolved) || (dip && !dip->resolved))
+ info(" ! Skipping due to different family of ip address");
+
return;
}
fw3_ipt_rule_sport_dport(r, sport, dport);
fw3_ipt_rule_icmptype(r, icmptype);
fw3_ipt_rule_mac(r, mac);
- fw3_ipt_rule_ipset(r, rule->_ipset, rule->ipset.invert);
+ fw3_ipt_rule_ipset(r, &rule->ipset);
fw3_ipt_rule_limit(r, &rule->limit);
fw3_ipt_rule_time(r, &rule->time);
fw3_ipt_rule_mark(r, &rule->mark);
return;
}
- if (rule->_ipset)
+ if (rule->ipset.ptr)
{
- if (!fw3_is_family(rule->_ipset, handle->family))
+ if (!fw3_is_family(rule->ipset.ptr, handle->family))
{
info(" ! Skipping due to different family in ipset");
return;
}
- if (!fw3_check_ipset(rule->_ipset))
+ if (!fw3_check_ipset(rule->ipset.ptr))
{
info(" ! Skipping due to missing ipset '%s'",
- rule->_ipset->external
- ? rule->_ipset->external : rule->_ipset->name);
+ rule->ipset.ptr->external
+ ? rule->ipset.ptr->external : rule->ipset.ptr->name);
return;
}
- set(rule->_ipset->flags, handle->family, handle->family);
+ set(rule->ipset.ptr->flags, handle->family, handle->family);
}
list_for_each_entry(proto, &rule->proto, list)