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

base-call: fix logic when rejecting calls

Browse Source 
Make sure the async task is always finished, even when
mm_base_modem_at_command_finish() returns an error which is not
MM_SERIAL_ERROR_RESPONSE_TIMEOUT.
This commit is contained in:
Aleksander Morgado
2018-06-14 12:06:55 +02:00
committed by Dan Williams
parent 0ac15f6e22
commit 9503af95e2
1 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mm-base-call.c
View File

@@ -717,21 +717,20 @@ call_accept (MMBaseCall *self,
} }
/*****************************************************************************/ /*****************************************************************************/
/* Hangup the call */
/* Hangup the CALL */
static gboolean static gboolean
call_hangup_finish (MMBaseCall *self, call_hangup_finish (MMBaseCall *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return g_task_propagate_boolean (G_TASK (res), error); return g_task_propagate_boolean (G_TASK (res), error);
} }
static void static void
call_hangup_ready (MMBaseModem *modem, call_hangup_ready (MMBaseModem *modem,
GAsyncResult *res, GAsyncResult *res,
GTask *task) GTask *task)
{ {
MMBaseCall *self; MMBaseCall *self;
GError *error = NULL; GError *error = NULL;
@@ -739,40 +738,25 @@ call_hangup_ready (MMBaseModem *modem,
self = g_task_get_source_object (task); self = g_task_get_source_object (task);
mm_base_modem_at_command_finish (modem, res, &error); mm_base_modem_at_command_finish (modem, res, &error);
if (error) {
if (g_error_matches (error, MM_SERIAL_ERROR, MM_SERIAL_ERROR_RESPONSE_TIMEOUT)) {
g_task_return_error (task, error);
g_object_unref (task);
return;
}
mm_dbg ("Couldn't hangup call : '%s'", error->message); /* we set it as terminated even if we got an error reported */
g_error_free (error);
return;
}
/* Update state */
mm_base_call_change_state (self, MM_CALL_STATE_TERMINATED, MM_CALL_STATE_REASON_TERMINATED); mm_base_call_change_state (self, MM_CALL_STATE_TERMINATED, MM_CALL_STATE_REASON_TERMINATED);
if (error) { if (error)
g_task_return_error (task, error); g_task_return_error (task, error);
g_object_unref (task); else
return; g_task_return_boolean (task, TRUE);
}
g_task_return_boolean (task, TRUE);
g_object_unref (task); g_object_unref (task);
} }
static void static void
call_hangup (MMBaseCall *self, call_hangup (MMBaseCall *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GTask *task; GTask *task;
task = g_task_new (self, NULL, callback, user_data); task = g_task_new (self, NULL, callback, user_data);
mm_base_modem_at_command (self->priv->modem, mm_base_modem_at_command (self->priv->modem,
"+CHUP", "+CHUP",
2, 2,