From: Jo-Philipp Wich Date: Tue, 19 Mar 2013 13:48:03 +0000 (+0100) Subject: Accept network names in per-zone subnet option X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=commitdiff_plain;h=c21d2e2ab83dbfe60a45a6962e3b9d197b966a2e;hp=eb2a20924afd979feb485298111ced679de42aa0 Accept network names in per-zone subnet option --- diff --git a/zones.c b/zones.c index 9f4df58..a269629 100644 --- a/zones.c +++ b/zones.c @@ -73,7 +73,7 @@ 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), @@ -465,7 +465,7 @@ print_zone_rule(struct fw3_state *state, enum fw3_family family, 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");