X-Git-Url: http://git.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=redirects.c;h=e651dddef381375a912d4d3882e49b3ef0cdcf21;hp=080e2c17d49fc1117d1467260ab81cda0eb9b8d6;hb=HEAD;hpb=92281eb747b56e748b7c3d754055919c23befdd4

diff --git a/redirects.c b/redirects.c
index 080e2c1..9a827b6 100644
--- a/redirects.c
+++ b/redirects.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2018 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -29,6 +29,7 @@ const struct fw3_option fw3_redirect_opts[] = {
 	FW3_OPT("dest",                device,    redirect,     dest),
 
 	FW3_OPT("ipset",               setmatch,  redirect,     ipset),
+	FW3_OPT("helper",              cthelper,  redirect,     helper),
 
 	FW3_LIST("proto",              protocol,  redirect,     proto),
 
@@ -60,6 +61,7 @@ const struct fw3_option fw3_redirect_opts[] = {
 	FW3_OPT("reflection",          bool,      redirect,     reflection),
 	FW3_OPT("reflection_src",      reflection_source,
 	                                          redirect,     reflection_src),
+	FW3_LIST("reflection_zone",    device,    redirect,     reflection_zones),
 
 	FW3_OPT("target",              target,    redirect,     target),
 
@@ -92,6 +94,13 @@ check_families(struct uci_element *e, struct fw3_redirect *r)
 		return false;
 	}
 
+	if (r->helper.ptr && r->helper.ptr->family &&
+	    r->helper.ptr->family != r->family)
+	{
+		warn_elem(e, "refers to CT helper not supporting family");
+		return false;
+	}
+
 	if (r->ip_src.family && r->ip_src.family != r->family)
 	{
 		warn_elem(e, "uses source ip with different family");
@@ -116,14 +125,11 @@ check_families(struct uci_element *e, struct fw3_redirect *r)
 static bool
 compare_addr(struct fw3_address *a, struct fw3_address *b)
 {
-	uint32_t mask;
-
 	if (a->family != FW3_FAMILY_V4 || b->family != FW3_FAMILY_V4)
 		return false;
 
-	mask = htonl(~((1 << (32 - a->mask)) - 1));
-
-	return ((a->address.v4.s_addr & mask) == (b->address.v4.s_addr & mask));
+	return ((a->address.v4.s_addr & a->mask.v4.s_addr) ==
+	        (b->address.v4.s_addr & a->mask.v4.s_addr));
 }
 
 static bool
@@ -139,7 +145,7 @@ resolve_dest(struct uci_element *e, struct fw3_redirect *redir,
 
 	list_for_each_entry(zone, &state->zones, list)
 	{
-		addrs = fw3_resolve_zone_addresses(zone);
+		addrs = fw3_resolve_zone_addresses(zone, NULL);
 
 		if (!addrs)
 			continue;
@@ -149,7 +155,7 @@ resolve_dest(struct uci_element *e, struct fw3_redirect *redir,
 			if (!compare_addr(addr, &redir->ip_redir))
 				continue;
 
-			strncpy(redir->dest.name, zone->name, sizeof(redir->dest.name));
+			snprintf(redir->dest.name, sizeof(redir->dest.name), "%s", zone->name);
 			redir->dest.set = true;
 			redir->_dest = zone;
 
@@ -169,203 +175,274 @@ 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, *tmp;
-
 	if (redir->target != FW3_FLAG_DNAT)
 		return false;
 
 	if (!redir->ip_redir.set)
 		redir->local = true;
 
-	if (redir->local)
-		return true;
+	return redir->local;
+}
 
-	list_for_each_entry(zone, &state->zones, list)
+static void
+select_helper(struct fw3_state *state, struct fw3_redirect *redir)
+{
+	struct fw3_protocol *proto;
+	struct fw3_cthelper *helper;
+	int n_matches = 0;
+
+	if (!state->defaults.auto_helper)
+		return;
+
+	if (!redir->_src || redir->target != FW3_FLAG_DNAT)
+		return;
+
+	if (!redir->port_redir.set || redir->port_redir.invert)
+		return;
+
+	if (redir->helper.set || redir->helper.ptr)
+		return;
+
+	if (list_empty(&redir->proto))
+		return;
+
+	list_for_each_entry(proto, &redir->proto, list)
+	{
+		helper = fw3_lookup_cthelper_by_proto_port(state, proto, &redir->port_redir);
+
+		if (helper)
+			n_matches++;
+	}
+
+	if (n_matches != 1)
+		return;
+
+	/* store pointer to auto-selected helper but set ".set" flag to false,
+	 * to allow later code to decide between configured or auto-selected
+	 * helpers */
+	redir->helper.set = false;
+	redir->helper.ptr = helper;
+
+	set(redir->_src->flags, FW3_FAMILY_V4, FW3_FLAG_HELPER);
+}
+
+static bool
+check_redirect(struct fw3_state *state, struct fw3_redirect *redir, struct uci_element *e)
+{
+	bool valid;
+
+	if (!redir->enabled)
+		return false;
+
+	if (redir->src.invert)
+	{
+		warn_section("redirect", redir, e, "must not have an inverted source");
+		return false;
+	}
+	else if (redir->src.set && !redir->src.any &&
+			!(redir->_src = fw3_lookup_zone(state, redir->src.name)))
+	{
+		warn_section("redirect", redir, e, "refers to not existing zone '%s'",
+				redir->src.name);
+		return false;
+	}
+	else if (redir->dest.set && !redir->dest.any &&
+			!(redir->_dest = fw3_lookup_zone(state, redir->dest.name)))
+	{
+		warn_section("redirect", redir, e, "refers to not existing zone '%s'",
+				redir->dest.name);
+		return false;
+	}
+	else if (redir->ipset.set && state->disable_ipsets)
+	{
+		warn_section("redirect", redir, e, "skipped due to disabled ipset support");
+		return false;
+	}
+	else if (redir->ipset.set &&
+			!(redir->ipset.ptr = fw3_lookup_ipset(state, redir->ipset.name)))
+	{
+		warn_section("redirect", redir, e, "refers to unknown ipset '%s'",
+				redir->ipset.name);
+		return false;
+	}
+	else if (redir->helper.set &&
+	         !(redir->helper.ptr = fw3_lookup_cthelper(state, redir->helper.name)))
+	{
+		warn_section("redirect", redir, e, "refers to unknown CT helper '%s'",
+		             redir->helper.name);
+		return false;
+	}
+
+	if (!check_families(e, redir))
+		return false;
+
+	if (redir->target == FW3_FLAG_UNSPEC)
+	{
+		warn_section("redirect", redir, e, "has no target specified, defaulting to DNAT");
+		redir->target = FW3_FLAG_DNAT;
+	}
+	else if (redir->target < FW3_FLAG_DNAT || redir->target > FW3_FLAG_SNAT)
 	{
-		list_for_each_entry(net, &zone->networks, list)
+		warn_section("redirect", redir, e, "has invalid target specified, defaulting to DNAT");
+		redir->target = FW3_FLAG_DNAT;
+	}
+
+	valid = false;
+
+	if (redir->target == FW3_FLAG_DNAT)
+	{
+		if (redir->src.any)
+			warn_section("redirect", redir, e, "must not have source '*' for DNAT target");
+		else if (!redir->_src)
+			warn_section("redirect", redir, e, "has no source specified");
+		else if (redir->helper.invert)
+			warn_section("redirect", redir, e, "must not use a negated helper match");
+		else
 		{
-			LIST_HEAD(addrs);
+			set(redir->_src->flags, FW3_FAMILY_V4, redir->target);
+			valid = true;
 
-			fw3_ubus_address(&addrs, net->name);
-			list_for_each_entry_safe(addr, tmp, &addrs, list)
+			if (!check_local(e, redir, state) && !redir->dest.set &&
+					resolve_dest(e, redir, state))
 			{
-				if (compare_addr(&redir->ip_redir, addr)) {
-					warn_elem(e, "refers to a destination address on this router, "
-					             "assuming port redirection");
-
-					redir->local = true;
-					continue;
-				}
+				warn_section("redirect", redir, e,
+						"does not specify a destination, assuming '%s'",
+						redir->dest.name);
+			}
 
-				list_del(&addr->list);
-				free(addr);
+			if (redir->reflection && redir->_dest && redir->_src->masq)
+			{
+				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);
 			}
 
-			if (redir->local)
-				return true;
+			if (redir->helper.ptr)
+				set(redir->_src->flags, FW3_FAMILY_V4, FW3_FLAG_HELPER);
+		}
+	}
+	else
+	{
+		if (redir->dest.any)
+			warn_section("redirect", redir, e,
+					"must not have destination '*' for SNAT target");
+		else if (!redir->_dest)
+			warn_section("redirect", redir, e, "has no destination specified");
+		else if (!redir->ip_dest.set)
+			warn_section("redirect", redir, e, "has no src_dip option specified");
+		else if (!list_empty(&redir->mac_src))
+			warn_section("redirect", redir, e, "must not use 'src_mac' option for SNAT target");
+		else if (redir->helper.set)
+			warn_section("redirect", redir, e, "must not use 'helper' option for SNAT target");
+		else
+		{
+			set(redir->_dest->flags, FW3_FAMILY_V4, redir->target);
+			valid = true;
 		}
 	}
 
-	return false;
+	if (list_empty(&redir->proto))
+	{
+		warn_section("redirect", redir, e, "does not specify a protocol, assuming TCP+UDP");
+		fw3_parse_protocol(&redir->proto, "tcpudp", true);
+	}
+
+	if (!valid)
+		return false;
+
+	if (redir->target == FW3_FLAG_DNAT && !redir->port_redir.set)
+		redir->port_redir = redir->port_dest;
+
+	return true;
 }
 
-void
-fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
+static struct fw3_redirect *
+fw3_alloc_redirect(struct fw3_state *state)
 {
-	struct uci_section *s;
-	struct uci_element *e;
 	struct fw3_redirect *redir;
 
-	bool valid;
+	redir = calloc(1, sizeof(*redir));
+	if (!redir)
+		return NULL;
 
-	INIT_LIST_HEAD(&state->redirects);
+	INIT_LIST_HEAD(&redir->proto);
+	INIT_LIST_HEAD(&redir->mac_src);
+	INIT_LIST_HEAD(&redir->reflection_zones);
 
-	uci_foreach_element(&p->sections, e)
-	{
-		s = uci_to_section(e);
+	redir->enabled = true;
+	redir->reflection = true;
 
-		if (strcmp(s->type, "redirect"))
-			continue;
+	list_add_tail(&redir->list, &state->redirects);
 
-		redir = calloc(1, sizeof(*redir));
-		if (!redir)
-			continue;
+	return redir;
+}
 
-		INIT_LIST_HEAD(&redir->proto);
-		INIT_LIST_HEAD(&redir->mac_src);
+void
+fw3_load_redirects(struct fw3_state *state, struct uci_package *p,
+		struct blob_attr *a)
+{
+	struct uci_section *s;
+	struct uci_element *e;
+	struct fw3_redirect *redir;
+	struct blob_attr *entry;
+	unsigned rem;
 
-		redir->enabled = true;
-		redir->reflection = true;
+	INIT_LIST_HEAD(&state->redirects);
 
-		valid = false;
+	blob_for_each_attr(entry, a, rem)
+	{
+		const char *type;
+		const char *name = "ubus redirect";
 
-		if (!fw3_parse_options(redir, fw3_redirect_opts, s))
-		{
-			warn_elem(e, "skipped due to invalid options");
-			fw3_free_redirect(redir);
+		if (!fw3_attr_parse_name_type(entry, &name, &type))
 			continue;
-		}
 
-		if (!redir->enabled)
-		{
-			fw3_free_redirect(redir);
+		if (strcmp(type, "redirect"))
 			continue;
-		}
 
-		if (redir->src.invert)
-		{
-			warn_elem(e, "must not have an inverted source");
-			fw3_free_redirect(redir);
-			continue;
-		}
-		else if (redir->src.set && !redir->src.any &&
-		         !(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 &&
-		         !(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);
-			continue;
-		}
-		else if (redir->ipset.set && state->disable_ipsets)
-		{
-			warn_elem(e, "skipped due to disabled ipset support");
-			fw3_free_redirect(redir);
+		redir = fw3_alloc_redirect(state);
+		if (!redir)
 			continue;
-		}
-		else if (redir->ipset.set &&
-		         !(redir->ipset.ptr = fw3_lookup_ipset(state, redir->ipset.name)))
+
+		if (!fw3_parse_blob_options(redir, fw3_redirect_opts, entry, name))
 		{
-			warn_elem(e, "refers to unknown ipset '%s'", redir->ipset.name);
+			warn_section("redirect", redir, NULL, "skipped due to invalid options");
 			fw3_free_redirect(redir);
 			continue;
 		}
 
-		if (!check_families(e, redir))
-		{
+		if (!check_redirect(state, redir, NULL)) {
 			fw3_free_redirect(redir);
 			continue;
 		}
 
-		if (redir->target == FW3_FLAG_UNSPEC)
-		{
-			warn_elem(e, "has no target specified, defaulting to DNAT");
-			redir->target = FW3_FLAG_DNAT;
-		}
-		else if (redir->target < FW3_FLAG_DNAT || redir->target > FW3_FLAG_SNAT)
-		{
-			warn_elem(e, "has invalid target specified, defaulting to DNAT");
-			redir->target = FW3_FLAG_DNAT;
-		}
+		select_helper(state, redir);
+	}
 
-		if (redir->target == FW3_FLAG_DNAT)
-		{
-			if (redir->src.any)
-				warn_elem(e, "must not have source '*' for DNAT target");
-			else if (!redir->_src)
-				warn_elem(e, "has no source specified");
-			else
-			{
-				set(redir->_src->flags, FW3_FAMILY_V4, redir->target);
-				redir->_src->conntrack = true;
-				valid = true;
-			}
+	uci_foreach_element(&p->sections, e)
+	{
+		s = uci_to_section(e);
 
-			if (!check_local(e, redir, state) && !redir->dest.set &&
-			    resolve_dest(e, redir, state))
-			{
-				warn_elem(e, "does not specify a destination, assuming '%s'",
-				          redir->dest.name);
-			}
+		if (strcmp(s->type, "redirect"))
+			continue;
 
-			if (redir->reflection && redir->_dest && redir->_src->masq)
-			{
-				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
-		{
-			if (redir->dest.any)
-				warn_elem(e, "must not have destination '*' for SNAT target");
-			else if (!redir->_dest)
-				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);
-				redir->_dest->conntrack = true;
-				valid = true;
-			}
-		}
+		redir = fw3_alloc_redirect(state);
+		if (!redir)
+			continue;
 
-		if (list_empty(&redir->proto))
+		if (!fw3_parse_options(redir, fw3_redirect_opts, s))
 		{
-			warn_elem(e, "does not specify a protocol, assuming TCP+UDP");
-			fw3_parse_protocol(&redir->proto, "tcpudp", true);
+			warn_elem(e, "skipped due to invalid options");
+			fw3_free_redirect(redir);
+			continue;
 		}
 
-		if (!valid)
-		{
+		if (!check_redirect(state, redir, e)) {
 			fw3_free_redirect(redir);
 			continue;
 		}
 
-		if (!redir->port_redir.set)
-			redir->port_redir = redir->port_dest;
-
-		list_add_tail(&redir->list, &state->redirects);
+		select_helper(state, redir);
 	}
 }
 
@@ -378,26 +455,52 @@ append_chain_nat(struct fw3_ipt_rule *r, struct fw3_redirect *redir)
 		fw3_ipt_rule_append(r, "zone_%s_postrouting", redir->dest.name);
 }
 
+static void
+set_redirect(struct fw3_ipt_rule *r, struct fw3_port *port)
+{
+	char buf[sizeof("65535-65535")];
+
+	fw3_ipt_rule_target(r, "REDIRECT");
+
+	if (port && port->set)
+	{
+		if (port->port_min == port->port_max)
+			snprintf(buf, sizeof(buf), "%u", port->port_min);
+		else
+			snprintf(buf, sizeof(buf), "%u-%u", port->port_min, port->port_max);
+
+		fw3_ipt_rule_addarg(r, false, "--to-ports", buf);
+	}
+}
+
 static void
 set_snat_dnat(struct fw3_ipt_rule *r, enum fw3_flag target,
               struct fw3_address *addr, struct fw3_port *port)
 {
-	char buf[sizeof("255.255.255.255:65535-65535\0")];
-
-	buf[0] = '\0';
+	char buf[sizeof("255.255.255.255:65535-65535")] = {};
+	char ip[INET_ADDRSTRLEN], *p = buf;
+	size_t rem = sizeof(buf);
+	int len;
 
 	if (addr && addr->set)
 	{
-		inet_ntop(AF_INET, &addr->address.v4, buf, sizeof(buf));
+		inet_ntop(AF_INET, &addr->address.v4, ip, sizeof(ip));
+
+		len = snprintf(p, rem, "%s", ip);
+
+		if (len < 0 || len >= rem)
+			return;
+
+		rem -= len;
+		p += len;
 	}
 
 	if (port && port->set)
 	{
 		if (port->port_min == port->port_max)
-			sprintf(buf + strlen(buf), ":%u", port->port_min);
+			snprintf(p, rem, ":%u", port->port_min);
 		else
-			sprintf(buf + strlen(buf), ":%u-%u",
-			        port->port_min, port->port_max);
+			snprintf(p, rem, ":%u-%u", port->port_min, port->port_max);
 	}
 
 	if (target == FW3_FLAG_DNAT)
@@ -415,26 +518,28 @@ set_snat_dnat(struct fw3_ipt_rule *r, enum fw3_flag target,
 static void
 set_target_nat(struct fw3_ipt_rule *r, struct fw3_redirect *redir)
 {
-	if (redir->target == FW3_FLAG_DNAT)
+	if (redir->local)
+		set_redirect(r, &redir->port_redir);
+	else if (redir->target == FW3_FLAG_DNAT)
 		set_snat_dnat(r, redir->target, &redir->ip_redir, &redir->port_redir);
 	else
 		set_snat_dnat(r, redir->target, &redir->ip_dest, &redir->port_dest);
 }
 
 static void
-set_comment(struct fw3_ipt_rule *r, const char *name, int num, bool ref)
+set_comment(struct fw3_ipt_rule *r, const char *name, int num, const char *suffix)
 {
 	if (name)
 	{
-		if (ref)
-			fw3_ipt_rule_comment(r, "%s (reflection)", name);
+		if (suffix)
+			fw3_ipt_rule_comment(r, "%s (%s)", name, suffix);
 		else
 			fw3_ipt_rule_comment(r, name);
 	}
 	else
 	{
-		if (ref)
-			fw3_ipt_rule_comment(r, "@redirect[%u] (reflection)", num);
+		if (suffix)
+			fw3_ipt_rule_comment(r, "@redirect[%u] (%s)", num, suffix);
 		else
 			fw3_ipt_rule_comment(r, "@redirect[%u]", num);
 	}
@@ -467,15 +572,46 @@ print_redirect(struct fw3_ipt_handle *h, struct fw3_state *state,
 		fw3_ipt_rule_sport_dport(r, spt, dpt);
 		fw3_ipt_rule_mac(r, mac);
 		fw3_ipt_rule_ipset(r, &redir->ipset);
+		fw3_ipt_rule_helper(r, &redir->helper);
 		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);
 		fw3_ipt_rule_extra(r, redir->extra);
-		set_comment(r, redir->name, num, false);
+		set_comment(r, redir->name, num, NULL);
 		append_chain_nat(r, redir);
 		break;
 
+	case FW3_TABLE_RAW:
+		if (redir->target == FW3_FLAG_DNAT && redir->helper.ptr)
+		{
+			if (!fw3_cthelper_check_proto(redir->helper.ptr, proto))
+			{
+				info("     ! Skipping protocol %s since helper '%s' does not support it",
+				     fw3_protoname(proto), redir->helper.ptr->name);
+				return;
+			}
+
+			if (!redir->helper.set)
+				info("     - Auto-selected conntrack helper '%s' based on proto/port",
+				     redir->helper.ptr->name);
+
+			r = fw3_ipt_rule_create(h, proto, NULL, NULL, &redir->ip_src, &redir->ip_redir);
+			fw3_ipt_rule_sport_dport(r, &redir->port_src, &redir->port_redir);
+			fw3_ipt_rule_mac(r, mac);
+			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);
+			fw3_ipt_rule_addarg(r, false, "-m", "conntrack");
+			fw3_ipt_rule_addarg(r, false, "--ctstate", "DNAT");
+			fw3_ipt_rule_target(r, "CT");
+			fw3_ipt_rule_addarg(r, false, "--helper", redir->helper.ptr->name);
+			set_comment(r, redir->name, num, "CT helper");
+			fw3_ipt_rule_append(r, "zone_%s_helper", redir->_src->name);
+		}
+		break;
+
 	default:
 		break;
 	}
@@ -485,7 +621,7 @@ static void
 print_reflection(struct fw3_ipt_handle *h, struct fw3_state *state,
                  struct fw3_redirect *redir, int num,
                  struct fw3_protocol *proto, struct fw3_address *ra,
-                 struct fw3_address *ia, struct fw3_address *ea)
+                 struct fw3_address *ia, struct fw3_address *ea, struct fw3_device *rz)
 {
 	struct fw3_ipt_rule *r;
 
@@ -496,17 +632,17 @@ print_reflection(struct fw3_ipt_handle *h, struct fw3_state *state,
 		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_comment(r, redir->name, num, "reflection");
 		set_snat_dnat(r, FW3_FLAG_DNAT, &redir->ip_redir, &redir->port_redir);
-		fw3_ipt_rule_replace(r, "zone_%s_prerouting", redir->dest.name);
+		fw3_ipt_rule_replace(r, "zone_%s_prerouting", rz->name);
 
 		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_comment(r, redir->name, num, "reflection");
 		set_snat_dnat(r, FW3_FLAG_SNAT, ra, NULL);
-		fw3_ipt_rule_replace(r, "zone_%s_postrouting", redir->dest.name);
+		fw3_ipt_rule_replace(r, "zone_%s_postrouting", rz->name);
 		break;
 
 	default:
@@ -522,6 +658,8 @@ expand_redirect(struct fw3_ipt_handle *handle, struct fw3_state *state,
 	struct fw3_address *ext_addr, *int_addr, ref_addr;
 	struct fw3_protocol *proto;
 	struct fw3_mac *mac;
+	struct fw3_device *reflection_zone;
+	struct fw3_zone *zone;
 
 	if (redir->name)
 		info("   * Redirect '%s'", redir->name);
@@ -571,50 +709,68 @@ expand_redirect(struct fw3_ipt_handle *handle, struct fw3_state *state,
 		print_redirect(handle, state, redir, num, proto, mac);
 
 	/* reflection rules */
-	if (redir->target != FW3_FLAG_DNAT || !redir->reflection)
+	if (redir->target != FW3_FLAG_DNAT || !redir->reflection || redir->local)
 		return;
 
 	if (!redir->_dest || !redir->_src->masq)
 		return;
 
-	ext_addrs = fw3_resolve_zone_addresses(redir->_src);
-	int_addrs = fw3_resolve_zone_addresses(redir->_dest);
-
-	if (!ext_addrs || !int_addrs)
-		goto out;
+	ext_addrs = fw3_resolve_zone_addresses(redir->_src, &redir->ip_dest);
+	if (!ext_addrs)
+		return;
 
 	list_for_each_entry(ext_addr, ext_addrs, list)
 	{
 		if (!fw3_is_family(ext_addr, handle->family))
 			continue;
 
-		list_for_each_entry(int_addr, int_addrs, list)
+		for (reflection_zone = list_empty(&redir->reflection_zones)
+		       ? &redir->dest
+		       : list_first_entry(&redir->reflection_zones, struct fw3_device, list);
+		     list_empty(&redir->reflection_zones)
+		       ? (reflection_zone == &redir->dest)
+		       : (&reflection_zone->list != &redir->reflection_zones);
+		     reflection_zone = list_empty(&redir->reflection_zones)
+		       ? NULL
+		       : list_entry(reflection_zone->list.next, struct fw3_device, list))
 		{
-			if (!fw3_is_family(int_addr, handle->family))
+			zone = fw3_lookup_zone(state, reflection_zone->name);
+
+			if (!zone)
 				continue;
 
-			fw3_foreach(proto, &redir->proto)
+			int_addrs = fw3_resolve_zone_addresses(zone, NULL);
+			if (!int_addrs)
+				continue;
+
+			list_for_each_entry(int_addr, int_addrs, list)
 			{
-				if (!proto)
+				if (!fw3_is_family(int_addr, handle->family))
 					continue;
 
-				if (redir->reflection_src == FW3_REFLECTION_INTERNAL)
-					ref_addr = *int_addr;
-				else
-					ref_addr = *ext_addr;
+				fw3_foreach(proto, &redir->proto)
+				{
+					if (!proto)
+						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;
+					ref_addr.mask.v4.s_addr = 0xFFFFFFFF;
+					ext_addr->mask.v4.s_addr = 0xFFFFFFFF;
 
-				print_reflection(handle, state, redir, num, proto,
-								 &ref_addr, int_addr, ext_addr);
+					print_reflection(handle, state, redir, num, proto,
+					                 &ref_addr, int_addr, ext_addr, reflection_zone);
+				}
 			}
+
+			fw3_free_list(int_addrs);
 		}
 	}
 
-out:
 	fw3_free_list(ext_addrs);
-	fw3_free_list(int_addrs);
 }
 
 void
@@ -626,9 +782,16 @@ fw3_print_redirects(struct fw3_ipt_handle *handle, struct fw3_state *state)
 	if (handle->family == FW3_FAMILY_V6)
 		return;
 
-	if (handle->table != FW3_TABLE_FILTER && handle->table != FW3_TABLE_NAT)
+	if (handle->table != FW3_TABLE_FILTER &&
+	    handle->table != FW3_TABLE_NAT &&
+	    handle->table != FW3_TABLE_RAW)
 		return;
 
 	list_for_each_entry(redir, &state->redirects, list)
+	{
+		if (handle->table == FW3_TABLE_RAW && !redir->helper.ptr)
+			continue;
+
 		expand_redirect(handle, state, redir, num++);
+	}
 }