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_src", reflection_source,
+ redirect, reflection_src),
FW3_OPT("target", target, redirect, target),
struct uci_element *e;
struct fw3_redirect *redir;
- bool valid = false;
+ bool valid;
INIT_LIST_HEAD(&state->redirects);
redir->enabled = true;
redir->reflection = true;
+ valid = false;
+
fw3_parse_options(redir, fw3_redirect_opts, s);
if (!redir->enabled)
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
{
set(redir->_dest->flags, FW3_FAMILY_V4, redir->target);
}
}
+ 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);
print_snat_dnat(enum fw3_flag target,
struct fw3_address *addr, struct fw3_port *port)
{
- const char *t;
char s[sizeof("255.255.255.255 ")];
if (target == FW3_FLAG_DNAT)
- t = "DNAT --to-destination";
+ fw3_pr(" -j DNAT --to-destination ");
else
- t = "SNAT --to-source";
+ fw3_pr(" -j SNAT --to-source ");
- inet_ntop(AF_INET, &addr->address.v4, s, sizeof(s));
-
- 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)
{
}
static void
-print_redirect(enum fw3_table table, enum fw3_family family,
- struct fw3_redirect *redir, int num)
+print_redirect(struct fw3_state *state, enum fw3_family family,
+ enum fw3_table table, struct fw3_redirect *redir, int num)
{
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;
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_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);
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)
fw3_format_sport_dport(NULL, &redir->port_redir);
fw3_format_time(&redir->time);
fw3_format_comment(redir->name, " (reflection)");
- print_snat_dnat(FW3_FLAG_SNAT, ext_addr, NULL);
+ print_snat_dnat(FW3_FLAG_SNAT, &ref_addr, NULL);
}
else if (table == FW3_TABLE_FILTER)
{
}
void
-fw3_print_redirects(enum fw3_table table, enum fw3_family family,
- struct fw3_state *state)
+fw3_print_redirects(struct fw3_state *state, enum fw3_family family,
+ enum fw3_table table)
{
int num = 0;
struct fw3_redirect *redir;
return;
list_for_each_entry(redir, &state->redirects, list)
- print_redirect(table, family, redir, num++);
+ print_redirect(state, family, table, redir, num++);
}