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

base-sim: port mm_base_sim_send_{pin,puk} to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-04 11:40:09 -07:00
committed by Aleksander Morgado
parent bc51c8c474
commit 75aebc71c7
1 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/mm-base-sim.c
View File

@@ -493,19 +493,13 @@ send_pin (MMBaseSim *self,
/* SEND PIN/PUK (common logic) */ /* SEND PIN/PUK (common logic) */
typedef struct { typedef struct {
MMBaseSim *self;
GSimpleAsyncResult *result;
GError *save_error; GError *save_error;
} SendPinPukContext; } SendPinPukContext;
static void static void
send_pin_puk_context_complete_and_free (SendPinPukContext *ctx) send_pin_puk_context_free (SendPinPukContext *ctx)
{ {
if (ctx->save_error) g_clear_error (&ctx->save_error);
g_error_free (ctx->save_error);
g_simple_async_result_complete (ctx->result);
g_object_unref (ctx->result);
g_object_unref (ctx->self);
g_free (ctx); g_free (ctx);
} }
@@ -546,7 +540,7 @@ mm_base_sim_send_pin_finish (MMBaseSim *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return g_task_propagate_boolean (G_TASK (res), error);
} }
gboolean gboolean
@@ -554,17 +548,20 @@ mm_base_sim_send_puk_finish (MMBaseSim *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return g_task_propagate_boolean (G_TASK (res), error);
} }
static void static void
update_lock_info_ready (MMIfaceModem *modem, update_lock_info_ready (MMIfaceModem *modem,
GAsyncResult *res, GAsyncResult *res,
SendPinPukContext *ctx) GTask *task)
{ {
SendPinPukContext *ctx;
GError *error = NULL; GError *error = NULL;
MMModemLock lock; MMModemLock lock;
ctx = g_task_get_task_data (task);
lock = mm_iface_modem_update_lock_info_finish (modem, res, &error); lock = mm_iface_modem_update_lock_info_finish (modem, res, &error);
/* Even if we may be SIM-PIN2/PUK2 locked, we don't consider this an error /* Even if we may be SIM-PIN2/PUK2 locked, we don't consider this an error
* in the PIN/PUK sending */ * in the PIN/PUK sending */
@@ -577,29 +574,29 @@ update_lock_info_ready (MMIfaceModem *modem,
* - Otherwise, build our own error from the lock code. * - Otherwise, build our own error from the lock code.
*/ */
if (ctx->save_error) { if (ctx->save_error) {
g_simple_async_result_take_error (ctx->result, ctx->save_error);
ctx->save_error = NULL;
g_clear_error (&error); g_clear_error (&error);
} else if (error) error = ctx->save_error;
g_simple_async_result_take_error (ctx->result, error); ctx->save_error = NULL;
else } else if (!error)
g_simple_async_result_take_error (ctx->result, error = error_for_unlock_check (lock);
error_for_unlock_check (lock));
send_pin_puk_context_complete_and_free (ctx);
return;
}
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); g_task_return_error (task, error);
send_pin_puk_context_complete_and_free (ctx); } else
g_task_return_boolean (task, TRUE);
g_object_unref (task);
} }
static void static void
send_pin_ready (MMBaseSim *self, send_pin_ready (MMBaseSim *self,
GAsyncResult *res, GAsyncResult *res,
SendPinPukContext *ctx) GTask *task)
{ {
SendPinPukContext *ctx;
MMModemLock known_lock = MM_MODEM_LOCK_UNKNOWN; MMModemLock known_lock = MM_MODEM_LOCK_UNKNOWN;
ctx = g_task_get_task_data (task);
if (!MM_BASE_SIM_GET_CLASS (self)->send_pin_finish (self, res, &ctx->save_error)) { if (!MM_BASE_SIM_GET_CLASS (self)->send_pin_finish (self, res, &ctx->save_error)) {
if (g_error_matches (ctx->save_error, if (g_error_matches (ctx->save_error,
MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR,
@@ -612,21 +609,25 @@ send_pin_ready (MMBaseSim *self,
MM_IFACE_MODEM (self->priv->modem), MM_IFACE_MODEM (self->priv->modem),
known_lock, known_lock,
(GAsyncReadyCallback)update_lock_info_ready, (GAsyncReadyCallback)update_lock_info_ready,
ctx); task);
} }
static void static void
send_puk_ready (MMBaseSim *self, send_puk_ready (MMBaseSim *self,
GAsyncResult *res, GAsyncResult *res,
SendPinPukContext *ctx) GTask *task)
{ {
SendPinPukContext *ctx;
ctx = g_task_get_task_data (task);
MM_BASE_SIM_GET_CLASS (self)->send_puk_finish (self, res, &ctx->save_error); MM_BASE_SIM_GET_CLASS (self)->send_puk_finish (self, res, &ctx->save_error);
/* Once pin/puk has been sent, recheck lock */ /* Once pin/puk has been sent, recheck lock */
mm_iface_modem_update_lock_info (MM_IFACE_MODEM (self->priv->modem), mm_iface_modem_update_lock_info (MM_IFACE_MODEM (self->priv->modem),
MM_MODEM_LOCK_UNKNOWN, /* ask */ MM_MODEM_LOCK_UNKNOWN, /* ask */
(GAsyncReadyCallback)update_lock_info_ready, (GAsyncReadyCallback)update_lock_info_ready,
ctx); task);
} }
void void
@@ -636,31 +637,31 @@ mm_base_sim_send_pin (MMBaseSim *self,
gpointer user_data) gpointer user_data)
{ {
SendPinPukContext *ctx; SendPinPukContext *ctx;
GTask *task;
/* If sending PIN is not implemented, report an error */ /* If sending PIN is not implemented, report an error */
if (!MM_BASE_SIM_GET_CLASS (self)->send_pin || if (!MM_BASE_SIM_GET_CLASS (self)->send_pin ||
!MM_BASE_SIM_GET_CLASS (self)->send_pin_finish) { !MM_BASE_SIM_GET_CLASS (self)->send_pin_finish) {
g_simple_async_report_error_in_idle (G_OBJECT (self), g_task_report_new_error (self,
callback, callback,
user_data, user_data,
MM_CORE_ERROR, mm_base_sim_send_pin,
MM_CORE_ERROR_UNSUPPORTED, MM_CORE_ERROR,
"Cannot send PIN: " MM_CORE_ERROR_UNSUPPORTED,
"operation not supported"); "Cannot send PIN: "
"operation not supported");
return; return;
} }
ctx = g_new0 (SendPinPukContext, 1); ctx = g_new0 (SendPinPukContext, 1);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback, g_task_set_task_data (task, ctx, (GDestroyNotify)send_pin_puk_context_free);
user_data,
mm_base_sim_send_pin);
MM_BASE_SIM_GET_CLASS (self)->send_pin (self, MM_BASE_SIM_GET_CLASS (self)->send_pin (self,
pin, pin,
(GAsyncReadyCallback)send_pin_ready, (GAsyncReadyCallback)send_pin_ready,
ctx); task);
} }
void void
@@ -671,32 +672,32 @@ mm_base_sim_send_puk (MMBaseSim *self,
gpointer user_data) gpointer user_data)
{ {
SendPinPukContext *ctx; SendPinPukContext *ctx;
GTask *task;
/* If sending PIN is not implemented, report an error */ /* If sending PIN is not implemented, report an error */
if (!MM_BASE_SIM_GET_CLASS (self)->send_puk || if (!MM_BASE_SIM_GET_CLASS (self)->send_puk ||
!MM_BASE_SIM_GET_CLASS (self)->send_puk_finish) { !MM_BASE_SIM_GET_CLASS (self)->send_puk_finish) {
g_simple_async_report_error_in_idle (G_OBJECT (self), g_task_report_new_error (self,
callback, callback,
user_data, user_data,
MM_CORE_ERROR, mm_base_sim_send_puk,
MM_CORE_ERROR_UNSUPPORTED, MM_CORE_ERROR,
"Cannot send PUK: " MM_CORE_ERROR_UNSUPPORTED,
"operation not supported"); "Cannot send PUK: "
"operation not supported");
return; return;
} }
ctx = g_new0 (SendPinPukContext, 1); ctx = g_new0 (SendPinPukContext, 1);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback, g_task_set_task_data (task, ctx, (GDestroyNotify)send_pin_puk_context_free);
user_data,
mm_base_sim_send_puk);
MM_BASE_SIM_GET_CLASS (self)->send_puk (self, MM_BASE_SIM_GET_CLASS (self)->send_puk (self,
puk, puk,
new_pin, new_pin,
(GAsyncReadyCallback)send_puk_ready, (GAsyncReadyCallback)send_puk_ready,
ctx); task);
} }
/*****************************************************************************/ /*****************************************************************************/