sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

speedup: Add support for retrieving PIN retry counters

This commit is contained in:
Marcel Holtmann 2011-08-04 17:00:05 +02:00
parent 59b4f99fec
commit 703d0a1237
1 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/atmodem/sim.c
View File

@ -27,6 +27,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <glib.h>
@ -619,6 +620,65 @@ error:
CALLBACK_WITH_FAILURE(cb, NULL, cbd->data);
}
static void cpnnum_cb(gboolean ok, GAtResult *result, gpointer user_data)
{
struct cb_data *cbd = user_data;
ofono_sim_pin_retries_cb_t cb = cbd->cb;
const char *final = g_at_result_final_response(result);
GAtResultIter iter;
struct ofono_error error;
const char *line;
int num;
char **entries;
int retries[OFONO_SIM_PASSWORD_INVALID];
size_t i;
decode_at_error(&error, final);
if (!ok) {
cb(&error, NULL, cbd->data);
return;
}
g_at_result_iter_init(&iter, result);
for (num = 0; num < g_at_result_num_response_lines(result); num++)
g_at_result_iter_next(&iter, NULL);
line = g_at_result_iter_raw_line(&iter);
DBG("%s", line);
for (i = 0; i < OFONO_SIM_PASSWORD_INVALID; i++)
retries[i] = -1;
entries = g_strsplit(line, "; ", -1);
for (num = 0; entries[num]; num++) {
int retry;
if (strlen(entries[num]) < 5)
continue;
retry = strtol(entries[num] + 5, NULL, 10);
if (retry == 0 && errno == EINVAL)
continue;
if (g_str_has_prefix(entries[num], "PIN1=") == TRUE)
retries[OFONO_SIM_PASSWORD_SIM_PIN] = retry;
else if (g_str_has_prefix(entries[num], "PUK1=") == TRUE)
retries[OFONO_SIM_PASSWORD_SIM_PUK] = retry;
else if (g_str_has_prefix(entries[num], "PIN2=") == TRUE)
retries[OFONO_SIM_PASSWORD_SIM_PIN2] = retry;
else if (g_str_has_prefix(entries[num], "PUK2=") == TRUE)
retries[OFONO_SIM_PASSWORD_SIM_PUK2] = retry;
}
g_strfreev(entries);
cb(&error, retries, cbd->data);
}
static void at_epin_cb(gboolean ok, GAtResult *result, gpointer user_data)
{
struct cb_data *cbd = user_data;
@ -717,6 +777,11 @@ static void at_pin_retries_query(struct ofono_sim *sim,
xpincnt_cb, cbd, g_free) > 0)
return;
break;
case OFONO_VENDOR_SPEEDUP:
if (g_at_chat_send(sd->chat, "AT+CPNNUM", NULL,
cpnnum_cb, cbd, g_free) > 0)
return;
break;
case OFONO_VENDOR_HUAWEI:
if (g_at_chat_send(sd->chat, "AT^CPIN?", huawei_cpin_prefix,
huawei_cpin_cb, cbd, g_free) > 0)