X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.c;h=2ddd7b44443f3b2714e19ffb2f8b8b29320700d2;hp=8d8fd3d05d41c4b0badc032aa6d7c6daf6d35259;hb=b59934331c4b9271ceb5e30b793a552618299d39;hpb=76976c044de639bb4bf170aa1c7a33fbeca1f1a5

diff --git a/zones.c b/zones.c
index 8d8fd3d..2ddd7b4 100644
--- a/zones.c
+++ b/zones.c
@@ -83,6 +83,8 @@ const struct fw3_option fw3_zone_opts[] = {
 	FW3_OPT("__flags_v4",          int,      zone,     flags[0]),
 	FW3_OPT("__flags_v6",          int,      zone,     flags[1]),
 
+	FW3_LIST("__addrs",            address,  zone,     old_addrs),
+
 	{ }
 };
 
@@ -128,19 +130,18 @@ fw3_alloc_zone(void)
 {
 	struct fw3_zone *zone;
 
-	zone = malloc(sizeof(*zone));
-
+	zone = calloc(1, sizeof(*zone));
 	if (!zone)
 		return NULL;
 
-	memset(zone, 0, sizeof(*zone));
-
 	INIT_LIST_HEAD(&zone->networks);
 	INIT_LIST_HEAD(&zone->devices);
 	INIT_LIST_HEAD(&zone->subnets);
 	INIT_LIST_HEAD(&zone->masq_src);
 	INIT_LIST_HEAD(&zone->masq_dest);
 
+	INIT_LIST_HEAD(&zone->old_addrs);
+
 	zone->enabled = true;
 	zone->custom_chains = true;
 	zone->log_limit.rate = 10;
@@ -199,6 +200,8 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
 			continue;
 		}
 
+		fw3_ubus_zone_devices(zone);
+
 		if (list_empty(&zone->networks) && list_empty(&zone->devices) &&
 		    list_empty(&zone->subnets) && !zone->extra_src)
 		{
@@ -224,11 +227,11 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
 		}
 
 		setbit(zone->flags[0], fw3_to_src_target(zone->policy_input));
-		setbit(zone->flags[0], fw3_to_src_target(zone->policy_forward));
+		setbit(zone->flags[0], zone->policy_forward);
 		setbit(zone->flags[0], zone->policy_output);
 
 		setbit(zone->flags[1], fw3_to_src_target(zone->policy_input));
-		setbit(zone->flags[1], fw3_to_src_target(zone->policy_forward));
+		setbit(zone->flags[1], zone->policy_forward);
 		setbit(zone->flags[1], zone->policy_output);
 
 		list_add_tail(&zone->list, &state->zones);
@@ -471,13 +474,28 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
 	switch (handle->table)
 	{
 	case FW3_TABLE_FILTER:
+		if (has(zone->flags, handle->family, FW3_FLAG_DNAT))
+		{
+			r = fw3_ipt_rule_new(handle);
+			fw3_ipt_rule_extra(r, "-m conntrack --ctstate DNAT");
+			fw3_ipt_rule_comment(r, "Accept port redirections");
+			fw3_ipt_rule_target(r, fw3_flag_names[FW3_FLAG_ACCEPT]);
+			fw3_ipt_rule_append(r, "zone_%s_input", zone->name);
+
+			r = fw3_ipt_rule_new(handle);
+			fw3_ipt_rule_extra(r, "-m conntrack --ctstate DNAT");
+			fw3_ipt_rule_comment(r, "Accept port forwards");
+			fw3_ipt_rule_target(r, fw3_flag_names[FW3_FLAG_ACCEPT]);
+			fw3_ipt_rule_append(r, "zone_%s_forward", zone->name);
+		}
+
 		r = fw3_ipt_rule_new(handle);
 		fw3_ipt_rule_target(r, "zone_%s_src_%s", zone->name,
 		                     fw3_flag_names[zone->policy_input]);
 		fw3_ipt_rule_append(r, "zone_%s_input", zone->name);
 
 		r = fw3_ipt_rule_new(handle);
-		fw3_ipt_rule_target(r, "zone_%s_src_%s", zone->name,
+		fw3_ipt_rule_target(r, "zone_%s_dest_%s", zone->name,
 		                     fw3_flag_names[zone->policy_forward]);
 		fw3_ipt_rule_append(r, "zone_%s_forward", zone->name);
 
@@ -660,45 +678,43 @@ fw3_lookup_zone(struct fw3_state *state, const char *name)
 }
 
 struct list_head *
-fw3_resolve_zone_addresses(struct fw3_zone *zone)
+fw3_resolve_zone_addresses(struct fw3_zone *zone, struct fw3_address *addr)
 {
 	struct fw3_device *net;
-	struct fw3_address *addr, *tmp;
-	struct list_head *addrs, *all;
-
-	all = malloc(sizeof(*all));
+	struct fw3_address *cur, *tmp;
+	struct list_head *all;
 
+	all = calloc(1, sizeof(*all));
 	if (!all)
 		return NULL;
 
-	memset(all, 0, sizeof(*all));
 	INIT_LIST_HEAD(all);
 
-	list_for_each_entry(net, &zone->networks, list)
+	if (addr && addr->set)
 	{
-		addrs = fw3_ubus_address(net->name);
-
-		if (!addrs)
-			continue;
+		tmp = malloc(sizeof(*tmp));
 
-		list_for_each_entry_safe(addr, tmp, addrs, list)
+		if (tmp)
 		{
-			list_del(&addr->list);
-			list_add_tail(&addr->list, all);
+			*tmp = *addr;
+			list_add_tail(&tmp->list, all);
 		}
-
-		free(addrs);
 	}
-
-	list_for_each_entry(addr, &zone->subnets, list)
+	else
 	{
-		tmp = malloc(sizeof(*tmp));
+		list_for_each_entry(net, &zone->networks, list)
+			fw3_ubus_address(all, net->name);
 
-		if (!tmp)
-			continue;
+		list_for_each_entry(cur, &zone->subnets, list)
+		{
+			tmp = malloc(sizeof(*tmp));
 
-		memcpy(tmp, addr, sizeof(*tmp));
-		list_add_tail(&tmp->list, all);
+			if (!tmp)
+				continue;
+
+			*tmp = *cur;
+			list_add_tail(&tmp->list, all);
+		}
 	}
 
 	return all;