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)
{
}
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_output);
- setbit(zone->flags[0], zone->policy_forward);
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_output);
- setbit(zone->flags[1], zone->policy_forward);
list_add_tail(&zone->list, &state->zones);
}
fw3_ipt_rule_append(r, "zone_%s_input", zone->name);
r = fw3_ipt_rule_new(handle);
- fw3_ipt_rule_target(r, "zone_%s_dest_%s", zone->name,
+ fw3_ipt_rule_target(r, "zone_%s_src_%s", zone->name,
fw3_flag_names[zone->policy_forward]);
fw3_ipt_rule_append(r, "zone_%s_forward", zone->name);
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))
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);
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;
}