diff --git a/luci-app-openmptcprouter/root/bin/omr-3g b/luci-app-openmptcprouter/root/bin/omr-3g index 870688b15..1c65b2963 100755 --- a/luci-app-openmptcprouter/root/bin/omr-3g +++ b/luci-app-openmptcprouter/root/bin/omr-3g @@ -1,7 +1,7 @@ #!/bin/sh MODEM_INTF=$1 [ -z "$MODEM_INTF" ] && return -SIGNAL_INFO=$(gcom info -d $MODEM_INTF) +SIGNAL_INFO=$(timeout 1 gcom info -d $MODEM_INTF) [ -z "$SIGNAL_INFO" ] && return RSSI=$(echo $SIGNAL_INFO | grep RSSI | awk -F: '{print $2}') [ -z "$RSSI" ] && return diff --git a/luci-app-openmptcprouter/root/bin/omr-huawei b/luci-app-openmptcprouter/root/bin/omr-huawei index f5d9c8741..0efe8676f 100755 --- a/luci-app-openmptcprouter/root/bin/omr-huawei +++ b/luci-app-openmptcprouter/root/bin/omr-huawei @@ -2,6 +2,7 @@ MODEM_IP=`echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)'` [ -z "$MODEM_IP" ] && return SESTOK=$(curl -s -m 1 -X GET "http://$MODEM_IP/api/webserver/SesTokInfo") +[ -z "$SESTOK" ] && return COOKIE=$(echo $SESTOK | sed -ne '/SesInfo/{s/.*\(.*\)<\/SesInfo>.*/\1/p;q;}') COOKIE=$(echo $COOKIE | sed 's:SessionID=::') TOKEN=$(echo $SESTOK | sed -ne '/TokInfo/{s/.*\(.*\)<\/TokInfo>.*/\1/p;q;}') diff --git a/luci-app-openmptcprouter/root/bin/omr-modemmanager b/luci-app-openmptcprouter/root/bin/omr-modemmanager index cce31181e..4ab427a86 100755 --- a/luci-app-openmptcprouter/root/bin/omr-modemmanager +++ b/luci-app-openmptcprouter/root/bin/omr-modemmanager @@ -1,10 +1,10 @@ #!/bin/sh MODEM_INTF=$1 [ -z "$MODEM_INTF" ] && return -ALL_MODEMS=$(mmcli -L) +ALL_MODEMS=$(timeout 1 mmcli -L) for MODEM in $ALL_MODEMS; do MODEM_ID=$(echo $MODEM | awk -F' ' '{print $1}' | awk -F/ '{print $6}') - MODEM_INFO=$(mmcli -m $MODEM_ID --output-keyvalue | grep $MODEM_INTF) + MODEM_INFO=$(timeout 1 mmcli -m $MODEM_ID --output-keyvalue | grep $MODEM_INTF) done [ -z "$MODEM_INFO" ] && return PERCENT=$(echo $MODEM_INFO | grep 'modem.generic.signal-quality.value' | awk -F": " '{print $2}') diff --git a/luci-app-openmptcprouter/root/bin/omr-qmi b/luci-app-openmptcprouter/root/bin/omr-qmi index 327cdb1bd..d7c7028dd 100755 --- a/luci-app-openmptcprouter/root/bin/omr-qmi +++ b/luci-app-openmptcprouter/root/bin/omr-qmi @@ -1,7 +1,7 @@ #!/bin/sh MODEM_INTF=$1 [ -z "$MODEM_INTF" ] && return -SIGNAL_INFO=$(uqmi -d $MODEM_INTF --get-signal-info) +SIGNAL_INFO=$(timeout 1 uqmi -d $MODEM_INTF --get-signal-info) [ -z "$SIGNAL_INFO" ] && return TYPE=$(echo $SIGNAL_INFO | jsonfilter -e '@.type') if [ "$TYPE" = "gsm" ]; then