X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=zones.c;h=2ddd7b44443f3b2714e19ffb2f8b8b29320700d2;hp=62d9e369d00b93c89af42837789588e141155c78;hb=b59934331c4b9271ceb5e30b793a552618299d39;hpb=23741a3279981c5e0ce3ca9e00e368d4f0b142b6 diff --git a/zones.c b/zones.c index 62d9e36..2ddd7b4 100644 --- a/zones.c +++ b/zones.c @@ -20,51 +20,54 @@ #include "ubus.h" -#define C(f, tbl, tgt, name) \ - { FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_TARGET_##tgt, name } - -struct chain { - enum fw3_family family; - enum fw3_table table; - enum fw3_target target; - const char *name; -}; +#define C(f, tbl, tgt, fmt) \ + { FW3_FAMILY_##f, FW3_TABLE_##tbl, FW3_FLAG_##tgt, fmt } -static const struct chain src_chains[] = { - C(ANY, FILTER, UNSPEC, "zone_%s_input"), - C(ANY, FILTER, UNSPEC, "zone_%s_output"), - C(ANY, FILTER, UNSPEC, "zone_%s_forward"), +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"), - C(ANY, FILTER, ACCEPT, "zone_%s_src_ACCEPT"), - C(ANY, FILTER, REJECT, "zone_%s_src_REJECT"), - C(ANY, FILTER, DROP, "zone_%s_src_DROP"), -}; + C(ANY, FILTER, SRC_ACCEPT, "zone_%s_src_ACCEPT"), + C(ANY, FILTER, SRC_REJECT, "zone_%s_src_REJECT"), + C(ANY, FILTER, SRC_DROP, "zone_%s_src_DROP"), + + C(ANY, FILTER, ACCEPT, "zone_%s_dest_ACCEPT"), + C(ANY, FILTER, REJECT, "zone_%s_dest_REJECT"), + C(ANY, FILTER, DROP, "zone_%s_dest_DROP"), + + C(V4, NAT, SNAT, "zone_%s_postrouting"), + C(V4, NAT, DNAT, "zone_%s_prerouting"), + + C(ANY, RAW, NOTRACK, "zone_%s_notrack"), -static const struct chain dst_chains[] = { - C(ANY, FILTER, ACCEPT, "zone_%s_dest_ACCEPT"), - C(ANY, FILTER, REJECT, "zone_%s_dest_REJECT"), - C(ANY, FILTER, DROP, "zone_%s_dest_DROP"), + C(ANY, FILTER, CUSTOM_CHAINS, "input_%s_rule"), + C(ANY, FILTER, CUSTOM_CHAINS, "output_%s_rule"), + C(ANY, FILTER, CUSTOM_CHAINS, "forwarding_%s_rule"), - C(V4, NAT, SNAT, "zone_%s_postrouting"), - C(V4, NAT, DNAT, "zone_%s_prerouting"), + C(V4, NAT, CUSTOM_CHAINS, "prerouting_%s_rule"), + C(V4, NAT, CUSTOM_CHAINS, "postrouting_%s_rule"), - C(ANY, RAW, NOTRACK, "zone_%s_notrack"), + { } }; -static struct fw3_option zone_opts[] = { +const struct fw3_option fw3_zone_opts[] = { + FW3_OPT("enabled", bool, zone, enabled), + FW3_OPT("name", string, zone, name), + FW3_OPT("family", family, zone, family), 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), @@ -76,48 +79,26 @@ static struct fw3_option 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 bool -print_chains(enum fw3_table table, enum fw3_family family, - const char *fmt, const char *name, uint16_t targets, - const struct chain *chains, int n) -{ - bool rv = false; - char cn[128] = { 0 }; - const struct chain *c; + FW3_LIST("__addrs", address, zone, old_addrs), - for (c = chains; n > 0; c++, n--) - { - if (!fw3_is_family(c, family)) - continue; - - if (c->table != table) - continue; - - if ((c->target != FW3_TARGET_UNSPEC) && !hasbit(targets, c->target)) - continue; - - snprintf(cn, sizeof(cn), c->name, name); - fw3_pr(fmt, cn); - - rv = true; - } + { } +}; - return rv; -} 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; @@ -139,10 +120,35 @@ resolve_networks(struct uci_element *e, struct fw3_zone *zone) continue; } + snprintf(tmp->network, sizeof(tmp->network), "%s", net->name); list_add_tail(&tmp->list, &zone->devices); } } +struct fw3_zone * +fw3_alloc_zone(void) +{ + struct fw3_zone *zone; + + zone = calloc(1, sizeof(*zone)); + if (!zone) + return NULL; + + INIT_LIST_HEAD(&zone->networks); + INIT_LIST_HEAD(&zone->devices); + INIT_LIST_HEAD(&zone->subnets); + INIT_LIST_HEAD(&zone->masq_src); + INIT_LIST_HEAD(&zone->masq_dest); + + INIT_LIST_HEAD(&zone->old_addrs); + + zone->enabled = true; + zone->custom_chains = true; + zone->log_limit.rate = 10; + + return zone; +} + void fw3_load_zones(struct fw3_state *state, struct uci_package *p) { @@ -160,26 +166,25 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) if (strcmp(s->type, "zone")) continue; - zone = malloc(sizeof(*zone)); + zone = fw3_alloc_zone(); if (!zone) continue; - memset(zone, 0, sizeof(*zone)); - - INIT_LIST_HEAD(&zone->networks); - INIT_LIST_HEAD(&zone->devices); - INIT_LIST_HEAD(&zone->subnets); - INIT_LIST_HEAD(&zone->masq_src); - INIT_LIST_HEAD(&zone->masq_dest); + fw3_parse_options(zone, fw3_zone_opts, s); - zone->log_limit.rate = 10; - - fw3_parse_options(zone, zone_opts, ARRAY_SIZE(zone_opts), s); + if (!zone->enabled) + { + fw3_free_zone(zone); + continue; + } if (!zone->extra_dest) zone->extra_dest = zone->extra_src; + if (!defs->custom_chains && zone->custom_chains) + zone->custom_chains = false; + if (!zone->name || !*zone->name) { warn_elem(e, "has no name - ignoring"); @@ -187,6 +192,16 @@ 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; + } + + fw3_ubus_zone_devices(zone); + if (list_empty(&zone->networks) && list_empty(&zone->devices) && list_empty(&zone->subnets) && !zone->extra_src) { @@ -201,13 +216,23 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p) if (zone->masq) { - setbit(zone->dst_flags, FW3_TARGET_SNAT); + setbit(zone->flags[0], FW3_FLAG_SNAT); zone->conntrack = true; } - setbit(zone->src_flags, zone->policy_input); - setbit(zone->dst_flags, zone->policy_output); - setbit(zone->dst_flags, zone->policy_forward); + if (zone->custom_chains) + { + 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)); + setbit(zone->flags[0], zone->policy_forward); + setbit(zone->flags[0], zone->policy_output); + + setbit(zone->flags[1], fw3_to_src_target(zone->policy_input)); + setbit(zone->flags[1], zone->policy_forward); + setbit(zone->flags[1], zone->policy_output); list_add_tail(&zone->list, &state->zones); } @@ -215,138 +240,205 @@ 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 disable_notrack) +print_zone_chain(struct fw3_ipt_handle *handle, struct fw3_state *state, + bool reload, struct fw3_zone *zone) { - bool s, d; - - if (!fw3_is_family(zone, family)) + int i; + struct fw3_ipt_rule *r; + const struct fw3_chain_spec *c; + + const char *flt_chains[] = { + "input", "input", + "output", "output", + "forward", "forwarding", + }; + + const char *nat_chains[] = { + "prerouting", "prerouting", + "postrouting", "postrouting", + }; + + if (!fw3_is_family(zone, handle->family)) return; - if (!zone->conntrack && !disable_notrack) - setbit(zone->dst_flags, FW3_TARGET_NOTRACK); + info(" * Zone '%s'", zone->name); + + set(zone->flags, handle->family, handle->table); + + if (zone->custom_chains) + set(zone->flags, handle->family, FW3_FLAG_CUSTOM_CHAINS); - s = print_chains(table, family, ":%s - [0:0]\n", zone->name, - zone->src_flags, src_chains, ARRAY_SIZE(src_chains)); + if (!zone->conntrack && !state->defaults.drop_invalid) + set(zone->flags, handle->family, FW3_FLAG_NOTRACK); - d = print_chains(table, family, ":%s - [0:0]\n", zone->name, - zone->dst_flags, dst_chains, ARRAY_SIZE(dst_chains)); + for (c = zone_chains; c->format; c++) + { + /* don't touch user chains on selective stop */ + if (reload && c->flag == FW3_FLAG_CUSTOM_CHAINS) + continue; + + if (!fw3_is_family(c, handle->family)) + continue; + + if (c->table != handle->table) + continue; + + if (c->flag && + !hasbit(zone->flags[handle->family == FW3_FAMILY_V6], c->flag)) + continue; + + fw3_ipt_create_chain(handle, c->format, zone->name); + } + + if (zone->custom_chains) + { + if (handle->table == FW3_TABLE_FILTER) + { + for (i = 0; i < sizeof(flt_chains)/sizeof(flt_chains[0]); i += 2) + { + r = fw3_ipt_rule_new(handle); + fw3_ipt_rule_comment(r, "user chain for %s", flt_chains[i+1]); + fw3_ipt_rule_target(r, "%s_%s_rule", flt_chains[i+1], zone->name); + fw3_ipt_rule_append(r, "zone_%s_%s", zone->name, flt_chains[i]); + } + } + else if (handle->table == FW3_TABLE_NAT) + { + for (i = 0; i < sizeof(nat_chains)/sizeof(nat_chains[0]); i += 2) + { + r = fw3_ipt_rule_new(handle); + fw3_ipt_rule_comment(r, "user chain for %s", nat_chains[i+1]); + fw3_ipt_rule_target(r, "%s_%s_rule", nat_chains[i+1], zone->name); + fw3_ipt_rule_append(r, "zone_%s_%s", zone->name, nat_chains[i]); + } + } + } - if (s || d) - info(" * Zone '%s'", zone->name); + set(zone->flags, handle->family, handle->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 disable_notrack) +print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, + bool reload, struct fw3_zone *zone, + struct fw3_device *dev, struct fw3_address *sub) { - enum fw3_target t; + struct fw3_protocol tcp = { .protocol = 6 }; + struct fw3_ipt_rule *r; + enum fw3_flag t; + + char buf[32]; + + int i; + + const char *chains[] = { + "input", + "output", + "forward", + }; #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) + if (handle->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 (hasbit(zone->src_flags, t)) + if (has(zone->flags, handle->family, fw3_to_src_target(t))) { - fw3_pr("-A zone_%s_src_%s", zone->name, fw3_flag_names[t]); - fw3_format_in_out(dev, NULL); - fw3_format_src_dest(sub, NULL); - fw3_format_extra(zone->extra_src); - fw3_pr(" -j %s\n", jump_target(t)); + r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); + fw3_ipt_rule_target(r, jump_target(t)); + fw3_ipt_rule_extra(r, zone->extra_src); + fw3_ipt_rule_replace(r, "zone_%s_src_%s", zone->name, + fw3_flag_names[t]); } - if (hasbit(zone->dst_flags, t)) + if (has(zone->flags, handle->family, t)) { - fw3_pr("-A zone_%s_dest_%s", zone->name, fw3_flag_names[t]); - fw3_format_in_out(NULL, dev); - fw3_format_src_dest(NULL, sub); - fw3_format_extra(zone->extra_dest); - fw3_pr(" -j %s\n", jump_target(t)); + r = fw3_ipt_rule_create(handle, NULL, NULL, dev, NULL, sub); + fw3_ipt_rule_target(r, jump_target(t)); + fw3_ipt_rule_extra(r, zone->extra_dest); + fw3_ipt_rule_replace(r, "zone_%s_dest_%s", zone->name, + fw3_flag_names[t]); } } - fw3_pr("-A delegate_input"); - fw3_format_in_out(dev, NULL); - fw3_format_src_dest(sub, NULL); - fw3_format_extra(zone->extra_src); - fw3_pr(" -j zone_%s_input\n", zone->name); - - fw3_pr("-A delegate_forward"); - fw3_format_in_out(dev, NULL); - fw3_format_src_dest(sub, NULL); - fw3_format_extra(zone->extra_src); - fw3_pr(" -j zone_%s_forward\n", zone->name); - - fw3_pr("-A delegate_output"); - fw3_format_in_out(NULL, dev); - fw3_format_src_dest(NULL, sub); - fw3_format_extra(zone->extra_dest); - fw3_pr(" -j zone_%s_output\n", zone->name); + for (i = 0; i < sizeof(chains)/sizeof(chains[0]); i++) + { + if (*chains[i] == 'o') + r = fw3_ipt_rule_create(handle, NULL, NULL, dev, NULL, sub); + else + r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); + + fw3_ipt_rule_target(r, "zone_%s_%s", zone->name, chains[i]); + + if (*chains[i] == 'o') + fw3_ipt_rule_extra(r, zone->extra_dest); + else + fw3_ipt_rule_extra(r, zone->extra_src); + + fw3_ipt_rule_replace(r, "delegate_%s", chains[i]); + } } - else if (table == FW3_TABLE_NAT) + else if (handle->table == FW3_TABLE_NAT) { - if (hasbit(zone->dst_flags, FW3_TARGET_DNAT)) + if (has(zone->flags, handle->family, FW3_FLAG_DNAT)) { - fw3_pr("-A delegate_prerouting"); - fw3_format_in_out(dev, NULL); - fw3_format_src_dest(sub, NULL); - fw3_format_extra(zone->extra_src); - fw3_pr(" -j zone_%s_prerouting\n", zone->name); + r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); + fw3_ipt_rule_target(r, "zone_%s_prerouting", zone->name); + fw3_ipt_rule_extra(r, zone->extra_src); + fw3_ipt_rule_replace(r, "delegate_prerouting"); } - if (hasbit(zone->dst_flags, FW3_TARGET_SNAT)) + if (has(zone->flags, handle->family, FW3_FLAG_SNAT)) { - fw3_pr("-A delegate_postrouting"); - fw3_format_in_out(NULL, dev); - fw3_format_src_dest(NULL, sub); - fw3_format_extra(zone->extra_dest); - fw3_pr(" -j zone_%s_postrouting\n", zone->name); + r = fw3_ipt_rule_create(handle, NULL, NULL, dev, NULL, sub); + fw3_ipt_rule_target(r, "zone_%s_postrouting", zone->name); + fw3_ipt_rule_extra(r, zone->extra_dest); + fw3_ipt_rule_replace(r, "delegate_postrouting"); } } - else if (table == FW3_TABLE_MANGLE) + else if (handle->table == FW3_TABLE_MANGLE) { if (zone->mtu_fix) { if (zone->log) { - fw3_pr("-A mssfix"); - fw3_format_in_out(NULL, dev); - fw3_format_src_dest(NULL, sub); - fw3_pr(" -p tcp --tcp-flags SYN,RST SYN"); - fw3_format_limit(&zone->log_limit); - fw3_format_comment(zone->name, " (mtu_fix logging)"); - fw3_pr(" -j LOG --log-prefix \"MSSFIX(%s): \"\n", zone->name); + snprintf(buf, sizeof(buf) - 1, "MSSFIX(%s): ", zone->name); + + r = fw3_ipt_rule_create(handle, &tcp, NULL, dev, NULL, sub); + fw3_ipt_rule_addarg(r, false, "--tcp-flags", "SYN,RST"); + fw3_ipt_rule_addarg(r, false, "SYN", NULL); + fw3_ipt_rule_limit(r, &zone->log_limit); + fw3_ipt_rule_comment(r, "%s (mtu_fix logging)", zone->name); + fw3_ipt_rule_target(r, "LOG"); + fw3_ipt_rule_addarg(r, false, "--log-prefix", buf); + fw3_ipt_rule_replace(r, "mssfix"); } - fw3_pr("-A mssfix"); - fw3_format_in_out(NULL, dev); - fw3_format_src_dest(NULL, sub); - fw3_pr(" -p tcp --tcp-flags SYN,RST SYN"); - fw3_format_comment(zone->name, " (mtu_fix)"); - fw3_pr(" -j TCPMSS --clamp-mss-to-pmtu\n"); + r = fw3_ipt_rule_create(handle, &tcp, NULL, dev, NULL, sub); + fw3_ipt_rule_addarg(r, false, "--tcp-flags", "SYN,RST"); + fw3_ipt_rule_addarg(r, false, "SYN", NULL); + fw3_ipt_rule_comment(r, "%s (mtu_fix)", zone->name); + fw3_ipt_rule_target(r, "TCPMSS"); + fw3_ipt_rule_addarg(r, false, "--clamp-mss-to-pmtu", NULL); + fw3_ipt_rule_replace(r, "mssfix"); } } - else if (table == FW3_TABLE_RAW) + else if (handle->table == FW3_TABLE_RAW) { - if (!zone->conntrack && !disable_notrack) + if (has(zone->flags, handle->family, FW3_FLAG_NOTRACK)) { - fw3_pr("-A notrack"); - fw3_format_in_out(dev, NULL); - fw3_format_src_dest(sub, NULL); - fw3_format_extra(zone->extra_src); - fw3_format_comment(zone->name, " (notrack)"); - fw3_pr(" -j CT --notrack\n", zone->name); + r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL); + fw3_ipt_rule_target(r, "zone_%s_notrack", zone->name); + fw3_ipt_rule_extra(r, zone->extra_src); + fw3_ipt_rule_replace(r, "delegate_notrack"); } } } static void -print_interface_rules(enum fw3_table table, enum fw3_family family, - struct fw3_zone *zone, bool disable_notrack) +print_interface_rules(struct fw3_ipt_handle *handle, struct fw3_state *state, + bool reload, struct fw3_zone *zone) { struct fw3_device *dev; struct fw3_address *sub; @@ -354,120 +446,215 @@ print_interface_rules(enum fw3_table table, enum fw3_family family, fw3_foreach(dev, &zone->devices) fw3_foreach(sub, &zone->subnets) { - if (!fw3_is_family(sub, family)) + if (!fw3_is_family(sub, handle->family)) continue; if (!dev && !sub) continue; - print_interface_rule(table, family, zone, dev, sub, disable_notrack); + print_interface_rule(handle, state, reload, zone, dev, sub); } } static void -print_zone_rule(enum fw3_table table, enum fw3_family family, - struct fw3_zone *zone, bool disable_notrack) +print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state, + bool reload, struct fw3_zone *zone) { + bool disable_notrack = state->defaults.drop_invalid; struct fw3_address *msrc; struct fw3_address *mdest; + struct fw3_ipt_rule *r; - enum fw3_target t; + enum fw3_flag t; + char buf[32]; - if (!fw3_is_family(zone, family)) + if (!fw3_is_family(zone, handle->family)) return; - switch (table) + switch (handle->table) { case FW3_TABLE_FILTER: - fw3_pr("-A zone_%s_input -j zone_%s_src_%s\n", - zone->name, zone->name, fw3_flag_names[zone->policy_input]); + if (has(zone->flags, handle->family, FW3_FLAG_DNAT)) + { + r = fw3_ipt_rule_new(handle); + fw3_ipt_rule_extra(r, "-m conntrack --ctstate DNAT"); + fw3_ipt_rule_comment(r, "Accept port redirections"); + fw3_ipt_rule_target(r, fw3_flag_names[FW3_FLAG_ACCEPT]); + fw3_ipt_rule_append(r, "zone_%s_input", zone->name); + + r = fw3_ipt_rule_new(handle); + fw3_ipt_rule_extra(r, "-m conntrack --ctstate DNAT"); + fw3_ipt_rule_comment(r, "Accept port forwards"); + fw3_ipt_rule_target(r, fw3_flag_names[FW3_FLAG_ACCEPT]); + fw3_ipt_rule_append(r, "zone_%s_forward", zone->name); + } + + r = fw3_ipt_rule_new(handle); + fw3_ipt_rule_target(r, "zone_%s_src_%s", zone->name, + fw3_flag_names[zone->policy_input]); + fw3_ipt_rule_append(r, "zone_%s_input", zone->name); - fw3_pr("-A zone_%s_forward -j zone_%s_dest_%s\n", - zone->name, zone->name, fw3_flag_names[zone->policy_forward]); + r = fw3_ipt_rule_new(handle); + fw3_ipt_rule_target(r, "zone_%s_dest_%s", zone->name, + fw3_flag_names[zone->policy_forward]); + fw3_ipt_rule_append(r, "zone_%s_forward", zone->name); - fw3_pr("-A zone_%s_output -j zone_%s_dest_%s\n", - zone->name, zone->name, fw3_flag_names[zone->policy_output]); + r = fw3_ipt_rule_new(handle); + fw3_ipt_rule_target(r, "zone_%s_dest_%s", zone->name, + fw3_flag_names[zone->policy_output]); + fw3_ipt_rule_append(r, "zone_%s_output", zone->name); if (zone->log) { - for (t = FW3_TARGET_REJECT; t <= FW3_TARGET_DROP; t++) + for (t = FW3_FLAG_REJECT; t <= FW3_FLAG_DROP; t++) { - if (hasbit(zone->src_flags, t)) + if (has(zone->flags, handle->family, fw3_to_src_target(t))) { - fw3_pr("-A zone_%s_src_%s", zone->name, fw3_flag_names[t]); - fw3_format_limit(&zone->log_limit); - fw3_pr(" -j LOG --log-prefix \"%s(src %s)\"\n", - fw3_flag_names[t], zone->name); + r = fw3_ipt_rule_new(handle); + + snprintf(buf, sizeof(buf) - 1, "%s(src %s)", + fw3_flag_names[t], zone->name); + + fw3_ipt_rule_limit(r, &zone->log_limit); + fw3_ipt_rule_target(r, "LOG"); + fw3_ipt_rule_addarg(r, false, "--log-prefix", buf); + fw3_ipt_rule_append(r, "zone_%s_src_%s", + zone->name, fw3_flag_names[t]); } - if (hasbit(zone->dst_flags, t)) + if (has(zone->flags, handle->family, t)) { - fw3_pr("-A zone_%s_dest_%s", zone->name, fw3_flag_names[t]); - fw3_format_limit(&zone->log_limit); - fw3_pr(" -j LOG --log-prefix \"%s(dest %s)\"\n", - fw3_flag_names[t], zone->name); + r = fw3_ipt_rule_new(handle); + + snprintf(buf, sizeof(buf) - 1, "%s(dest %s)", + fw3_flag_names[t], zone->name); + + fw3_ipt_rule_limit(r, &zone->log_limit); + fw3_ipt_rule_target(r, "LOG"); + fw3_ipt_rule_addarg(r, false, "--log-prefix", buf); + fw3_ipt_rule_append(r, "zone_%s_dest_%s", + zone->name, fw3_flag_names[t]); } } } break; case FW3_TABLE_NAT: - if (zone->masq && family == FW3_FAMILY_V4) + if (zone->masq && handle->family == FW3_FAMILY_V4) { fw3_foreach(msrc, &zone->masq_src) fw3_foreach(mdest, &zone->masq_dest) { - fw3_pr("-A zone_%s_postrouting ", zone->name); - fw3_format_src_dest(msrc, mdest); - fw3_pr("-j MASQUERADE\n"); + if (!fw3_is_family(msrc, handle->family) || + !fw3_is_family(mdest, handle->family)) + continue; + + r = fw3_ipt_rule_new(handle); + fw3_ipt_rule_src_dest(r, msrc, mdest); + fw3_ipt_rule_target(r, "MASQUERADE"); + fw3_ipt_rule_append(r, "zone_%s_postrouting", zone->name); } } break; case FW3_TABLE_RAW: + if (!zone->conntrack && !disable_notrack) + { + r = fw3_ipt_rule_new(handle); + fw3_ipt_rule_target(r, "CT"); + fw3_ipt_rule_addarg(r, false, "--notrack", NULL); + fw3_ipt_rule_append(r, "zone_%s_notrack", zone->name); + } + break; + case FW3_TABLE_MANGLE: break; } - print_interface_rules(table, family, zone, disable_notrack); + print_interface_rules(handle, state, reload, zone); } void -fw3_print_zone_chains(enum fw3_table table, enum fw3_family family, - struct fw3_state *state) +fw3_print_zone_chains(struct fw3_ipt_handle *handle, struct fw3_state *state, + bool reload) { struct fw3_zone *zone; list_for_each_entry(zone, &state->zones, list) - print_zone_chain(table, family, zone, state->defaults.drop_invalid); + print_zone_chain(handle, state, reload, zone); } void -fw3_print_zone_rules(enum fw3_table table, enum fw3_family family, - struct fw3_state *state) +fw3_print_zone_rules(struct fw3_ipt_handle *handle, struct fw3_state *state, + bool reload) { struct fw3_zone *zone; list_for_each_entry(zone, &state->zones, list) - print_zone_rule(table, family, zone, state->defaults.drop_invalid); + print_zone_rule(handle, state, reload, zone); } void -fw3_flush_zones(enum fw3_table table, enum fw3_family family, - bool pass2, struct list_head *statefile) +fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state, + bool reload) { - struct fw3_statefile_entry *e; + struct fw3_zone *z, *tmp; + const struct fw3_chain_spec *c; + char chain[32]; - list_for_each_entry(e, statefile, list) + list_for_each_entry_safe(z, tmp, &state->zones, list) { - if (e->type != FW3_TYPE_ZONE) + if (!has(z->flags, handle->family, handle->table)) continue; - print_chains(table, family, pass2 ? "-X %s\n" : "-F %s\n", - e->name, e->flags[0], src_chains, ARRAY_SIZE(src_chains)); + for (c = zone_chains; c->format; c++) + { + /* don't touch user chains on selective stop */ + if (reload && c->flag == FW3_FLAG_CUSTOM_CHAINS) + continue; + + if (!fw3_is_family(c, handle->family)) + continue; + + 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_flush_chain(handle, chain); + + /* keep certain basic chains that do not depend on any settings to + avoid purging unrelated user rules pointing to them */ + if (reload && !c->flag) + continue; + + fw3_ipt_delete_chain(handle, chain); + } - print_chains(table, family, pass2 ? "-X %s\n" : "-F %s\n", - e->name, e->flags[1], dst_chains, ARRAY_SIZE(dst_chains)); + del(z->flags, handle->family, handle->table); + } +} + +void +fw3_hotplug_zones(struct fw3_state *state, bool add) +{ + struct fw3_zone *z; + struct fw3_device *d; + + list_for_each_entry(z, &state->zones, list) + { + if (add != hasbit(z->flags[0], FW3_FLAG_HOTPLUG)) + { + list_for_each_entry(d, &z->devices, list) + fw3_hotplug(add, z, d); + + if (add) + setbit(z->flags[0], FW3_FLAG_HOTPLUG); + else + delbit(z->flags[0], FW3_FLAG_HOTPLUG); + } } } @@ -480,21 +667,55 @@ fw3_lookup_zone(struct fw3_state *state, const char *name) return NULL; list_for_each_entry(z, &state->zones, list) - if (!strcmp(z->name, name)) - return z; + { + if (strcmp(z->name, name)) + continue; + + return z; + } return NULL; } -void -fw3_free_zone(struct fw3_zone *zone) +struct list_head * +fw3_resolve_zone_addresses(struct fw3_zone *zone, struct fw3_address *addr) { - fw3_free_list(&zone->networks); - fw3_free_list(&zone->devices); - fw3_free_list(&zone->subnets); + struct fw3_device *net; + struct fw3_address *cur, *tmp; + struct list_head *all; + + all = calloc(1, sizeof(*all)); + if (!all) + return NULL; + + INIT_LIST_HEAD(all); + + if (addr && addr->set) + { + tmp = malloc(sizeof(*tmp)); + + if (tmp) + { + *tmp = *addr; + list_add_tail(&tmp->list, all); + } + } + else + { + list_for_each_entry(net, &zone->networks, list) + fw3_ubus_address(all, net->name); + + list_for_each_entry(cur, &zone->subnets, list) + { + tmp = malloc(sizeof(*tmp)); + + if (!tmp) + continue; - fw3_free_list(&zone->masq_src); - fw3_free_list(&zone->masq_dest); + *tmp = *cur; + list_add_tail(&tmp->list, all); + } + } - free(zone); + return all; }