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

novatel: port IMSI loading to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-04-03 12:37:56 -07:00
committed by Aleksander Morgado
parent 1e05fd4df6
commit 6542430588
1 changed files with 36 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/novatel/mm-sim-novatel-lte.c
View File

@@ -39,20 +39,13 @@ load_imsi_finish (MMBaseSim *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
gchar *imsi; return g_task_propagate_pointer (G_TASK (res), error);
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return NULL;
imsi = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
mm_dbg ("loaded IMSI: %s", imsi);
return g_strdup (imsi);
} }
static void static void
imsi_read_ready (MMBaseModem *modem, imsi_read_ready (MMBaseModem *modem,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
const gchar *response, *str; const gchar *response, *str;
@@ -64,9 +57,8 @@ imsi_read_ready (MMBaseModem *modem,
response = mm_base_modem_at_command_finish (modem, res, &error); response = mm_base_modem_at_command_finish (modem, res, &error);
if (!response) { if (!response) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -76,13 +68,12 @@ imsi_read_ready (MMBaseModem *modem,
/* With or without quotes... */ /* With or without quotes... */
if (sscanf (str, "%d,%d,\"%18c\"", &sw1, &sw2, (char *) &buf) != 3 && if (sscanf (str, "%d,%d,\"%18c\"", &sw1, &sw2, (char *) &buf) != 3 &&
sscanf (str, "%d,%d,%18c", &sw1, &sw2, (char *) &buf) != 3) { sscanf (str, "%d,%d,%18c", &sw1, &sw2, (char *) &buf) != 3) {
g_simple_async_result_set_error (simple, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Failed to parse the CRSM response: '%s'", "Failed to parse the CRSM response: '%s'",
response); response);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -90,13 +81,12 @@ imsi_read_ready (MMBaseModem *modem,
(sw1 != 0x91) && (sw1 != 0x91) &&
(sw1 != 0x92) && (sw1 != 0x92) &&
(sw1 != 0x9f)) { (sw1 != 0x9f)) {
g_simple_async_result_set_error (simple, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"SIM failed to handle CRSM request (sw1 %d sw2 %d)", "SIM failed to handle CRSM request (sw1 %d sw2 %d)",
sw1, sw2); sw1, sw2);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -114,25 +104,23 @@ imsi_read_ready (MMBaseModem *modem,
} }
/* Invalid character */ /* Invalid character */
g_simple_async_result_set_error (simple, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"CRSM IMSI response contained invalid character '%c'", "CRSM IMSI response contained invalid character '%c'",
buf[len]); buf[len]);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
/* BCD encoded IMSIs plus the length byte and parity are 18 digits long */ /* BCD encoded IMSIs plus the length byte and parity are 18 digits long */
if (len != 18) { if (len != 18) {
g_simple_async_result_set_error (simple, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Invalid +CRSM IMSI response size (was %zd, expected 18)", "Invalid +CRSM IMSI response size (was %zd, expected 18)",
len); len);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -160,19 +148,17 @@ imsi_read_ready (MMBaseModem *modem,
/* Ensure all 'F's, if any, are at the end */ /* Ensure all 'F's, if any, are at the end */
for (; i < 15; i++) { for (; i < 15; i++) {
if (imsi[i] != 'F') { if (imsi[i] != 'F') {
g_simple_async_result_set_error (simple, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Invalid +CRSM IMSI length (unexpected F)"); "Invalid +CRSM IMSI length (unexpected F)");
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
} }
g_simple_async_result_set_op_res_gpointer (simple, imsi, NULL); g_task_return_pointer (task, g_strdup (imsi), g_free);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
@@ -193,10 +179,7 @@ load_imsi (MMBaseSim *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)imsi_read_ready, (GAsyncReadyCallback)imsi_read_ready,
g_simple_async_result_new (G_OBJECT (self), g_task_new (self, NULL, callback, user_data));
callback,
user_data,
load_imsi));
g_object_unref (modem); g_object_unref (modem);
} }