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;
- list_for_each_entry_safe(dev, tmp, &zone->devices, list)
+ memset(all, 0, sizeof(*all));
+ INIT_LIST_HEAD(all);
+
+ 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;
}