#define C(f, tbl, tgt, fmt) \
- { FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_TARGET_##tgt, fmt }
+ { FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_FLAG_##tgt, fmt }
static const struct fw3_rule_spec zone_chains[] = {
C(ANY, FILTER, UNSPEC, "zone_%1$s_input"),
FW3_OPT("output", target, zone, policy_output),
FW3_OPT("masq", bool, zone, masq),
- FW3_LIST("masq_src", address, zone, masq_src),
- FW3_LIST("masq_dest", address, zone, masq_dest),
+ FW3_LIST("masq_src", network, zone, masq_src),
+ FW3_LIST("masq_dest", network, zone, masq_dest),
FW3_OPT("extra", string, zone, extra_src),
FW3_OPT("extra_src", string, zone, extra_src),
static void
-check_policy(struct uci_element *e, enum fw3_target *pol, enum fw3_target def,
+check_policy(struct uci_element *e, enum fw3_flag *pol, enum fw3_flag def,
const char *name)
{
- if (*pol == FW3_TARGET_UNSPEC)
+ if (*pol == FW3_FLAG_UNSPEC)
{
warn_elem(e, "has no %s policy specified, using default", name);
*pol = def;
}
- else if (*pol > FW3_TARGET_DROP)
+ else if (*pol > FW3_FLAG_DROP)
{
warn_elem(e, "has invalid %s policy, using default", name);
*pol = def;
if (zone->masq)
{
- setbit(zone->flags[0], FW3_TARGET_SNAT);
+ setbit(zone->flags[0], FW3_FLAG_SNAT);
zone->conntrack = true;
}
if (zone->custom_chains)
{
- setbit(zone->flags[0], FW3_TARGET_SNAT);
- setbit(zone->flags[0], FW3_TARGET_DNAT);
+ setbit(zone->flags[0], FW3_FLAG_SNAT);
+ setbit(zone->flags[0], FW3_FLAG_DNAT);
}
setbit(zone->flags[0], fw3_to_src_target(zone->policy_input));
static void
-print_zone_chain(enum fw3_table table, enum fw3_family family,
- struct fw3_zone *zone, bool reload, struct fw3_state *state)
+print_zone_chain(struct fw3_state *state, enum fw3_family family,
+ enum fw3_table table, bool reload, struct fw3_zone *zone)
{
bool c, r;
uint32_t custom_mask = ~0;
/* Don't touch user chains on reload */
if (reload)
- delbit(custom_mask, FW3_TARGET_CUSTOM_CHAINS);
+ delbit(custom_mask, FW3_FLAG_CUSTOM_CHAINS);
if (zone->custom_chains)
- set(zone->flags, family, FW3_TARGET_CUSTOM_CHAINS);
+ set(zone->flags, family, FW3_FLAG_CUSTOM_CHAINS);
if (!zone->conntrack && !state->defaults.drop_invalid)
- set(zone->flags, family, FW3_TARGET_NOTRACK);
+ set(zone->flags, family, FW3_FLAG_NOTRACK);
c = fw3_pr_rulespec(table, family, zone->flags, custom_mask, zone_chains,
":%s - [0:0]\n", zone->name);
}
static void
-print_interface_rule(enum fw3_table table, enum fw3_family family,
- struct fw3_zone *zone, struct fw3_device *dev,
- struct fw3_address *sub, bool reload, bool disable_notrack)
+print_interface_rule(struct fw3_state *state, enum fw3_family family,
+ enum fw3_table table, bool reload, struct fw3_zone *zone,
+ struct fw3_device *dev, struct fw3_address *sub)
{
- enum fw3_target t;
+ bool disable_notrack = state->defaults.drop_invalid;
+
+ enum fw3_flag t;
#define jump_target(t) \
- ((t == FW3_TARGET_REJECT) ? "reject" : fw3_flag_names[t])
+ ((t == FW3_FLAG_REJECT) ? "reject" : fw3_flag_names[t])
if (table == FW3_TABLE_FILTER)
{
- for (t = FW3_TARGET_ACCEPT; t <= FW3_TARGET_DROP; t++)
+ for (t = FW3_FLAG_ACCEPT; t <= FW3_FLAG_DROP; t++)
{
if (has(zone->flags, family, fw3_to_src_target(t)))
{
}
else if (table == FW3_TABLE_NAT)
{
- if (has(zone->flags, family, FW3_TARGET_DNAT))
+ if (has(zone->flags, family, FW3_FLAG_DNAT))
{
fw3_pr("-A delegate_prerouting");
fw3_format_in_out(dev, NULL);
fw3_pr(" -j zone_%s_prerouting\n", zone->name);
}
- if (has(zone->flags, family, FW3_TARGET_SNAT))
+ if (has(zone->flags, family, FW3_FLAG_SNAT))
{
fw3_pr("-A delegate_postrouting");
fw3_format_in_out(NULL, dev);
}
static void
-print_interface_rules(enum fw3_table table, enum fw3_family family,
- struct fw3_zone *zone, bool reload, bool disable_notrack)
+print_interface_rules(struct fw3_state *state, enum fw3_family family,
+ enum fw3_table table, bool reload, struct fw3_zone *zone)
{
struct fw3_device *dev;
struct fw3_address *sub;
if (!dev && !sub)
continue;
- print_interface_rule(table, family, zone, dev, sub, reload, disable_notrack);
+ print_interface_rule(state, family, table, reload, zone, dev, sub);
}
}
static void
-print_zone_rule(enum fw3_table table, enum fw3_family family,
- struct fw3_zone *zone, bool reload, bool disable_notrack)
+print_zone_rule(struct fw3_state *state, enum fw3_family family,
+ enum fw3_table table, bool reload, struct fw3_zone *zone)
{
struct fw3_address *msrc;
struct fw3_address *mdest;
- enum fw3_target t;
+ enum fw3_flag t;
if (!fw3_is_family(zone, family))
return;
if (zone->log)
{
- for (t = FW3_TARGET_REJECT; t <= FW3_TARGET_DROP; t++)
+ for (t = FW3_FLAG_REJECT; t <= FW3_FLAG_DROP; t++)
{
if (has(zone->flags, family, fw3_to_src_target(t)))
{
fw3_foreach(msrc, &zone->masq_src)
fw3_foreach(mdest, &zone->masq_dest)
{
- fw3_pr("-A zone_%s_postrouting ", zone->name);
+ if (!fw3_is_family(msrc, family) ||
+ !fw3_is_family(mdest, family))
+ continue;
+
+ fw3_pr("-A zone_%s_postrouting", zone->name);
fw3_format_src_dest(msrc, mdest);
- fw3_pr("-j MASQUERADE\n");
+ fw3_pr(" -j MASQUERADE\n");
}
}
break;
break;
}
- print_interface_rules(table, family, zone, reload, disable_notrack);
+ print_interface_rules(state, family, table, reload, zone);
}
void
-fw3_print_zone_chains(enum fw3_table table, enum fw3_family family,
- bool reload, struct fw3_state *state)
+fw3_print_zone_chains(struct fw3_state *state, enum fw3_family family,
+ enum fw3_table table, bool reload)
{
struct fw3_zone *zone;
list_for_each_entry(zone, &state->zones, list)
- print_zone_chain(table, family, zone, reload, state);
+ print_zone_chain(state, family, table, reload, zone);
}
void
-fw3_print_zone_rules(enum fw3_table table, enum fw3_family family,
- bool reload, struct fw3_state *state)
+fw3_print_zone_rules(struct fw3_state *state, enum fw3_family family,
+ enum fw3_table table, bool reload)
{
struct fw3_zone *zone;
list_for_each_entry(zone, &state->zones, list)
- print_zone_rule(table, family, zone, reload, state->defaults.drop_invalid);
+ print_zone_rule(state, family, table, reload, zone);
}
void
-fw3_flush_zones(enum fw3_table table, enum fw3_family family,
- bool pass2, bool reload, struct fw3_state *state)
+fw3_flush_zones(struct fw3_state *state, enum fw3_family family,
+ enum fw3_table table, bool reload, bool pass2)
{
struct fw3_zone *z, *tmp;
uint32_t custom_mask = ~0;
/* don't touch user chains on selective stop */
if (reload)
- delbit(custom_mask, FW3_TARGET_CUSTOM_CHAINS);
+ delbit(custom_mask, FW3_FLAG_CUSTOM_CHAINS);
list_for_each_entry_safe(z, tmp, &state->running_zones, running_list)
{
pass2 ? "-X %s\n" : "-F %s\n", z->name);
if (pass2)
- {
del(z->flags, family, table);
+ }
+}
+
+void
+fw3_hotplug_zones(struct fw3_state *state, bool add)
+{
+ struct fw3_zone *z;
+ struct fw3_device *d;
+
+ if (add)
+ {
+ list_for_each_entry(z, &state->running_zones, running_list)
+ {
+ if (!hasbit(z->flags[0], FW3_FLAG_HOTPLUG))
+ {
+ list_for_each_entry(d, &z->devices, list)
+ fw3_hotplug(add, z, d);
+
+ setbit(z->flags[0], FW3_FLAG_HOTPLUG);
+ }
+ }
+ }
+ else
+ {
+ list_for_each_entry(z, &state->running_zones, running_list)
+ {
+ if (hasbit(z->flags[0], FW3_FLAG_HOTPLUG))
+ {
+ list_for_each_entry(d, &z->running_devices, list)
+ fw3_hotplug(add, z, d);
+
+ delbit(z->flags[0], FW3_FLAG_HOTPLUG);
+ }
}
}
}
return NULL;
}
+
+void
+fw3_free_zone(struct fw3_zone *zone)
+{
+ struct fw3_device *dev, *tmp;
+
+ list_for_each_entry_safe(dev, tmp, &zone->running_devices, list)
+ {
+ list_del(&dev->list);
+ free(dev);
+ }
+
+ list_for_each_entry_safe(dev, tmp, &zone->running_networks, list)
+ {
+ list_del(&dev->list);
+ free(dev);
+ }
+
+ fw3_free_object(zone, fw3_zone_opts);
+}