1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 05:42:59 +02:00

[backfire] merge r25627

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25628 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-02-20 18:27:58 +00:00
parent d3102df338
commit 6c4804044b
2 changed files with 6 additions and 2 deletions

View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=6in4
PKG_VERSION:=8
PKG_VERSION:=9
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk

View File

@ -29,11 +29,12 @@ if [ "$ACTION" = ifup ]; then
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-f0-9]/}" ] || {
password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
}
uci_set_state network "$cfg" ipaddr "$wanip"
(
local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid"
@ -51,6 +52,9 @@ if [ "$ACTION" = ifup ]; then
}
done
)&
} || {
logger -t 6in4-update "Re-establishing tunnel due to change on $INTERFACE ($DEVICE)"
ifup "$cfg" &
}
}
}