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/fw.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/fw.sh')
-rw-r--r-- | package/firewall/files/lib/fw.sh | 17 |
1 files changed, 17 insertions, 0 deletions
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 +} |