EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

firewall: change the order of IPv4/IPv6 address detection, fixes mixed notation v6 improperly detected as v4 address

Browse Source 
SVN-Revision: 21642
This commit is contained in:
Jo-Philipp Wich 2010-05-31 01:34:47 +00:00
parent c14e8be337
commit a756114e59
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/firewall/files/lib/config.sh
View File

@ -87,8 +87,8 @@ config_get_ipaddr() {
local vers= local vers=
case "$addr" in case "$addr" in
*.*) vers=4; mask="${mask:-32}" ;;
*:*) vers=6; mask="${mask:-128}" ;; *:*) vers=6; mask="${mask:-128}" ;;
*.*) vers=4; mask="${mask:-32}" ;;
esac esac
export ${NO_EXPORT:+-n} -- "${varn}=${addr}" export ${NO_EXPORT:+-n} -- "${varn}=${addr}"

2
package/firewall/files/lib/fw.sh
View File

@ -51,8 +51,8 @@ fw__exec() { # <action> <family> <table> <chain> <target> <position> { <rules> }
shift shift
while [ "$1" != '}' ]; do while [ "$1" != '}' ]; do
case "$1" in case "$1" in
*.*.*.*) ip4=1 ;;
*:*) ip6=1 ;; *:*) ip6=1 ;;
*.*.*.*) ip4=1 ;;
esac esac
shift shift
done done