summaryrefslogtreecommitdiffstats
path: root/package/firewall/files/lib/core_init.sh
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-16 21:54:59 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-16 21:54:59 +0000
commitf19aa29f129ac74cc08c21d84711570e9fbabfd4 (patch)
tree88eab7603c7dd1e0c264c08b6367215f8dd3963d /package/firewall/files/lib/core_init.sh
parentd440b026f62fea5ff3949e1e6f9fc1fce9861b06 (diff)
[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.sh12
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 42124b39b..185fffb98 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