6in4: add netifd support

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

diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug
index 3d9def448e9fdba4c2c58580f4467ba123b0ada1..8d78555477239e5a40a9d086ed739bc5a7df435b 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
 
+       INCLUDE_ONLY=1
+       . /lib/netifd/proto/6in4.sh
+
        include /lib/network
        scan_interfaces
 
@@ -19,49 +22,7 @@ if [ "$ACTION" = ifup ]; then
 
                local wanip=$(find_6in4_wanip "$wandev")
 
-               [ -n "$wanip" ] && {
-                       lsmod | grep -q ^sit || {
-                               logger -t 6in4-update "Tunneling driver not loaded yet, deferring action"
-                               exit 0
-                       }
-
-                       local tunnelid
-                       config_get tunnelid "$cfg" tunnelid
-
-                       local username
-                       config_get username "$cfg" username
-
-                       local password
-                       config_get password "$cfg" password
-
-                       uci_set_state network "$cfg" ipaddr "$wanip"
-
-                       [ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
-                               [ "${#password}" == 32 -a -z "${password//[a-fA-F0-9]/}" ] || {
-                                       password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
-                               }
-
-                               (
-                                       local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ip=AUTO&apikey=$username&pass=$password&tid=$tunnelid"
-                                       local try=0
-                                       local max=3
-
-                                       while [ $((++try)) -le $max ]; do
-                                               wget -qO/dev/null "$url" 2>/dev/null && {
-                                                       logger -t 6in4-update "Updated tunnel #$tunnelid endpoint to $wanip"
-                                                       ifup "$cfg"
-                                                       break
-                                               } || {
-                                                       logger -t 6in4-update "Try $try/$max failed, retrying"
-                                                       sleep 1
-                                               }
-                                       done
-                               )&
-                       } || {
-                               logger -t 6in4-update "Re-establishing tunnel due to change on $INTERFACE ($DEVICE)"
-                               ifup "$cfg" &
-                       }
-               }
+               [ -n "$wanip" ] && ifup "$cfg"
        }
 
        config_foreach update_tunnel interface