Hi,
This is fix to Marit Henriksen's TODO item "Check SIM pin status if
sim_change_pin fails". I've discussed with Marit and it's ok for her if I fix
the issue. Problem here is that issue could perhaps also be fixed with retry
counter solution introduced by Lucas De Marchi couple of tasks ago. That would
seem however require some extra implementation in ste modem ( at least I was
not able get the ofono show correct values without extra modifications ) and I
think that isimodems don't have that sort of retry counter at all. Because of
that and since I had this solution already implemented I propose it to be added
as well.
Br,
-Jussi
---
src/sim.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/src/sim.c b/src/sim.c
index d627647..789ddde 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -712,8 +712,60 @@ static DBusMessage *sim_unlock_pin(DBusConnection *conn,
DBusMessage *msg,
static void sim_change_pin_cb(const struct ofono_error *error, void *data)
{
struct ofono_sim *sim = data;
+ DBusConnection *conn = ofono_dbus_get_connection();
+ const char *path = __ofono_atom_get_path(sim->atom);
+ struct ofono_modem *modem = __ofono_atom_get_modem(sim->atom);
+ const char *pin_name;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+ if (error->error == 12) {
+ sim->locked_pins[sim->pin_type] = TRUE;
+ switch (sim->pin_type) {
+ case OFONO_SIM_PASSWORD_SIM_PIN:
+ sim->pin_type = OFONO_SIM_PASSWORD_SIM_PUK;
+ pin_name = sim_passwd_name(
+ OFONO_SIM_PASSWORD_SIM_PUK);
+ break;
+ case OFONO_SIM_PASSWORD_PHFSIM_PIN:
+ sim->pin_type = OFONO_SIM_PASSWORD_PHFSIM_PUK;
+ pin_name = sim_passwd_name(
+ OFONO_SIM_PASSWORD_PHFSIM_PUK);
+ break;
+ case OFONO_SIM_PASSWORD_PHCORP_PIN:
+ sim->pin_type = OFONO_SIM_PASSWORD_PHCORP_PUK;
+ pin_name = sim_passwd_name(
+ OFONO_SIM_PASSWORD_PHCORP_PUK);
+ break;
+ case OFONO_SIM_PASSWORD_PHNET_PIN:
+ sim->pin_type = OFONO_SIM_PASSWORD_PHNET_PUK;
+ pin_name = sim_passwd_name(
+ OFONO_SIM_PASSWORD_PHNET_PUK);
+ case OFONO_SIM_PASSWORD_PHNETSUB_PIN:
+ sim->pin_type = OFONO_SIM_PASSWORD_PHNETSUB_PUK;
+ pin_name = sim_passwd_name(
+ OFONO_SIM_PASSWORD_PHNETSUB_PUK);
+ break;
+ case OFONO_SIM_PASSWORD_PHSP_PIN:
+ sim->pin_type = OFONO_SIM_PASSWORD_PHSP_PUK;
+ pin_name = sim_passwd_name(
+ OFONO_SIM_PASSWORD_PHSP_PUK);
+ break;
+ case OFONO_SIM_PASSWORD_SIM_PIN2:
+ sim->pin_type = OFONO_SIM_PASSWORD_SIM_PUK2;
+ pin_name = sim_passwd_name(
+ OFONO_SIM_PASSWORD_SIM_PUK2);
+ break;
+ default:
+ break;
+ }
+ ofono_dbus_signal_property_changed(conn, path,
+ OFONO_SIM_MANAGER_INTERFACE,
+ "PinRequired", DBUS_TYPE_STRING,
+ &pin_name);
+
+ if (sim->pin_type != OFONO_SIM_PASSWORD_SIM_PUK2)
+ ofono_modem_reset(modem);
+ }
__ofono_dbus_pending_reply(&sim->pending,
__ofono_error_failed(sim->pending));
@@ -722,6 +774,7 @@ static void sim_change_pin_cb(const struct ofono_error
*error, void *data)
return;
}
+ sim->pin_type = OFONO_SIM_PASSWORD_NONE;
__ofono_dbus_pending_reply(&sim->pending,
dbus_message_new_method_return(sim->pending));
@@ -764,6 +817,7 @@ static DBusMessage *sim_change_pin(DBusConnection *conn,
DBusMessage *msg,
return dbus_message_new_method_return(msg);
sim->pending = dbus_message_ref(msg);
+ sim->pin_type = type;
sim->driver->change_passwd(sim, type, old, new,
sim_change_pin_cb, sim);
--
1.7.1
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
