X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f043f99dc044ed8c36577faed7f3b2d3f15548e9..bb14a2f07c5b50fac48f91e68bb692ed7e0f1304:/package/comgt/files/3g.sh?ds=sidebyside diff --git a/package/comgt/files/3g.sh b/package/comgt/files/3g.sh index 0fb24ead2..616beec4c 100644 --- a/package/comgt/files/3g.sh +++ b/package/comgt/files/3g.sh @@ -1,14 +1,15 @@ set_3g_led() { - grep WRT54G3G /proc/diag/model >/dev/null || return 0 + # set on WRT54G3G only + [ -f /proc/diag/model ] || return 0 + grep -q "WRT54G3G" /proc/diag/model >/dev/null || return 0 echo "$1" > /proc/diag/led/3g_green echo "$2" > /proc/diag/led/3g_blue + grep -q "WRT54G3G$" /proc/diag/model >/dev/null || return 0 echo "$3" > /proc/diag/led/3g_blink } scan_3g() { local device - - scan_ppp "$@" config_get device "$1" device # try to figure out the device if it's invalid @@ -22,6 +23,7 @@ scan_3g() { } # enable 3G with the 3G button by default + local button config_get button "$1" button [ -z "$button" ] && { config_set "$1" button 1 @@ -29,6 +31,7 @@ scan_3g() { } stop_interface_3g() { + stop_interface_ppp "$1" set_3g_led 0 0 0 killall gcom >/dev/null 2>/dev/null } @@ -37,17 +40,33 @@ setup_interface_3g() { local iface="$1" local config="$2" local chat="/etc/chatscripts/3g.chat" - + + local device config_get device "$config" device + local maxwait + config_get maxwait "$config" maxwait + maxwait=${maxwait:-20} + while [ ! -e "$device" -a $maxwait -gt 0 ];do # wait for driver loading to catch up + maxwait=$(($maxwait - 1)) + sleep 1 + done + for module in slhc ppp_generic ppp_async; do /sbin/insmod $module 2>&- >&- done - config_get apn "$cfg" apn - config_get service "$cfg" service - config_get pincode "$cfg" pincode - config_get mtu "$cfg" mtu + local apn + config_get apn "$config" apn + + local service + config_get service "$config" service + + local pincode + config_get pincode "$config" pincode + + local mtu + config_get mtu "$config" mtu set_3g_led 1 0 1 @@ -72,11 +91,13 @@ setup_interface_3g() { mode="AT_OPSYS=${CODE}" fi # Don't assume Option to be default as it breaks with Huawei Cards/Sticks - - PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || { - echo "$cfg(3g): Failed to set the PIN code." - set_3g_led 0 0 0 - return 1 + + test -z "$pincode" || { + PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || { + echo "$config(3g): Failed to set the PIN code." + set_3g_led 0 0 0 + return 1 + } } test -z "$mode" || { MODE="$mode" gcom -d "$device" -s /etc/gcom/setmode.gcom