From: Oliver Sedlbauer <osedlbauer@tdt.de>
Date: Tue, 11 Jun 2024 13:48:51 +0000 (+0200)
Subject: modemmanager: add option to force connection
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=06a62580355fdaca2461127004c1514fd70198bb;p=feed%2Fpackages.git

modemmanager: add option to force connection

This commit improves the automatic reconnect logic. If the modem cannot
establish a connection, for example due to poor reception, the
proto_block_restart prevents the interface from trying to reconnect.
To enforce the connection, this commit adds a new option that allows the
system to attempt to establish a connection indefinitely.

Signed-off-by: Oliver Sedlbauer <osedlbauer@tdt.de>
---

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index 0cfb304b6b..87a6c6a22b 100644
--- a/net/modemmanager/Makefile
+++ b/net/modemmanager/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_VERSION:=1.22.0
-PKG_RELEASE:=13
+PKG_RELEASE:=14
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
diff --git a/net/modemmanager/README.md b/net/modemmanager/README.md
index 1def1c354f..473815170f 100644
--- a/net/modemmanager/README.md
+++ b/net/modemmanager/README.md
@@ -26,6 +26,7 @@ Once installed, you can configure the 2G/3G/4G modem connections directly in
         option lowpower    '1'
         option signalrate  '30'
         option allow_roaming '1'
+        option force_connection '1'
         option init_epsbearer '<none|default|custom>'
 
 Only 'device' and 'proto' are mandatory options, the remaining ones are all
@@ -44,6 +45,10 @@ The 'plmn' option allows to set the network operator MCCMNC.
 The 'signalrate' option set's the signal refresh rate (in seconds) for the device.
 You can call signal info with command: mmcli -m 0 --signal-get
 
+The 'force_connection' option is designed to ensure that the modem automatically
+attempts to reconnect regardless of any errors encountered during the
+connection process.
+
 If there is no Circuit switch network available, then an initial EPS
 bearer must be set, so this could be used during the network registration
 process in 4G and 5G network. For this resaon a new configuration option
diff --git a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
index 67545513d0..ce051a7639 100644
--- a/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
+++ b/net/modemmanager/files/lib/netifd/proto/modemmanager.sh
@@ -274,6 +274,7 @@ proto_modemmanager_init_config() {
 	proto_config_add_int signalrate
 	proto_config_add_boolean lowpower
 	proto_config_add_boolean allow_roaming
+	proto_config_add_boolean force_connection
 	proto_config_add_string init_epsbearer
 	proto_config_add_string init_iptype
 	proto_config_add_string 'init_allowedauth:list(string)'
@@ -421,6 +422,7 @@ proto_modemmanager_setup() {
 
 	local device apn allowedauth username password pincode
 	local iptype plmn metric signalrate allow_roaming
+	local force_connection
 
 	local init_epsbearer
 	local init_iptype init_allowedauth
@@ -430,7 +432,7 @@ proto_modemmanager_setup() {
 
 	json_get_vars device apn allowedauth username password
 	json_get_vars pincode iptype plmn metric signalrate allow_roaming
-	json_get_vars allowedmode preferredmode
+	json_get_vars allowedmode preferredmode force_connection
 
 	json_get_vars init_epsbearer
 	json_get_vars init_iptype init_allowedauth
@@ -471,8 +473,14 @@ proto_modemmanager_setup() {
 		mmcli --modem="${device}" \
 			--timeout 120 \
 			--3gpp-register-in-operator="${plmn}" || {
-			proto_notify_error "${interface}" MM_3GPP_OPERATOR_REGISTRATION_FAILED
-			proto_block_restart "${interface}"
+
+			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
 		}
 	}
@@ -574,8 +582,13 @@ proto_modemmanager_setup() {
 	append_param "${password:+password=${password}}"
 
 	mmcli --modem="${device}" --timeout 120 --simple-connect="${connectargs}" || {
-		proto_notify_error "${interface}" MM_CONNECT_FAILED
-		proto_block_restart "${interface}"
+		if [ -n "${force_connection}" ] && [ "${force_connection}" -eq 1 ]; then
+			echo "Connection failed -> attempting restart"
+			proto_notify_error "${interface}" MM_INTERFACE_RESTART
+		else
+			proto_notify_error "${interface}" MM_CONNECT_FAILED
+			proto_block_restart "${interface}"
+		fi
 		return 1
 	}