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 | a847a25be9a3143ea1dafb9d9a47501cacd427a8 (patch) | |
| tree | 88eab7603c7dd1e0c264c08b6367215f8dd3963d /package/firewall/files/lib/core_init.sh | |
| parent | 68086131010abaac2b30d0bbcdd459cda7574c47 (diff) | |
| download | upstream-a847a25be9a3143ea1dafb9d9a47501cacd427a8.tar.gz upstream-a847a25be9a3143ea1dafb9d9a47501cacd427a8.tar.bz2 upstream-a847a25be9a3143ea1dafb9d9a47501cacd427a8.zip | |
[package] firewall: allow symbolic names of interfaces and aliases in masq_src and masq_dest
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27196 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 |