Merge pull request openwrt#22486 from osedl/modemmanager-improve-cleanup

modemmanager improve cleanup
rikka0w0 · Oct 30, 2023 · ac9973b · ac9973b
2 parents eb40c17 + 074741e
commit ac9973b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 27 deletions.
diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modemmanager
 PKG_SOURCE_VERSION:=1.22.0
-PKG_RELEASE:=3
+PKG_RELEASE:=5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git

diff --git a/net/modemmanager/files/modemmanager.common b/net/modemmanager/files/modemmanager.common
@@ -235,24 +235,20 @@ mm_report_modem_wait() {
 # Cleanup interfaces
 
 mm_cleanup_interfaces() {
-	local modemlist modemlength idx modeminfo modemsysfspath
-
-	modemlist=$(mmcli --list-modems --output-keyvalue)
-	[ -n "${modemlist}" ] || return 0
-
-	modemlength=$(modemmanager_get_field "${modemlist}" "modem-list.length")
-
-	# do nothing if no modem reported
-	[ -n "${modemlength}" ] && [ "${modemlength}" -ge 1 ] && {
-		idx=1
-		while [ $idx -le "$modemlength" ]; do
-			modempath=$(modemmanager_get_field "${modemlist}" "modem-list.value\[$idx\]")
-			modeminfo=$(mmcli --modem "${modempath}" --output-keyvalue)
-			modemsysfspath=$(modemmanager_get_field "${modeminfo}" "modem.generic.device")
-			mm_cleanup_interface_by_sysfspath "${modemsysfspath}"
-			idx=$((idx + 1))
-		done
-	}
+	local sysfs_path status
+
+	# Do nothing if there is no sysfs cache
+	[ -f "${MODEMMANAGER_SYSFS_CACHE}" ] || return
+
+	while IFS= read -r sysfs_cache_line; do
+		sysfs_path=$(echo "${sysfs_cache_line}" | awk '{print $1}')
+		status=$(echo "${sysfs_cache_line}" | awk '{print $2}')
+
+		if [ "${status}" = "processed" ]; then
+			mm_log "debug" "call cleanup for: ${sysfs_path}"
+			mm_cleanup_interface_by_sysfspath "${sysfs_path}"
+		fi
+	done < ${MODEMMANAGER_SYSFS_CACHE}
 }
 
 mm_cleanup_interface_by_sysfspath() {

diff --git a/net/modemmanager/files/modemmanager.init b/net/modemmanager/files/modemmanager.init
@@ -6,13 +6,6 @@ START=70
 
 LOG_LEVEL="INFO"
 
-stop_service() {
-	# Load common utils
-	. /usr/share/ModemManager/modemmanager.common
-	# Set all configured interfaces as unavailable
-	mm_cleanup_interfaces
-}
-
 start_service() {
 	# Setup ModemManager service
 	#

diff --git a/net/modemmanager/files/usr/sbin/ModemManager-wrapper b/net/modemmanager/files/usr/sbin/ModemManager-wrapper
@@ -20,14 +20,16 @@ main() {
 
 	mkdir -p "${MODEMMANAGER_RUNDIR}"
 	chmod 0755 "${MODEMMANAGER_RUNDIR}"
-	mm_cleanup_interfaces
 
 	/usr/sbin/ModemManager "$@" 1>/dev/null 2>/dev/null &
 	CHILD="$!"
 
 	mm_report_events_from_cache
 
 	wait "$CHILD"
+
+	# Set all configured interfaces as unavailable
+	mm_cleanup_interfaces
 }
 
 main "$@"