From: Florian Eckert <redacted>
Date: Tue, 25 Feb 2025 08:09:07 +0000 (+0100)
Subject: modemmanager: add missing mmcli timeout option during ubus call
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5c203c36d5e74fc0d6af6d03fbe43115b9e4ba91;p=openwrt-packages.git

modemmanager: add missing mmcli timeout option during ubus call

The default 'timeout' value is 30 seconds when calling an mmcli action. That
is too long. For this reason, the mmcli 'timeout' option is specified for
calls and the value is set to 10 seconds.

Signed-off-by: Florian Eckert <redacted>
---

diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
index 6fb6539de..69d364a76 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:=21
+PKG_RELEASE:=22
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
diff --git a/net/modemmanager/files/usr/libexec/rpcd/modemmanager b/net/modemmanager/files/usr/libexec/rpcd/modemmanager
index 0f0d24a48..436ca0a40 100644
--- a/net/modemmanager/files/usr/libexec/rpcd/modemmanager
+++ b/net/modemmanager/files/usr/libexec/rpcd/modemmanager
@@ -12,7 +12,7 @@ local info = {}
 
 function mm_get_modem_bearer(index)
 
-	local command = string.format("/usr/bin/mmcli --bearer=%s --output-json 2>/dev/null", index)
+	local command = string.format("/usr/bin/mmcli --bearer=%s --timeout=10 --output-json 2>/dev/null", index)
 
 	local handle = io.popen(command)
 	local output = handle:read("*a")
@@ -31,7 +31,7 @@ end
 
 function mm_get_modem_sim(index)
 
-	local command = string.format("/usr/bin/mmcli --sim=%s --output-json 2>/dev/null", index)
+	local command = string.format("/usr/bin/mmcli --sim=%s --timeout=10 --output-json 2>/dev/null", index)
 
 	local handle = io.popen(command)
 	local output = handle:read("*a")
@@ -50,7 +50,7 @@ end
 
 function mm_get_modem_signal(modem)
 
-	local command = string.format("/usr/bin/mmcli --modem=%s --signal-get --output-json 2>/dev/null", modem)
+	local command = string.format("/usr/bin/mmcli --modem=%s --signal-get --timeout=10 --output-json 2>/dev/null", modem)
 
 	local handle = io.popen(command)
 	local output = handle:read("*a")
@@ -69,7 +69,7 @@ end
 
 function mm_get_modem_location(modem)
 
-	local command = string.format("/usr/bin/mmcli --modem=%s --location-get --output-json 2>/dev/null", modem)
+	local command = string.format("/usr/bin/mmcli --modem=%s --location-get --timeout=10 --output-json 2>/dev/null", modem)
 
 	local handle = io.popen(command)
 	local output = handle:read("*a")
@@ -88,7 +88,7 @@ end
 
 function mm_get_modem_status(modem)
 
-	local command = string.format("/usr/bin/mmcli --modem=%s --output-json 2>/dev/null", modem)
+	local command = string.format("/usr/bin/mmcli --modem=%s --timeout=10 --output-json 2>/dev/null", modem)
 
 	local handle = io.popen(command)
 	local output = handle:read("*a")
@@ -145,7 +145,7 @@ end
 
 function aquire_data_modemmanager()
 
-	local command = string.format("/usr/bin/mmcli --list-modems --output-json 2>/dev/null")
+	local command = string.format("/usr/bin/mmcli --list-modems --timeout=10 --output-json 2>/dev/null")
 
 	local handle = io.popen(command)
 	local output = handle:read("*a")