FW3_OPT("src", device, redirect, src),
FW3_OPT("dest", device, redirect, dest),
- FW3_OPT("ipset", device, redirect, ipset),
+ FW3_OPT("ipset", setmatch, redirect, ipset),
FW3_LIST("proto", protocol, redirect, proto),
FW3_OPT("extra", string, redirect, extra),
+ FW3_OPT("limit", limit, redirect, limit),
+ FW3_OPT("limit_burst", int, redirect, limit.burst),
+
FW3_OPT("utc_time", bool, redirect, time.utc),
FW3_OPT("start_date", date, redirect, time.datestart),
FW3_OPT("stop_date", date, redirect, time.datestop),
return false;
}
- if (r->_ipset && r->_ipset->family && r->_ipset->family != r->family)
+ if (r->ipset.ptr && r->ipset.ptr->family &&
+ r->ipset.ptr->family != r->family)
{
warn_elem(e, "refers to ipset with different family");
return false;
{
uint32_t mask;
- if (a->family != FW3_FAMILY_V4)
+ if (a->family != FW3_FAMILY_V4 || b->family != FW3_FAMILY_V4)
return false;
- mask = ~((1 << (32 - a->mask)) - 1);
+ mask = htonl(~((1 << (32 - a->mask)) - 1));
return ((a->address.v4.s_addr & mask) == (b->address.v4.s_addr & mask));
}
return false;
}
+static bool
+check_local(struct uci_element *e, struct fw3_redirect *redir,
+ struct fw3_state *state)
+{
+ struct fw3_zone *zone;
+ struct fw3_device *net;
+ struct fw3_address *addr;
+ struct list_head *addrs;
+
+ if (redir->target != FW3_FLAG_DNAT)
+ return false;
+
+ if (!redir->ip_redir.set)
+ redir->local = true;
+
+ if (redir->local)
+ return true;
+
+ list_for_each_entry(zone, &state->zones, list)
+ {
+ list_for_each_entry(net, &zone->networks, list)
+ {
+ addrs = fw3_ubus_address(net->name);
+
+ if (!addrs)
+ continue;
+
+ list_for_each_entry(addr, addrs, list)
+ {
+ if (!compare_addr(&redir->ip_redir, addr))
+ continue;
+
+ warn_elem(e, "refers to a destination address on this router, "
+ "assuming port redirection");
+
+ redir->local = true;
+ break;
+ }
+
+ fw3_free_list(addrs);
+
+ if (redir->local)
+ return true;
+ }
+ }
+
+ return false;
+}
+
void
fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
{
fw3_free_redirect(redir);
continue;
}
- else if (redir->ipset.set && !redir->ipset.any &&
- !(redir->_ipset = fw3_lookup_ipset(state, redir->ipset.name)))
+ else if (redir->ipset.set &&
+ !(redir->ipset.ptr = fw3_lookup_ipset(state, redir->ipset.name)))
{
warn_elem(e, "refers to unknown ipset '%s'", redir->ipset.name);
fw3_free_redirect(redir);
valid = true;
}
- if (!redir->dest.set && resolve_dest(e, redir, state))
+ if (!check_local(e, redir, state) && !redir->dest.set &&
+ resolve_dest(e, redir, state))
{
- warn_elem(e, "has no destination specified, assuming zone '%s'",
+ warn_elem(e, "does not specify a destination, assuming '%s'",
redir->dest.name);
}
{
if (redir->target == FW3_FLAG_DNAT)
{
- /* XXX: check for local ip */
- if (!redir->ip_redir.set)
+ if (redir->local)
fw3_ipt_rule_append(r, "zone_%s_input", redir->src.name);
else
fw3_ipt_rule_append(r, "zone_%s_forward", redir->src.name);
static void
set_target_filter(struct fw3_ipt_rule *r, struct fw3_redirect *redir)
{
- /* XXX: check for local ip */
- if (redir->target == FW3_FLAG_DNAT && !redir->ip_redir.set)
+ if (redir->local)
fw3_ipt_rule_extra(r, "-m conntrack --ctstate DNAT");
fw3_ipt_rule_target(r, "ACCEPT");
r = fw3_ipt_rule_create(h, proto, NULL, NULL, src, dst);
fw3_ipt_rule_sport_dport(r, spt, dpt);
fw3_ipt_rule_mac(r, mac);
- fw3_ipt_rule_ipset(r, redir->_ipset, redir->ipset.invert);
+ fw3_ipt_rule_ipset(r, &redir->ipset);
+ fw3_ipt_rule_limit(r, &redir->limit);
fw3_ipt_rule_time(r, &redir->time);
fw3_ipt_rule_mark(r, &redir->mark);
set_target_nat(r, redir);
r = fw3_ipt_rule_create(h, proto, NULL, NULL, src, dst);
fw3_ipt_rule_sport_dport(r, spt, dpt);
fw3_ipt_rule_mac(r, mac);
- fw3_ipt_rule_ipset(r, redir->_ipset, redir->ipset.invert);
+ fw3_ipt_rule_ipset(r, &redir->ipset);
+ fw3_ipt_rule_limit(r, &redir->limit);
fw3_ipt_rule_time(r, &redir->time);
fw3_ipt_rule_mark(r, &redir->mark);
set_target_filter(r, redir);
case FW3_TABLE_NAT:
r = fw3_ipt_rule_create(h, proto, NULL, NULL, ia, ea);
fw3_ipt_rule_sport_dport(r, NULL, &redir->port_dest);
+ fw3_ipt_rule_limit(r, &redir->limit);
fw3_ipt_rule_time(r, &redir->time);
set_comment(r, redir->name, num, true);
set_snat_dnat(r, FW3_FLAG_DNAT, &redir->ip_redir, &redir->port_redir);
r = fw3_ipt_rule_create(h, proto, NULL, NULL, ia, &redir->ip_redir);
fw3_ipt_rule_sport_dport(r, NULL, &redir->port_redir);
+ fw3_ipt_rule_limit(r, &redir->limit);
fw3_ipt_rule_time(r, &redir->time);
set_comment(r, redir->name, num, true);
set_snat_dnat(r, FW3_FLAG_SNAT, ra, NULL);
case FW3_TABLE_FILTER:
r = fw3_ipt_rule_create(h, proto, NULL, NULL, ia, &redir->ip_redir);
fw3_ipt_rule_sport_dport(r, NULL, &redir->port_redir);
+ fw3_ipt_rule_limit(r, &redir->limit);
fw3_ipt_rule_time(r, &redir->time);
set_comment(r, redir->name, num, true);
fw3_ipt_rule_target(r, "zone_%s_dest_ACCEPT", redir->dest.name);
!fw3_is_family(&redir->ip_dest, handle->family) ||
!fw3_is_family(&redir->ip_redir, handle->family))
{
- info(" ! Skipping due to different family of ip address");
+ if (!redir->ip_src.resolved ||
+ !redir->ip_dest.resolved ||
+ !redir->ip_redir.resolved)
+ info(" ! Skipping due to different family of ip address");
+
return;
}
- if (redir->_ipset)
+ if (redir->ipset.ptr)
{
- if (!fw3_is_family(redir->_ipset, handle->family))
+ if (!fw3_is_family(redir->ipset.ptr, handle->family))
{
info(" ! Skipping due to different family in ipset");
return;
}
- if (!fw3_check_ipset(redir->_ipset))
+ if (!fw3_check_ipset(redir->ipset.ptr))
{
info(" ! Skipping due to missing ipset '%s'",
- redir->_ipset->external ?
- redir->_ipset->external : redir->_ipset->name);
+ redir->ipset.ptr->external ?
+ redir->ipset.ptr->external : redir->ipset.ptr->name);
return;
}
- set(redir->_ipset->flags, handle->family, handle->family);
+ set(redir->ipset.ptr->flags, handle->family, handle->family);
}
fw3_foreach(proto, &redir->proto)