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

broadband-modem-mbim: fix preservation logic for PIN1 unlock retries

Browse Source 
This patches fixes commit 334273979 "broadband-modem-mbim: preserve
unlock retries for PIN1 when appropriate", which doesn't correctly
propagate the unlock retries information for PIN1 observed from
responses to MBIM_CID_PIN set operations (see commit eb9ec1b61
"sim-mbim: update unlock retries information after PIN operations").
This commit is contained in:
Ben Chan
2017-09-18 09:10:57 -07:00
committed by Aleksander Morgado
parent 4f8e9e2e1c
commit 4cb6f0e5aa
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mm-broadband-modem-mbim.c
View File

@@ -93,9 +93,6 @@ struct _MMBroadbandModemMbimPrivate {
/* For notifying when the mbim-proxy connection is dead */ /* For notifying when the mbim-proxy connection is dead */
gulong mbim_device_removed_id; gulong mbim_device_removed_id;
/* Previously observed SIM-PIN remaining retries */
guint sim_pin_retries;
}; };
/*****************************************************************************/ /*****************************************************************************/
@@ -713,7 +710,7 @@ pin_query_unlock_retries_ready (MbimDevice *device,
NULL, NULL,
&remaining_attempts, &remaining_attempts,
&error)) { &error)) {
MMBroadbandModemMbim *self; MMIfaceModem *self;
MMModemLock lock; MMModemLock lock;
MMUnlockRetries *retries; MMUnlockRetries *retries;
@@ -737,22 +734,24 @@ pin_query_unlock_retries_ready (MbimDevice *device,
* PIN1. Here we thus carry over any existing information on PIN1 from * PIN1. Here we thus carry over any existing information on PIN1 from
* MMIfaceModem's MMUnlockRetries if the MBIM_CID_PIN query reports * MMIfaceModem's MMUnlockRetries if the MBIM_CID_PIN query reports
* something other than PIN1. */ * something other than PIN1. */
if (lock != MM_MODEM_LOCK_SIM_PIN && if (lock != MM_MODEM_LOCK_SIM_PIN) {
self->priv->sim_pin_retries != MM_UNLOCK_RETRIES_UNKNOWN) { MMUnlockRetries *previous_retries;
mm_unlock_retries_set (retries, guint previous_sim_pin_retries;
MM_MODEM_LOCK_SIM_PIN,
self->priv->sim_pin_retries); previous_retries = mm_iface_modem_get_unlock_retries (self);
previous_sim_pin_retries = mm_unlock_retries_get (previous_retries,
MM_MODEM_LOCK_SIM_PIN);
if (previous_sim_pin_retries != MM_UNLOCK_RETRIES_UNKNOWN) {
mm_unlock_retries_set (retries,
MM_MODEM_LOCK_SIM_PIN,
previous_sim_pin_retries);
}
} }
/* According to the MBIM specification, RemainingAttempts is set to /* According to the MBIM specification, RemainingAttempts is set to
* 0xffffffff if the device does not support this information. */ * 0xffffffff if the device does not support this information. */
if (remaining_attempts != G_MAXUINT32) if (remaining_attempts != G_MAXUINT32)
mm_unlock_retries_set (retries, lock, remaining_attempts); mm_unlock_retries_set (retries, lock, remaining_attempts);
else
remaining_attempts = MM_UNLOCK_RETRIES_UNKNOWN;
if (lock == MM_MODEM_LOCK_SIM_PIN)
self->priv->sim_pin_retries = remaining_attempts;
g_task_return_pointer (task, retries, g_object_unref); g_task_return_pointer (task, retries, g_object_unref);
} else } else
@@ -3274,8 +3273,6 @@ mm_broadband_modem_mbim_init (MMBroadbandModemMbim *self)
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
MM_TYPE_BROADBAND_MODEM_MBIM, MM_TYPE_BROADBAND_MODEM_MBIM,
MMBroadbandModemMbimPrivate); MMBroadbandModemMbimPrivate);
self->priv->sim_pin_retries = MM_UNLOCK_RETRIES_UNKNOWN;
} }
static void static void