X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=zones.c;h=4de6625b1b318d9a299ad32c672f98adaad9a204;hb=35d57952d708007f5a08a72421fe55e775e3fd0f;hp=11ec56979aaceec7c1f1d43c332bf65724d5651e;hpb=6b27a6665c288937eb5028063064e3350dcab545;p=project%2Ffirewall3.git

diff --git a/zones.c b/zones.c
index 11ec569..4de6625 100644
--- a/zones.c
+++ b/zones.c
@@ -23,7 +23,7 @@
 #define C(f, tbl, tgt, fmt) \
 	{ FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_FLAG_##tgt, fmt }
 
-static const struct fw3_rule_spec zone_chains[] = {
+static const struct fw3_chain_spec zone_chains[] = {
 	C(ANY, FILTER, UNSPEC,        "zone_%s_input"),
 	C(ANY, FILTER, UNSPEC,        "zone_%s_output"),
 	C(ANY, FILTER, UNSPEC,        "zone_%s_forward"),
@@ -189,6 +189,14 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
 			continue;
 		}
 
+		if (strlen(zone->name) > FW3_ZONE_MAXNAMELEN)
+		{
+			warn_elem(e, "must not have a name longer than %u characters",
+			             FW3_ZONE_MAXNAMELEN);
+			fw3_free_zone(zone);
+			continue;
+		}
+
 		if (list_empty(&zone->networks) && list_empty(&zone->devices) &&
 		    list_empty(&zone->subnets) && !zone->extra_src)
 		{
@@ -232,7 +240,7 @@ print_zone_chain(struct fw3_ipt_handle *handle, struct fw3_state *state,
 {
 	int i;
 	struct fw3_ipt_rule *r;
-	const struct fw3_rule_spec *c;
+	const struct fw3_chain_spec *c;
 
 	const char *flt_chains[] = {
 		"input",   "input",
@@ -563,7 +571,7 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
                 bool reload)
 {
 	struct fw3_zone *z, *tmp;
-	const struct fw3_rule_spec *c;
+	const struct fw3_chain_spec *c;
 	char chain[32];
 
 	list_for_each_entry_safe(z, tmp, &state->zones, list)
@@ -574,7 +582,7 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
 		for (c = zone_chains; c->format; c++)
 		{
 			/* don't touch user chains on selective stop */
-			if (reload && hasbit(c->flag, FW3_FLAG_CUSTOM_CHAINS))
+			if (reload && c->flag == FW3_FLAG_CUSTOM_CHAINS)
 				continue;
 
 			if (!fw3_is_family(c, handle->family))
@@ -583,6 +591,9 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
 			if (c->table != handle->table)
 				continue;
 
+			if (c->flag && !has(z->flags, handle->family, c->flag))
+				continue;
+
 			snprintf(chain, sizeof(chain), c->format, z->name);
 			fw3_ipt_delete_rules(handle, chain);
 			fw3_ipt_delete_chain(handle, chain);
@@ -632,22 +643,47 @@ fw3_lookup_zone(struct fw3_state *state, const char *name)
 	return NULL;
 }
 
-void
-fw3_free_zone(struct fw3_zone *zone)
+struct list_head *
+fw3_resolve_zone_addresses(struct fw3_zone *zone)
 {
-	struct fw3_device *dev, *tmp;
+	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_safe(dev, tmp, &zone->devices, list)
+	list_for_each_entry(net, &zone->networks, list)
 	{
-		list_del(&dev->list);
-		free(dev);
+		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_safe(dev, tmp, &zone->networks, list)
+	list_for_each_entry(addr, &zone->subnets, list)
 	{
-		list_del(&dev->list);
-		free(dev);
+		tmp = malloc(sizeof(*tmp));
+
+		if (!tmp)
+			continue;
+
+		memcpy(tmp, addr, sizeof(*tmp));
+		list_add_tail(&tmp->list, all);
 	}
 
-	fw3_free_object(zone, fw3_zone_opts);
+	return all;
 }