[package] firewall: change the order of IPv4/IPv6 address detection, fixes mixed...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21642 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/firewall/files/lib/config.sh b/package/firewall/files/lib/config.sh
index c213912..996cef8 100644 (file)
--- a/package/firewall/files/lib/config.sh
+++ b/package/firewall/files/lib/config.sh
@@ -87,8 +87,8 @@ config_get_ipaddr() {
 
        local vers=
        case "$addr" in
-               *.*) vers=4; mask="${mask:-32}" ;;
                *:*) vers=6; mask="${mask:-128}" ;;
+               *.*) vers=4; mask="${mask:-32}" ;;
        esac
        
        export ${NO_EXPORT:+-n} -- "${varn}=${addr}"

diff --git a/package/firewall/files/lib/fw.sh b/package/firewall/files/lib/fw.sh
index 5536420..86e8171 100644 (file)
--- a/package/firewall/files/lib/fw.sh
+++ b/package/firewall/files/lib/fw.sh
@@ -51,8 +51,8 @@ fw__exec() { # <action> <family> <table> <chain> <target> <position> { <rules> }
                shift
                while [ "$1" != '}' ]; do
                        case "$1" in
-                               *.*.*.*) ip4=1 ;;
                                *:*) ip6=1 ;;
+                               *.*.*.*) ip4=1 ;;
                        esac
                        shift
                done