X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=redirects.c;h=a657b6d8644196f162b75b9f46edcbd06533667a;hp=ca5d4d14f082c036603ac9c48e84018f17823a81;hb=6039c7f4b0052c4da21520cdd604f04a5a67f50d;hpb=d54cb962ebafdf2fde7256e234a2f3cfe8223c71

diff --git a/redirects.c b/redirects.c
index ca5d4d1..a657b6d 100644
--- a/redirects.c
+++ b/redirects.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2014 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
@@ -116,14 +116,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 +136,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;
@@ -169,49 +166,13 @@ 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;
+	return redir->local;
 }
 
 void
@@ -232,13 +193,10 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
 		if (strcmp(s->type, "redirect"))
 			continue;
 
-		redir = malloc(sizeof(*redir));
-
+		redir = calloc(1, sizeof(*redir));
 		if (!redir)
 			continue;
 
-		memset(redir, 0, sizeof(*redir));
-
 		INIT_LIST_HEAD(&redir->proto);
 		INIT_LIST_HEAD(&redir->mac_src);
 
@@ -247,7 +205,12 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
 
 		valid = false;
 
-		fw3_parse_options(redir, fw3_redirect_opts, s);
+		if (!fw3_parse_options(redir, fw3_redirect_opts, s))
+		{
+			warn_elem(e, "skipped due to invalid options");
+			fw3_free_redirect(redir);
+			continue;
+		}
 
 		if (!redir->enabled)
 		{
@@ -300,7 +263,7 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
 			warn_elem(e, "has no target specified, defaulting to DNAT");
 			redir->target = FW3_FLAG_DNAT;
 		}
-		else if (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;
@@ -315,22 +278,21 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
 			else
 			{
 				set(redir->_src->flags, FW3_FAMILY_V4, redir->target);
-				redir->_src->conntrack = true;
 				valid = true;
-			}
-
-			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 (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 (!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 (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
@@ -346,7 +308,6 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
 			else
 			{
 				set(redir->_dest->flags, FW3_FAMILY_V4, redir->target);
-				redir->_dest->conntrack = true;
 				valid = true;
 			}
 		}
@@ -380,6 +341,24 @@ append_chain_nat(struct fw3_ipt_rule *r, struct fw3_redirect *redir)
 }
 
 static void
+set_redirect(struct fw3_ipt_rule *r, struct fw3_port *port)
+{
+	char buf[sizeof("65535-65535\0")];
+
+	fw3_ipt_rule_target(r, "REDIRECT");
+
+	if (port && port->set)
+	{
+		if (port->port_min == port->port_max)
+			sprintf(buf, "%u", port->port_min);
+		else
+			sprintf(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)
 {
@@ -416,40 +395,14 @@ 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
-//append_chain_filter(struct fw3_ipt_rule *r, struct fw3_redirect *redir)
-//{
-//	if (redir->target == FW3_FLAG_DNAT)
-//	{
-//		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);
-//	}
-//	else
-//	{
-//		if (redir->src.set && !redir->src.any)
-//			fw3_ipt_rule_append(r, "zone_%s_forward", redir->src.name);
-//		else
-//			fw3_ipt_rule_append(r, "delegate_forward");
-//	}
-//}
-//
-//static void
-//set_target_filter(struct fw3_ipt_rule *r, struct fw3_redirect *redir)
-//{
-//	if (redir->local)
-//		fw3_ipt_rule_extra(r, "-m conntrack --ctstate DNAT");
-//
-//	fw3_ipt_rule_target(r, "ACCEPT");
-//}
-
 static void
 set_comment(struct fw3_ipt_rule *r, const char *name, int num, bool ref)
 {
@@ -505,25 +458,6 @@ print_redirect(struct fw3_ipt_handle *h, struct fw3_state *state,
 		append_chain_nat(r, redir);
 		break;
 
-	case FW3_TABLE_FILTER:
-		//src = &redir->ip_src;
-		//dst = &redir->ip_redir;
-		//spt = &redir->port_src;
-		//dpt = &redir->port_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);
-		//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);
-		//fw3_ipt_rule_extra(r, redir->extra);
-		//set_comment(r, redir->name, num, false);
-		//append_chain_filter(r, redir);
-		break;
-
 	default:
 		break;
 	}
@@ -557,16 +491,6 @@ print_reflection(struct fw3_ipt_handle *h, struct fw3_state *state,
 		fw3_ipt_rule_replace(r, "zone_%s_postrouting", redir->dest.name);
 		break;
 
-	//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_ipt_rule_replace(r, "zone_%s_forward", redir->dest.name);
-	//	break;
-
 	default:
 		break;
 	}
@@ -629,14 +553,14 @@ 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);
+	ext_addrs = fw3_resolve_zone_addresses(redir->_src, &redir->ip_dest);
+	int_addrs = fw3_resolve_zone_addresses(redir->_dest, NULL);
 
 	if (!ext_addrs || !int_addrs)
 		goto out;
@@ -661,8 +585,8 @@ expand_redirect(struct fw3_ipt_handle *handle, struct fw3_state *state,
 				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);