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 | |
| 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')
| -rw-r--r-- | package/firewall/files/lib/core_init.sh | 12 | ||||
| -rw-r--r-- | package/firewall/files/lib/fw.sh | 17 |
2 files changed, 27 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 diff --git a/package/firewall/files/lib/fw.sh b/package/firewall/files/lib/fw.sh index 16a39b6a66..19dddef443 100644 --- a/package/firewall/files/lib/fw.sh +++ b/package/firewall/files/lib/fw.sh @@ -227,3 +227,20 @@ fw_get_negation() { export -n -- "$_var=! $_flag ${_ipaddr#!}" || \ export -n -- "$_var=${_ipaddr:+$_flag $_ipaddr}" } + +fw_get_subnet4() { + local _var="$1" + local _flag="$2" + local _name="$3" + + local _ipaddr="$(uci_get_state network "${_name#!}" ipaddr)" + local _netmask="$(uci_get_state network "${_name#!}" netmask)" + + case "$_ipaddr" in + *.*.*.*) + [ "${_name#!}" != "$_name" ] && \ + export -n -- "$_var=! $_flag $_ipaddr/${_netmask:-255.255.255.255}" || \ + export -n -- "$_var=$_flag $_ipaddr/${_netmask:-255.255.255.255}" + ;; + esac +} |