diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-16 21:54:59 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-16 21:54:59 +0000 |
commit | c014101d733d2e27ee4a03d01e3382da0434106f (patch) | |
tree | 60413e903d908b7d92e8b1ff7b1bed4f8bd02d2d /package/firewall/files/lib/core_init.sh | |
parent | b97459eb887d05ad4d01e13e431d4d1f40f0f6a9 (diff) | |
download | upstream-c014101d733d2e27ee4a03d01e3382da0434106f.tar.gz upstream-c014101d733d2e27ee4a03d01e3382da0434106f.tar.bz2 upstream-c014101d733d2e27ee4a03d01e3382da0434106f.zip |
firewall: allow symbolic names of interfaces and aliases in masq_src and masq_dest
SVN-Revision: 27196
Diffstat (limited to 'package/firewall/files/lib/core_init.sh')
-rw-r--r-- | package/firewall/files/lib/core_init.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/package/firewall/files/lib/core_init.sh b/package/firewall/files/lib/core_init.sh index 42124b39bd..185fffb98b 100644 --- a/package/firewall/files/lib/core_init.sh +++ b/package/firewall/files/lib/core_init.sh @@ -245,9 +245,17 @@ fw_load_zone() { if [ "$zone_masq" == 1 ]; then local msrc mdst for msrc in ${zone_masq_src:-0.0.0.0/0}; do - fw_get_negation msrc '-s' "$msrc" + case "$msrc" in + *.*) fw_get_negation msrc '-s' "$msrc" ;; + *) fw_get_subnet4 msrc '-s' "$msrc" ;; + esac + for mdst in ${zone_masq_dest:-0.0.0.0/0}; do - fw_get_negation mdst '-d' "$mdst" + case "$mdst" in + *.*) fw_get_negation mdst '-d' "$mdst" ;; + *) fw_get_subnet4 mdst '-d' "$mdst" ;; + esac + fw add $mode n ${chain}_nat MASQUERADE $ { $msrc $mdst } done done |