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

diff --git a/redirects.c b/redirects.c
index ca5d4d1..080e2c1 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 <jow@openwrt.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -171,8 +171,7 @@ check_local(struct uci_element *e, struct fw3_redirect *redir,
 {
 	struct fw3_zone *zone;
 	struct fw3_device *net;
-	struct fw3_address *addr;
-	struct list_head *addrs;
+	struct fw3_address *addr, *tmp;
 
 	if (redir->target != FW3_FLAG_DNAT)
 		return false;
@@ -187,25 +186,23 @@ check_local(struct uci_element *e, struct fw3_redirect *redir,
 	{
 		list_for_each_entry(net, &zone->networks, list)
 		{
-			addrs = fw3_ubus_address(net->name);
+			LIST_HEAD(addrs);
 
-			if (!addrs)
-				continue;
-
-			list_for_each_entry(addr, addrs, list)
+			fw3_ubus_address(&addrs, net->name);
+			list_for_each_entry_safe(addr, tmp, &addrs, list)
 			{
-				if (!compare_addr(&redir->ip_redir, addr))
-					continue;
+				if (compare_addr(&redir->ip_redir, addr)) {
+					warn_elem(e, "refers to a destination address on this router, "
+					             "assuming port redirection");
 
-				warn_elem(e, "refers to a destination address on this router, "
-				             "assuming port redirection");
+					redir->local = true;
+					continue;
+				}
 
-				redir->local = true;
-				break;
+				list_del(&addr->list);
+				free(addr);
 			}
 
-			fw3_free_list(addrs);
-
 			if (redir->local)
 				return true;
 		}
@@ -232,13 +229,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 +241,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 +299,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;
@@ -422,34 +421,6 @@ set_target_nat(struct fw3_ipt_rule *r, struct fw3_redirect *redir)
 		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 +476,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 +509,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;
 	}