modemmanager: report network initiated disconnections to netifd
authorAleksander Morgado <aleksander@aleksander.es>
Wed, 4 May 2022 12:01:57 +0000 (14:01 +0200)
committerRosen Penev <rosenp@gmail.com>
Sun, 15 May 2022 04:39:50 +0000 (21:39 -0700)
The new connection dispatcher scripts support integrated in
ModemManager 1.18.8 allows us to provide a openwrt-specific dispatcher
script used to report netifd that the underlying network connection is
down.

See also https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/775

Fixes https://github.com/openwrt/openwrt/issues/8368
Fixes https://github.com/openwrt/packages/issues/14096

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
net/modemmanager/Makefile
net/modemmanager/files/10-report-down [new file with mode: 0755]

index 94164fd5c4e5e63ac8771115ba76a4d84bf738e2..c6d95af5f61313e1ec98ab29633027eb6e4ac4a1 100644 (file)
@@ -100,6 +100,9 @@ define Package/modemmanager/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ModemManager/libmm-shared-*.so* $(1)/usr/lib/ModemManager
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ModemManager/libmm-plugin-*.so* $(1)/usr/lib/ModemManager
 
+       $(INSTALL_DIR) $(1)/usr/lib/ModemManager/connection.d
+       $(INSTALL_BIN) ./files/10-report-down $(1)/usr/lib/ModemManager/connection.d
+
        $(INSTALL_DIR) $(1)/etc/dbus-1/system.d
        $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/org.freedesktop.ModemManager1.conf $(1)/etc/dbus-1/system.d
 
diff --git a/net/modemmanager/files/10-report-down b/net/modemmanager/files/10-report-down
new file mode 100755 (executable)
index 0000000..a3e5fb4
--- /dev/null
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: CC0-1.0
+# 2022 Aleksander Morgado <aleksander@aleksander.es>
+#
+# Automatically report to netifd that the underlying modem
+# is really disconnected
+#
+# require program name and at least 4 arguments
+[ $# -lt 4 ] && exit 1
+
+MODEM_PATH="$1"
+BEARER_PATH="$2"
+INTERFACE="$3"
+STATE="$4"
+
+[ "${STATE}" = "disconnected" ] || exit 0
+
+. /usr/share/ModemManager/modemmanager.common
+. /lib/netifd/netifd-proto.sh
+INCLUDE_ONLY=1 . /lib/netifd/proto/modemmanager.sh
+
+MODEM_STATUS=$(mmcli --modem="${MODEM_PATH}" --output-keyvalue)
+[ -n "${MODEM_STATUS}" ] || exit 1
+
+MODEM_DEVICE=$(modemmanager_get_field "${MODEM_STATUS}" "modem.generic.device")
+[ -n "${MODEM_DEVICE}" ] || exit 2
+
+CFG=$(mm_get_modem_config "${MODEM_DEVICE}")
+[ -n "${CFG}" ] || exit 3
+
+logger -t "modemmanager" "interface ${CFG} (network device ${INTERFACE}) ${STATE}"
+proto_init_update $INTERFACE 0
+proto_send_update $CFG
+exit 0