When SIM is locked, huawei modem does not send any notification about SIM state change because it does not differentiate 'invalid' from 'locked'. In order to be able to unlock the sim, this patch forces a notification of a valid state after a timeout. --- plugins/huawei.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/plugins/huawei.c b/plugins/huawei.c index bff1343..1155383 100644 --- a/plugins/huawei.c +++ b/plugins/huawei.c @@ -56,6 +56,7 @@ #include <drivers/atmodem/vendor.h> static const char *none_prefix[] = { NULL }; +static const char *cpin_prefix[] = { "+CPIN:", NULL }; static const char *sysinfo_prefix[] = { "^SYSINFO:", NULL }; static const char *ussdmode_prefix[] = { "^USSDMODE:", NULL }; static const char *cvoice_prefix[] = { "^CVOICE:", NULL }; @@ -85,6 +86,7 @@ struct huawei_data { #define MAX_SIM_POLL_COUNT 5 static gboolean query_sim_state(gpointer user_data); +static gboolean query_sim_locked(gpointer user_data); static int huawei_probe(struct ofono_modem *modem) { @@ -226,6 +228,28 @@ static gboolean notify_sim_state(struct ofono_modem *modem, return FALSE; } +static void cpin_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct ofono_modem *modem = user_data; + const char *value; + GAtResultIter iter; + + if (!ok) + return; + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "+CPIN:")) + return; + + if (!g_at_result_iter_next_unquoted_string(&iter, &value)) + return; + + /* Force notification of SIM ready because it's in a locked state */ + if (g_str_has_prefix(value, "SIM")) + notify_sim_state(modem, HUAWEI_SIM_STATE_VALID); +} + static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct ofono_modem *modem = user_data; @@ -264,9 +288,26 @@ static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer user_data) data->sim_poll_timeout = g_timeout_add_seconds(2, query_sim_state, modem); + } else if (sim_state == HUAWEI_SIM_STATE_INVALID_OR_LOCKED) { + data->sim_poll_timeout = g_timeout_add_seconds(2, + query_sim_locked, + modem); } } +static gboolean query_sim_locked(gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct huawei_data *data = ofono_modem_get_data(modem); + + data->sim_poll_timeout = 0; + + g_at_chat_send(data->pcui, "AT+CPIN?", cpin_prefix, + cpin_cb, modem, NULL); + + return FALSE; +} + static gboolean query_sim_state(gpointer user_data) { struct ofono_modem *modem = user_data; -- 1.7.3.3

--- src/sim.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/src/sim.c b/src/sim.c index 6217a25..8c05900 100644 --- a/src/sim.c +++ b/src/sim.c @@ -62,6 +62,8 @@ struct ofono_sim { enum ofono_sim_password_type pin_type; gboolean locked_pins[OFONO_SIM_PASSWORD_SIM_PUK]; /* Number of PINs */ + unsigned char pin_retries; + enum ofono_sim_phase phase; unsigned char mnc_length; enum ofono_sim_cphs_phase cphs_phase; @@ -369,6 +371,9 @@ static DBusMessage *sim_get_properties(DBusConnection *conn, DBUS_TYPE_STRING, (void *) &pin_name); + ofono_dbus_dict_append(&dict, "PinRetries", + DBUS_TYPE_BYTE, &sim->pin_retries); + done: dbus_message_iter_close_container(&iter, &dict); @@ -1560,6 +1565,28 @@ static void sim_initialize_after_pin(struct ofono_sim *sim) sim_cphs_information_read_cb, sim); } +static void sim_retry_counter_query_cb(const struct ofono_error *error, + int retry, void *data) +{ + struct ofono_sim *sim = data; + DBusConnection *conn = ofono_dbus_get_connection(); + const char *path = __ofono_atom_get_path(sim->atom); + + if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { + ofono_error("Querying PIN Retry Counter failed"); + + return; + } + + if (sim->pin_retries != retry) { + sim->pin_retries = retry; + ofono_dbus_signal_property_changed(conn, path, + OFONO_SIM_MANAGER_INTERFACE, + "PinRetries", DBUS_TYPE_BYTE, + &retry); + } +} + static void sim_pin_query_cb(const struct ofono_error *error, enum ofono_sim_password_type pin_type, void *data) @@ -1592,6 +1619,11 @@ static void sim_pin_query_cb(const struct ofono_error *error, &pin_name); } + if (sim->driver->query_retry_counter != NULL) { + sim->driver->query_retry_counter(sim, + sim_retry_counter_query_cb, sim); + } + checkdone: if (pin_type == OFONO_SIM_PASSWORD_NONE) sim_initialize_after_pin(sim); -- 1.7.3.3

PIN retry counter is implemented for huaweimodem and it'd be very similar for other vendors. --- drivers/atmodem/sim.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c index 1653ede..4d0d40c 100644 --- a/drivers/atmodem/sim.c +++ b/drivers/atmodem/sim.c @@ -52,6 +52,7 @@ struct sim_data { static const char *crsm_prefix[] = { "+CRSM:", NULL }; static const char *cpin_prefix[] = { "+CPIN:", NULL }; +static const char *xcpin_prefix[] = { "^CPIN:", NULL }; static const char *clck_prefix[] = { "+CLCK:", NULL }; static const char *none_prefix[] = { NULL }; @@ -456,6 +457,74 @@ static struct { { OFONO_SIM_PASSWORD_PHCORP_PUK, "PH-CORP PUK" }, }; +static void at_xcpin_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct cb_data *cbd = user_data; + ofono_sim_retry_counter_cb_t cb = cbd->cb; + const char *final = g_at_result_final_response(result); + GAtResultIter iter; + int retry; + struct ofono_error error; + + decode_at_error(&error, final); + + if (!ok) { + cb(&error, -1, cbd->data); + return; + } + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "^CPIN:")) + goto error; + + /* Skip status since we are not interested in this */ + if (!g_at_result_iter_skip_next(&iter)) + goto error; + + /* + * Number is optional. In case number is not present, pin is not + * required. + */ + if (!g_at_result_iter_next_number(&iter, &retry)) + retry = 0; + + cb(&error, retry, cbd->data); + + return; + +error: + CALLBACK_WITH_FAILURE(cb, -1, cbd->data); +} + +static void at_pin_retry_query(struct ofono_sim *sim, + ofono_sim_retry_counter_cb_t cb, void *data) +{ + struct sim_data *sd = ofono_sim_get_data(sim); + + DBG(""); + + if (sd->vendor == OFONO_VENDOR_QUALCOMM_MSM) { + struct cb_data *cbd = cb_data_new(cb, data); + + if (cbd == NULL) { + CALLBACK_WITH_FAILURE(cb, -1, data); + + return; + } + + if (g_at_chat_send(sd->chat, "AT^CPIN?", xcpin_prefix, + at_xcpin_cb, cbd, g_free) > 0) + return; + + g_free(cbd); + + CALLBACK_WITH_FAILURE(cb, -1, data); + } + + CALLBACK_WITH_SUCCESS(cb, 0, data); +} + static void at_cpin_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct cb_data *cbd = user_data; @@ -886,6 +955,7 @@ static struct ofono_sim_driver driver = { .write_file_cyclic = at_sim_update_cyclic, .read_imsi = at_read_imsi, .query_passwd_state = at_pin_query, + .query_retry_counter = at_pin_retry_query, .send_passwd = at_pin_send, .reset_passwd = at_pin_send_puk, .lock = at_pin_enable, -- 1.7.3.3