[package] 6in4: replace sed match with variable substitution, change pattern from...

[openwrt.git] / package / 6in4 / files / 6in4.hotplug

diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug
index 0a196c2..790edc0 100644 (file)
--- a/package/6in4/files/6in4.hotplug
+++ b/package/6in4/files/6in4.hotplug
@@ -14,7 +14,7 @@ if [ "$ACTION" = ifup ]; then
                [ "$proto" = 6in4 ] || return 0
 
                local wandev
                [ "$proto" = 6in4 ] || return 0
 
                local wandev

-               config_get wandev "$cfg" wan_device
+               config_get wandev "$cfg" wan_device "$(find_6in4_wanif)"

                [ "$wandev" = "$DEVICE" ] || return 0
 
                local oldip
                [ "$wandev" = "$DEVICE" ] || return 0
 
                local oldip


@@ -32,7 +32,9 @@ if [ "$ACTION" = ifup ]; then
                        config_get password "$cfg" password
 
                        [ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
                        config_get password "$cfg" password
 
                        [ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {

-                               password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
+                               [ "${#password}" == 32 -a -z "${password//[a-f0-9]/}" ] && {
+                                       password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
+                               }

                                uci_set_state network "$cfg" ipaddr "$wanip"
 
                                ( wget -qO/dev/null "http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid" && ifup "$cfg" )&
                                uci_set_state network "$cfg" ipaddr "$wanip"
 
                                ( wget -qO/dev/null "http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid" && ifup "$cfg" )&