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

helpers-mbim: report correct network availability from mbim bitmask

Browse Source 
MbimProviderState is a bitset, so don't try to match exact values in a
switch statement when converting to MMModem3gppNetworkAvailability.

Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/524
This commit is contained in:
Aleksander Morgado
2022-07-25 21:51:56 +02:00
parent 57637132c9
commit a32538fa32
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/mm-modem-helpers-mbim.c
View File

@@ -268,20 +268,23 @@ mm_modem_access_technology_from_mbim_data_class (MbimDataClass data_class)
MMModem3gppNetworkAvailability
mm_modem_3gpp_network_availability_from_mbim_provider_state (MbimProviderState state)
{
switch (state) {
case MBIM_PROVIDER_STATE_HOME:
case MBIM_PROVIDER_STATE_PREFERRED:
case MBIM_PROVIDER_STATE_VISIBLE:
case MBIM_PROVIDER_STATE_PREFERRED_MULTICARRIER:
return MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE;
case MBIM_PROVIDER_STATE_REGISTERED:
/* MbimProviderState is a bitmask!
*
* We don't explicitly process MBIM_PROVIDER_STATE_PREFERRED,
* MBIM_PROVIDER_STATE_PREFERRED_MULTICARRIER or MBIM_PROVIDER_STATE_HOME,
* so we don't report at MM level the type of operator it is (home,
* preferred or non-preferred), just its availability.
*/
if (state & MBIM_PROVIDER_STATE_REGISTERED)
return MM_MODEM_3GPP_NETWORK_AVAILABILITY_CURRENT;
case MBIM_PROVIDER_STATE_FORBIDDEN:
if (state & MBIM_PROVIDER_STATE_FORBIDDEN)
return MM_MODEM_3GPP_NETWORK_AVAILABILITY_FORBIDDEN;
case MBIM_PROVIDER_STATE_UNKNOWN:
default:
return MM_MODEM_3GPP_NETWORK_AVAILABILITY_UNKNOWN;
}
if (state & MBIM_PROVIDER_STATE_VISIBLE)
return MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE;
return MM_MODEM_3GPP_NETWORK_AVAILABILITY_UNKNOWN;
}
/*****************************************************************************/