projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify ipset external checks and optionally initialize ispet name from external...
[project/firewall3.git]
/
redirects.c
diff --git
a/redirects.c
b/redirects.c
index
23dc034
..
3c0ffad
100644
(file)
--- a/
redirects.c
+++ b/
redirects.c
@@
-52,7
+52,11
@@
const struct fw3_option fw3_redirect_opts[] = {
FW3_OPT("weekdays", weekdays, redirect, time.weekdays),
FW3_OPT("monthdays", monthdays, redirect, time.monthdays),
FW3_OPT("weekdays", weekdays, redirect, time.weekdays),
FW3_OPT("monthdays", monthdays, redirect, time.monthdays),
+ FW3_OPT("mark", mark, redirect, mark),
+
FW3_OPT("reflection", bool, redirect, reflection),
FW3_OPT("reflection", bool, redirect, reflection),
+ FW3_OPT("reflection_src", reflection_source,
+ redirect, reflection_src),
FW3_OPT("target", target, redirect, target),
FW3_OPT("target", target, redirect, target),
@@
-112,7
+116,7
@@
fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
struct uci_element *e;
struct fw3_redirect *redir;
struct uci_element *e;
struct fw3_redirect *redir;
- bool valid
= false
;
+ bool valid;
INIT_LIST_HEAD(&state->redirects);
INIT_LIST_HEAD(&state->redirects);
@@
-136,6
+140,8
@@
fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
redir->enabled = true;
redir->reflection = true;
redir->enabled = true;
redir->reflection = true;
+ valid = false;
+
fw3_parse_options(redir, fw3_redirect_opts, s);
if (!redir->enabled)
fw3_parse_options(redir, fw3_redirect_opts, s);
if (!redir->enabled)
@@
-151,14
+157,14
@@
fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
continue;
}
else if (redir->src.set && !redir->src.any &&
continue;
}
else if (redir->src.set && !redir->src.any &&
- !(redir->_src = fw3_lookup_zone(state, redir->src.name
, false
)))
+ !(redir->_src = fw3_lookup_zone(state, redir->src.name)))
{
warn_elem(e, "refers to not existing zone '%s'", redir->src.name);
fw3_free_redirect(redir);
continue;
}
else if (redir->dest.set && !redir->dest.any &&
{
warn_elem(e, "refers to not existing zone '%s'", redir->src.name);
fw3_free_redirect(redir);
continue;
}
else if (redir->dest.set && !redir->dest.any &&
- !(redir->_dest = fw3_lookup_zone(state, redir->dest.name
, false
)))
+ !(redir->_dest = fw3_lookup_zone(state, redir->dest.name)))
{
warn_elem(e, "refers to not existing zone '%s'", redir->dest.name);
fw3_free_redirect(redir);
{
warn_elem(e, "refers to not existing zone '%s'", redir->dest.name);
fw3_free_redirect(redir);
@@
-171,7
+177,7
@@
fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
continue;
}
else if (redir->ipset.set && !redir->ipset.any &&
continue;
}
else if (redir->ipset.set && !redir->ipset.any &&
- !(redir->_ipset = fw3_lookup_ipset(state, redir->ipset.name
, false
)))
+ !(redir->_ipset = fw3_lookup_ipset(state, redir->ipset.name)))
{
warn_elem(e, "refers to unknown ipset '%s'", redir->ipset.name);
fw3_free_redirect(redir);
{
warn_elem(e, "refers to unknown ipset '%s'", redir->ipset.name);
fw3_free_redirect(redir);
@@
-184,18
+190,18
@@
fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
continue;
}
continue;
}
- if (redir->target == FW3_
TARGET
_UNSPEC)
+ if (redir->target == FW3_
FLAG
_UNSPEC)
{
warn_elem(e, "has no target specified, defaulting to DNAT");
{
warn_elem(e, "has no target specified, defaulting to DNAT");
- redir->target = FW3_
TARGET
_DNAT;
+ redir->target = FW3_
FLAG
_DNAT;
}
}
- else if (redir->target < FW3_
TARGET
_DNAT)
+ else if (redir->target < FW3_
FLAG
_DNAT)
{
warn_elem(e, "has invalid target specified, defaulting to DNAT");
{
warn_elem(e, "has invalid target specified, defaulting to DNAT");
- redir->target = FW3_
TARGET
_DNAT;
+ redir->target = FW3_
FLAG
_DNAT;
}
}
- if (redir->target == FW3_
TARGET
_DNAT)
+ if (redir->target == FW3_
FLAG
_DNAT)
{
if (redir->src.any)
warn_elem(e, "must not have source '*' for DNAT target");
{
if (redir->src.any)
warn_elem(e, "must not have source '*' for DNAT target");
@@
-203,16
+209,16
@@
fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
warn_elem(e, "has no source specified");
else
{
warn_elem(e, "has no source specified");
else
{
- set
bit(redir->_src->flags
, redir->target);
+ set
(redir->_src->flags, FW3_FAMILY_V4
, redir->target);
redir->_src->conntrack = true;
valid = true;
}
if (redir->reflection && redir->_dest && redir->_src->masq)
{
redir->_src->conntrack = true;
valid = true;
}
if (redir->reflection && redir->_dest && redir->_src->masq)
{
- set
bit(redir->_dest->flags, FW3_TARGET
_ACCEPT);
- set
bit(redir->_dest->flags, FW3_TARGET
_DNAT);
- set
bit(redir->_dest->flags, FW3_TARGET
_SNAT);
+ set
(redir->_dest->flags, FW3_FAMILY_V4, FW3_FLAG
_ACCEPT);
+ set
(redir->_dest->flags, FW3_FAMILY_V4, FW3_FLAG
_DNAT);
+ set
(redir->_dest->flags, FW3_FAMILY_V4, FW3_FLAG
_SNAT);
}
}
else
}
}
else
@@
-223,14
+229,22
@@
fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
warn_elem(e, "has no destination specified");
else if (!redir->ip_dest.set)
warn_elem(e, "has no src_dip option specified");
warn_elem(e, "has no destination specified");
else if (!redir->ip_dest.set)
warn_elem(e, "has no src_dip option specified");
+ else if (!list_empty(&redir->mac_src))
+ warn_elem(e, "must not use 'src_mac' option for SNAT target");
else
{
else
{
- set
bit(redir->_dest->flags
, redir->target);
+ set
(redir->_dest->flags, FW3_FAMILY_V4
, redir->target);
redir->_dest->conntrack = true;
valid = true;
}
}
redir->_dest->conntrack = true;
valid = true;
}
}
+ if (list_empty(&redir->proto))
+ {
+ warn_elem(e, "does not specify a protocol, assuming TCP+UDP");
+ fw3_parse_protocol(&redir->proto, "tcpudp", true);
+ }
+
if (!valid)
{
fw3_free_redirect(redir);
if (!valid)
{
fw3_free_redirect(redir);
@@
-247,27
+261,28
@@
fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
static void
print_chain_nat(struct fw3_redirect *redir)
{
static void
print_chain_nat(struct fw3_redirect *redir)
{
- if (redir->target == FW3_
TARGET
_DNAT)
+ if (redir->target == FW3_
FLAG
_DNAT)
fw3_pr("-A zone_%s_prerouting", redir->src.name);
else
fw3_pr("-A zone_%s_postrouting", redir->dest.name);
}
static void
fw3_pr("-A zone_%s_prerouting", redir->src.name);
else
fw3_pr("-A zone_%s_postrouting", redir->dest.name);
}
static void
-print_snat_dnat(enum fw3_
target
target,
+print_snat_dnat(enum fw3_
flag
target,
struct fw3_address *addr, struct fw3_port *port)
{
struct fw3_address *addr, struct fw3_port *port)
{
- const char *t;
char s[sizeof("255.255.255.255 ")];
char s[sizeof("255.255.255.255 ")];
- if (target == FW3_
TARGET
_DNAT)
-
t = "DNAT --to-destination"
;
+ if (target == FW3_
FLAG
_DNAT)
+
fw3_pr(" -j DNAT --to-destination ")
;
else
else
- t = "SNAT --to-source";
-
- inet_ntop(AF_INET, &addr->address.v4, s, sizeof(s));
+ fw3_pr(" -j SNAT --to-source ");
- fw3_pr(" -j %s %s", t, s);
+ if (addr && addr->set)
+ {
+ inet_ntop(AF_INET, &addr->address.v4, s, sizeof(s));
+ fw3_pr(s);
+ }
if (port && port->set)
{
if (port && port->set)
{
@@
-283,7
+298,7
@@
print_snat_dnat(enum fw3_target target,
static void
print_target_nat(struct fw3_redirect *redir)
{
static void
print_target_nat(struct fw3_redirect *redir)
{
- if (redir->target == FW3_
TARGET
_DNAT)
+ if (redir->target == FW3_
FLAG
_DNAT)
print_snat_dnat(redir->target, &redir->ip_redir, &redir->port_redir);
else
print_snat_dnat(redir->target, &redir->ip_dest, &redir->port_dest);
print_snat_dnat(redir->target, &redir->ip_redir, &redir->port_redir);
else
print_snat_dnat(redir->target, &redir->ip_dest, &redir->port_dest);
@@
-292,7
+307,7
@@
print_target_nat(struct fw3_redirect *redir)
static void
print_chain_filter(struct fw3_redirect *redir)
{
static void
print_chain_filter(struct fw3_redirect *redir)
{
- if (redir->target == FW3_
TARGET
_DNAT)
+ if (redir->target == FW3_
FLAG
_DNAT)
{
/* XXX: check for local ip */
if (!redir->ip_redir.set)
{
/* XXX: check for local ip */
if (!redir->ip_redir.set)
@@
-313,18
+328,18
@@
static void
print_target_filter(struct fw3_redirect *redir)
{
/* XXX: check for local ip */
print_target_filter(struct fw3_redirect *redir)
{
/* XXX: check for local ip */
- if (redir->target == FW3_
TARGET
_DNAT && !redir->ip_redir.set)
+ if (redir->target == FW3_
FLAG
_DNAT && !redir->ip_redir.set)
fw3_pr(" -m conntrack --ctstate DNAT -j ACCEPT\n");
else
fw3_pr(" -j ACCEPT\n");
}
static void
fw3_pr(" -m conntrack --ctstate DNAT -j ACCEPT\n");
else
fw3_pr(" -j ACCEPT\n");
}
static void
-print_redirect(
enum fw3_table tabl
e, enum fw3_family family,
- struct fw3_redirect *redir, int num)
+print_redirect(
struct fw3_state *stat
e, enum fw3_family family,
+
enum fw3_table table,
struct fw3_redirect *redir, int num)
{
struct list_head *ext_addrs, *int_addrs;
{
struct list_head *ext_addrs, *int_addrs;
- struct fw3_address *ext_addr, *int_addr;
+ struct fw3_address *ext_addr, *int_addr
, ref_addr
;
struct fw3_device *ext_net, *int_net;
struct fw3_protocol *proto;
struct fw3_mac *mac;
struct fw3_device *ext_net, *int_net;
struct fw3_protocol *proto;
struct fw3_mac *mac;
@@
-357,7
+372,15
@@
print_redirect(enum fw3_table table, enum fw3_family family,
return;
}
return;
}
- setbit(redir->_ipset->flags, family);
+ if (!fw3_check_ipset(redir->_ipset))
+ {
+ info(" ! Skipping due to missing ipset '%s'",
+ redir->_ipset->external ?
+ redir->_ipset->external : redir->_ipset->name);
+ return;
+ }
+
+ set(redir->_ipset->flags, family, family);
}
fw3_foreach(proto, &redir->proto)
}
fw3_foreach(proto, &redir->proto)
@@
-369,7
+392,7
@@
print_redirect(enum fw3_table table, enum fw3_family family,
fw3_format_ipset(redir->_ipset, redir->ipset.invert);
fw3_format_protocol(proto, family);
fw3_format_ipset(redir->_ipset, redir->ipset.invert);
fw3_format_protocol(proto, family);
- if (redir->target == FW3_
TARGET
_DNAT)
+ if (redir->target == FW3_
FLAG
_DNAT)
{
fw3_format_src_dest(&redir->ip_src, &redir->ip_dest);
fw3_format_sport_dport(&redir->port_src, &redir->port_dest);
{
fw3_format_src_dest(&redir->ip_src, &redir->ip_dest);
fw3_format_sport_dport(&redir->port_src, &redir->port_dest);
@@
-382,6
+405,7
@@
print_redirect(enum fw3_table table, enum fw3_family family,
fw3_format_mac(mac);
fw3_format_time(&redir->time);
fw3_format_mac(mac);
fw3_format_time(&redir->time);
+ fw3_format_mark(&redir->mark);
fw3_format_extra(redir->extra);
fw3_format_comment(redir->name);
print_target_nat(redir);
fw3_format_extra(redir->extra);
fw3_format_comment(redir->name);
print_target_nat(redir);
@@
-395,6
+419,7
@@
print_redirect(enum fw3_table table, enum fw3_family family,
fw3_format_sport_dport(&redir->port_src, &redir->port_redir);
fw3_format_mac(mac);
fw3_format_time(&redir->time);
fw3_format_sport_dport(&redir->port_src, &redir->port_redir);
fw3_format_mac(mac);
fw3_format_time(&redir->time);
+ fw3_format_mark(&redir->mark);
fw3_format_extra(redir->extra);
fw3_format_comment(redir->name);
print_target_filter(redir);
fw3_format_extra(redir->extra);
fw3_format_comment(redir->name);
print_target_filter(redir);
@@
-402,7
+427,7
@@
print_redirect(enum fw3_table table, enum fw3_family family,
}
/* reflection rules */
}
/* reflection rules */
- if (redir->target != FW3_
TARGET
_DNAT || !redir->reflection)
+ if (redir->target != FW3_
FLAG
_DNAT || !redir->reflection)
return;
if (!redir->_dest || !redir->_src->masq)
return;
if (!redir->_dest || !redir->_src->masq)
@@
-433,6
+458,12
@@
print_redirect(enum fw3_table table, enum fw3_family family,
if (!proto || (proto->protocol != 6 && proto->protocol != 17))
continue;
if (!proto || (proto->protocol != 6 && proto->protocol != 17))
continue;
+ if (redir->reflection_src == FW3_REFLECTION_INTERNAL)
+ ref_addr = *int_addr;
+ else
+ ref_addr = *ext_addr;
+
+ ref_addr.mask = 32;
ext_addr->mask = 32;
if (table == FW3_TABLE_NAT)
ext_addr->mask = 32;
if (table == FW3_TABLE_NAT)
@@
-443,7
+474,7
@@
print_redirect(enum fw3_table table, enum fw3_family family,
fw3_format_sport_dport(NULL, &redir->port_dest);
fw3_format_time(&redir->time);
fw3_format_comment(redir->name, " (reflection)");
fw3_format_sport_dport(NULL, &redir->port_dest);
fw3_format_time(&redir->time);
fw3_format_comment(redir->name, " (reflection)");
- print_snat_dnat(FW3_
TARGET
_DNAT,
+ print_snat_dnat(FW3_
FLAG
_DNAT,
&redir->ip_redir, &redir->port_redir);
fw3_pr("-A zone_%s_postrouting", redir->dest.name);
&redir->ip_redir, &redir->port_redir);
fw3_pr("-A zone_%s_postrouting", redir->dest.name);
@@
-452,7
+483,7
@@
print_redirect(enum fw3_table table, enum fw3_family family,
fw3_format_sport_dport(NULL, &redir->port_redir);
fw3_format_time(&redir->time);
fw3_format_comment(redir->name, " (reflection)");
fw3_format_sport_dport(NULL, &redir->port_redir);
fw3_format_time(&redir->time);
fw3_format_comment(redir->name, " (reflection)");
- print_snat_dnat(FW3_
TARGET_SNAT, ext
_addr, NULL);
+ print_snat_dnat(FW3_
FLAG_SNAT, &ref
_addr, NULL);
}
else if (table == FW3_TABLE_FILTER)
{
}
else if (table == FW3_TABLE_FILTER)
{
@@
-474,8
+505,8
@@
print_redirect(enum fw3_table table, enum fw3_family family,
}
void
}
void
-fw3_print_redirects(
enum fw3_table tabl
e, enum fw3_family family,
-
struct fw3_state *stat
e)
+fw3_print_redirects(
struct fw3_state *stat
e, enum fw3_family family,
+
enum fw3_table tabl
e)
{
int num = 0;
struct fw3_redirect *redir;
{
int num = 0;
struct fw3_redirect *redir;
@@
-487,5
+518,5
@@
fw3_print_redirects(enum fw3_table table, enum fw3_family family,
return;
list_for_each_entry(redir, &state->redirects, list)
return;
list_for_each_entry(redir, &state->redirects, list)
- print_redirect(
table, family
, redir, num++);
+ print_redirect(
state, family, table
, redir, num++);
}
}