X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.c;h=dbf682f482b763b6e2dbaacf6e5bb5ba2c3fc590;hp=4c17c6800cc3d8738038800b8fbd8f8d8f2421a5;hb=1fc128a60160ffe912a06ab6f7870b260438b37d;hpb=fad5b8a021c1cf9c9185bbbc1d16f54aaf867fff

diff --git a/zones.c b/zones.c
index 4c17c68..dbf682f 100644
--- a/zones.c
+++ b/zones.c
@@ -643,6 +643,51 @@ fw3_lookup_zone(struct fw3_state *state, const char *name)
 	return NULL;
 }
 
+struct list_head *
+fw3_resolve_zone_addresses(struct fw3_zone *zone)
+{
+	struct fw3_device *net;
+	struct fw3_address *addr, *tmp;
+	struct list_head *addrs, *all;
+
+	all = malloc(sizeof(*all));
+
+	if (!all)
+		return NULL;
+
+	memset(all, 0, sizeof(*all));
+	INIT_LIST_HEAD(all);
+
+	list_for_each_entry(net, &zone->networks, list)
+	{
+		addrs = fw3_ubus_address(net->name);
+
+		if (!addrs)
+			continue;
+
+		list_for_each_entry_safe(addr, tmp, addrs, list)
+		{
+			list_del(&addr->list);
+			list_add_tail(&addr->list, all);
+		}
+
+		free(addrs);
+	}
+
+	list_for_each_entry(addr, &zone->subnets, list)
+	{
+		tmp = malloc(sizeof(*tmp));
+
+		if (!tmp)
+			continue;
+
+		memcpy(tmp, addr, sizeof(*tmp));
+		list_add_tail(&tmp->list, all);
+	}
+
+	return all;
+}
+
 void
 fw3_free_zone(struct fw3_zone *zone)
 {