projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For ingress rules, only jump into zone_name_src_ACTION chains if the target is not...
[project/firewall3.git]
/
rules.c
diff --git
a/rules.c
b/rules.c
index
eea8724
..
4750af7
100644
(file)
--- a/
rules.c
+++ b/
rules.c
@@
-28,7
+28,7
@@
const struct fw3_option fw3_rule_opts[] = {
FW3_OPT("src", device, rule, src),
FW3_OPT("dest", device, rule, dest),
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),
FW3_LIST("proto", protocol, rule, proto),
@@
-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)
{
void
fw3_load_rules(struct fw3_state *state, struct uci_package *p)
{
@@
-133,8
+139,8
@@
fw3_load_rules(struct fw3_state *state, struct uci_package *p)
fw3_free_rule(rule);
continue;
}
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);
{
warn_elem(e, "refers to unknown ipset '%s'", rule->ipset.name);
fw3_free_rule(rule);
@@
-200,6
+206,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);
}
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;
list_add_tail(&rule->list, &state->rules);
continue;
@@
-274,21
+285,24
@@
static void set_target(struct fw3_ipt_rule *r, struct fw3_rule *rule)
fw3_ipt_rule_addarg(r, false, name, buf);
return;
fw3_ipt_rule_addarg(r, false, name, buf);
return;
+ case FW3_FLAG_NOTRACK:
+ fw3_ipt_rule_target(r, fw3_flag_names[rule->target]);
+ return;
+
case FW3_FLAG_ACCEPT:
case FW3_FLAG_DROP:
case FW3_FLAG_ACCEPT:
case FW3_FLAG_DROP:
- case FW3_FLAG_NOTRACK:
name = fw3_flag_names[rule->target];
break;
default:
name = fw3_flag_names[rule->target];
break;
default:
- name =
fw3_flag_names[FW3_FLAG_REJECT]
;
+ name =
"reject"
;
break;
}
if (rule->dest.set && !rule->dest.any)
fw3_ipt_rule_target(r, "zone_%s_dest_%s", rule->dest.name, name);
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 if (
need_src_action_chain(rule)
)
+ fw3_ipt_rule_target(r, "
zone_%s_src_%s", rule->src.name, name
);
else
fw3_ipt_rule_target(r, name);
}
else
fw3_ipt_rule_target(r, name);
}
@@
-314,7
+328,9
@@
print_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
if (!fw3_is_family(sip, handle->family) ||
!fw3_is_family(dip, handle->family))
{
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;
}
return;
}
@@
-328,7
+344,7
@@
print_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
fw3_ipt_rule_sport_dport(r, sport, dport);
fw3_ipt_rule_icmptype(r, icmptype);
fw3_ipt_rule_mac(r, mac);
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.inver
t);
+ fw3_ipt_rule_ipset(r,
&rule->ipse
t);
fw3_ipt_rule_limit(r, &rule->limit);
fw3_ipt_rule_time(r, &rule->time);
fw3_ipt_rule_mark(r, &rule->mark);
fw3_ipt_rule_limit(r, &rule->limit);
fw3_ipt_rule_time(r, &rule->time);
fw3_ipt_rule_mark(r, &rule->mark);
@@
-377,23
+393,23
@@
expand_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
return;
}
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;
}
{
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'",
{
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;
}
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)
}
list_for_each_entry(proto, &rule->proto, list)