X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.c;h=2ddd7b44443f3b2714e19ffb2f8b8b29320700d2;hp=0e17d680ef8d3dcaa3ee33f1c95fe02b6b641a4d;hb=b59934331c4b9271ceb5e30b793a552618299d39;hpb=50e97c52e75bdfd325cf20d43b32d294ff84d92f

diff --git a/zones.c b/zones.c
index 0e17d68..2ddd7b4 100644
--- a/zones.c
+++ b/zones.c
@@ -678,10 +678,10 @@ 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 fw3_address *cur, *tmp;
 	struct list_head *all;
 
 	all = calloc(1, sizeof(*all));
@@ -690,18 +690,31 @@ fw3_resolve_zone_addresses(struct fw3_zone *zone)
 
 	INIT_LIST_HEAD(all);
 
-	list_for_each_entry(net, &zone->networks, list)
-		fw3_ubus_address(all, net->name);
-
-	list_for_each_entry(addr, &zone->subnets, list)
+	if (addr && addr->set)
 	{
 		tmp = malloc(sizeof(*tmp));
 
-		if (!tmp)
-			continue;
+		if (tmp)
+		{
+			*tmp = *addr;
+			list_add_tail(&tmp->list, all);
+		}
+	}
+	else
+	{
+		list_for_each_entry(net, &zone->networks, list)
+			fw3_ubus_address(all, net->name);
+
+		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;