6in4: add netifd support

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

diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug
index 0a196c2..8d78555 100644 (file)
--- a/package/6in4/files/6in4.hotplug
+++ b/package/6in4/files/6in4.hotplug
@@ -3,6 +3,9 @@
 if [ "$ACTION" = ifup ]; then
        . /etc/functions.sh
 
 if [ "$ACTION" = ifup ]; then
        . /etc/functions.sh
 

+       INCLUDE_ONLY=1
+       . /lib/netifd/proto/6in4.sh
+

        include /lib/network
        scan_interfaces
 
        include /lib/network
        scan_interfaces
 


@@ -14,30 +17,12 @@ 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
 
                [ "$wandev" = "$DEVICE" ] || return 0
 

-               local oldip

                local wanip=$(find_6in4_wanip "$wandev")
                local wanip=$(find_6in4_wanip "$wandev")

-               config_get oldip "$cfg" ipaddr
-
-               [ -n "$wanip" ] && [ "$oldip" != "$wanip" ] && {
-                       local tunnelid
-                       config_get tunnelid "$cfg" tunnelid
-
-                       local username
-                       config_get username "$cfg" username
-
-                       local password
-                       config_get password "$cfg" password
-
-                       [ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
-                               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" )&
-                       }
-               }
+               [ -n "$wanip" ] && ifup "$cfg"

        }
 
        config_foreach update_tunnel interface
        }
 
        config_foreach update_tunnel interface