SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-manager: fix cleanup of multiplexed bearers

Browse Source 
Cleaning up multiple active multiplexed bearers causes an assert in
mm_iface_modem_count_bearers since the max number of active bearers
is not properly determined.

Rework the management of the flags in order to better match their
intents, considering that MULTIPLEXED is a subset of ACTIVE/CONNECTED.

Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
This commit is contained in:
Daniele Palmas
2025-10-03 10:51:59 +02:00
parent 8d911cdd1a
commit 0edcb916ad
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-iface-modem.c
+6 -3
View File
@@ -6834,10 +6834,13 @@ mm_iface_modem_count_bearers (MMIfaceModem *self,
return FALSE;
}
if (flags & MM_IFACE_MODEM_COUNT_BEARERS_FLAG_MULTIPLEXED)
max = mm_bearer_list_get_max_active_multiplexed (list);
else
/* If only MULTIPLEXED is requested, only return max multiplexed bearers */
if (flags & ~MM_IFACE_MODEM_COUNT_BEARERS_FLAG_MULTIPLEXED)
max = mm_bearer_list_get_max_active (list);
/* multiplexed is a subset of ACTIVE/CONNECTED */
if (flags & (MM_IFACE_MODEM_COUNT_BEARERS_FLAG_ACTIVE | MM_IFACE_MODEM_COUNT_BEARERS_FLAG_CONNECTED |
MM_IFACE_MODEM_COUNT_BEARERS_FLAG_MULTIPLEXED))
max += mm_bearer_list_get_max_active_multiplexed (list);
mm_bearer_list_foreach (list, (MMBearerListForeachFunc)bearer_count, &ctx);
g_assert (max >= ctx.count);