X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.c;h=55f2e6c105bceb1424c32d81b652d4d395718554;hp=cb91827b404b4267d78686affd1cd33f8e7fc7d6;hb=b6bfb7a067c5699fd5aec28d407d773d3a022567;hpb=061fdb168b98f6d4f23bebf5153d51bb3a85611e diff --git a/zones.c b/zones.c index cb91827..55f2e6c 100644 --- a/zones.c +++ b/zones.c @@ -21,7 +21,7 @@ #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"), @@ -73,15 +73,15 @@ const struct fw3_option fw3_zone_opts[] = { FW3_LIST("network", device, zone, networks), FW3_LIST("device", device, zone, devices), - FW3_LIST("subnet", address, zone, subnets), + FW3_LIST("subnet", network, zone, subnets), FW3_OPT("input", target, zone, policy_input), FW3_OPT("forward", target, zone, policy_forward), 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), @@ -94,20 +94,23 @@ const struct fw3_option fw3_zone_opts[] = { FW3_OPT("log", bool, zone, log), FW3_OPT("log_limit", limit, zone, log_limit), + FW3_OPT("__flags_v4", int, zone, flags[0]), + FW3_OPT("__flags_v6", int, zone, flags[1]), + { } }; 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; @@ -152,9 +155,6 @@ fw3_alloc_zone(void) INIT_LIST_HEAD(&zone->masq_src); INIT_LIST_HEAD(&zone->masq_dest); - INIT_LIST_HEAD(&zone->running_networks); - INIT_LIST_HEAD(&zone->running_devices); - zone->enabled = true; zone->custom_chains = true; zone->log_limit.rate = 10; @@ -219,14 +219,14 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) 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)); @@ -243,8 +243,8 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) 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; @@ -256,13 +256,13 @@ print_zone_chain(enum fw3_table table, enum fw3_family family, /* 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); @@ -273,25 +273,26 @@ print_zone_chain(enum fw3_table table, enum fw3_family family, if (c || r) { info(" * Zone '%s'", zone->name); - fw3_set_running(zone, &state->running_zones); set(zone->flags, family, table); } } 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))) { @@ -332,7 +333,7 @@ print_interface_rule(enum fw3_table table, enum fw3_family family, } 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); @@ -341,7 +342,7 @@ print_interface_rule(enum fw3_table table, enum fw3_family family, 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); @@ -388,8 +389,8 @@ print_interface_rule(enum fw3_table table, enum fw3_family family, } 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; @@ -403,18 +404,18 @@ print_interface_rules(enum fw3_table table, enum fw3_family family, 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; @@ -433,7 +434,7 @@ print_zone_rule(enum fw3_table table, enum fw3_family family, 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))) { @@ -460,9 +461,13 @@ print_zone_rule(enum fw3_table table, enum fw3_family family, 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; @@ -472,41 +477,41 @@ print_zone_rule(enum fw3_table table, enum fw3_family family, 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) + list_for_each_entry_safe(z, tmp, &state->zones, list) { if (!has(z->flags, family, table)) continue; @@ -515,14 +520,46 @@ fw3_flush_zones(enum fw3_table table, enum fw3_family family, 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->zones, 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->zones, list) + { + if (hasbit(z->flags[0], FW3_FLAG_HOTPLUG)) + { + list_for_each_entry(d, &z->devices, list) + fw3_hotplug(add, z, d); + + delbit(z->flags[0], FW3_FLAG_HOTPLUG); + } } } } struct fw3_zone * -fw3_lookup_zone(struct fw3_state *state, const char *name, bool running) +fw3_lookup_zone(struct fw3_state *state, const char *name) { struct fw3_zone *z; @@ -534,11 +571,28 @@ fw3_lookup_zone(struct fw3_state *state, const char *name, bool running) if (strcmp(z->name, name)) continue; - if (!running || z->running_list.next) - return z; - - break; + return z; } return NULL; } + +void +fw3_free_zone(struct fw3_zone *zone) +{ + struct fw3_device *dev, *tmp; + + list_for_each_entry_safe(dev, tmp, &zone->devices, list) + { + list_del(&dev->list); + free(dev); + } + + list_for_each_entry_safe(dev, tmp, &zone->networks, list) + { + list_del(&dev->list); + free(dev); + } + + fw3_free_object(zone, fw3_zone_opts); +}