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),
{ }
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);
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->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 (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_FLAG_REJECT;
}
- else if (rule->target > FW3_FLAG_NOTRACK)
+ else if (rule->target > FW3_FLAG_MARK)
{
warn_elem(e, "has invalid target specified, defaulting to REJECT");
rule->target = FW3_FLAG_REJECT;
{
sprintf(chain, "zone_%s_notrack", rule->src.name);
}
+ else if (rule->target == FW3_FLAG_MARK)
+ {
+ sprintf(chain, "fwmark");
+ }
else
{
if (rule->src.set)
switch(rule->target)
{
+ 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:
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);
if (!fw3_is_family(rule, family))
return;
- if ((table == FW3_TABLE_RAW && rule->target != FW3_FLAG_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)