openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 21:24:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

modemmanager: move plmn registration into own function

Browse Source 
To improve the code, the setting of the 'plmn' is moved to separate function.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert
2024-10-18 12:45:21 +02:00
committed by Florian Eckert
parent 5ab483aa44
commit 8682084e34
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
net/modemmanager/files/lib/netifd/proto/modemmanager.sh
View File

@@ -527,6 +527,26 @@ modemmanager_init_epsbearer() {
sleep 2 sleep 2
} }
modemmanager_set_plmn() {
local device="$1"
local interface="$2"
local plmn="$3"
local force_connection="$4"
mmcli --modem="${device}" \
--timeout 120 \
--3gpp-register-in-operator="${plmn}" || {
if [ -n "${force_connection}" ] && [ "${force_connection}" -eq 1 ]; then
echo "3GPP operator registration failed -> attempting restart"
proto_notify_error "${interface}" MM_INTERFACE_RESTART
else
proto_notify_error "${interface}" MM_3GPP_OPERATOR_REGISTRATION_FAILED
proto_block_restart "${interface}"
fi
return 1
}
}
proto_modemmanager_setup() { proto_modemmanager_setup() {
local interface="$1" local interface="$1"
@@ -624,22 +644,10 @@ proto_modemmanager_setup() {
[ "$?" -ne "0" ] && return 1 [ "$?" -ne "0" ] && return 1
} }
[ -z "${plmn}" ] || { [ -z "${plmn}" ] || {
echo "starting network registraion with plmn '${plmn}'..." echo "starting network registration with plmn '${plmn}'..."
mmcli --modem="${device}" \ modemmanager_set_plmn "$device" "$interface" "$plmn" "$force_connection"
--timeout 120 \ [ "$?" -ne "0" ] && return 1
--3gpp-register-in-operator="${plmn}" || {
if [ -n "${force_connection}" ] && [ "${force_connection}" -eq 1 ]; then
echo "3GPP operator registration failed -> attempting restart"
proto_notify_error "${interface}" MM_INTERFACE_RESTART
else
proto_notify_error "${interface}" MM_3GPP_OPERATOR_REGISTRATION_FAILED
proto_block_restart "${interface}"
fi
return 1
}
} }
if [ -z "${allowedmode}" ]; then if [ -z "${allowedmode}" ]; then