zhao/QModem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect all activated PDPs instead of just the fixed one to ensure compatibility with older RM5xxQ firmware.

Browse Source
This commit is contained in:
fujr 2024-11-06 15:56:01 +08:00
parent 6e8abbf34c
commit 5275942584
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
luci/luci-app-qmodem/root/usr/share/qmodem/generic.sh
View File

@ -238,11 +238,16 @@ get_rat()
#return raw data #return raw data
get_connect_status() get_connect_status()
{ {
at_cmd="AT+CGPADDR=1" #get active pdp context
[ "$define_connect" == "3" ] && at_cmd="AT+CGPADDR=3" at_cmd="AT+CGACT?"
expect="+CGPADDR:" expect="+CGACT:"
result=$(at $at_port $at_cmd | grep $expect) result=`at $at_port $at_cmd | grep $expect|tr '\r' '\n'`
if [ -n "$result" ];then for pdp_index in `echo "$result" | tr -d "\r" | awk -F'[,:]' '$3 == 1 {print $2}'`; do
at_cmd="AT+CGPADDR=%s"
at_cmd=$(printf "$at_cmd" "$pdp_index")
expect="+CGPADDR:"
result=$(at $at_port $at_cmd | grep $expect)
if [ -n "$result" ];then
ipv6=$(echo $result | grep -oE "\b([0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}\b") ipv6=$(echo $result | grep -oE "\b([0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}\b")
ipv4=$(echo $result | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b") ipv4=$(echo $result | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b")
disallow_ipv4="0.0.0.0" disallow_ipv4="0.0.0.0"
@ -250,13 +255,19 @@ get_connect_status()
if [ "$ipv4" == "$disallow_ipv4" ];then if [ "$ipv4" == "$disallow_ipv4" ];then
ipv4="" ipv4=""
fi fi
fi fi
if [ -n "$ipv4" ] || [ -n "$ipv6" ];then if [ -n "$ipv4" ] || [ -n "$ipv6" ];then
connect_status="Yes" connect_status="Yes"
else return_flag=1
connect_status="No" else
fi connect_status="No"
add_plain_info_entry "connect_status" "$connect_status" "Connect Status" fi
add_plain_info_entry "connect_status" "$connect_status" "Connect Status"
if [ "$return_flag" -eq 1 ];then
return
fi
done
} }
#获取移远模组信息 #获取移远模组信息