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

broadband-modem: disconnect all bearers when disabling

Browse Source
This commit is contained in:
Aleksander Morgado
2012-01-20 10:54:45 +01:00
parent a33b05cc10
commit af1f8ed6b3
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mm-broadband-modem.c
View File

@@ -3972,6 +3972,7 @@ modem_location_load_capabilities (MMIfaceModemLocation *self,
typedef enum { typedef enum {
DISABLING_STEP_FIRST, DISABLING_STEP_FIRST,
DISABLING_STEP_DISCONNECT_BEARERS,
DISABLING_STEP_IFACE_SIMPLE, DISABLING_STEP_IFACE_SIMPLE,
DISABLING_STEP_IFACE_MESSAGING, DISABLING_STEP_IFACE_MESSAGING,
DISABLING_STEP_IFACE_LOCATION, DISABLING_STEP_IFACE_LOCATION,
@@ -4046,6 +4047,24 @@ INTERFACE_DISABLE_READY_FN (iface_modem_3gpp, MM_IFACE_MODEM_3GPP, TRUE)
INTERFACE_DISABLE_READY_FN (iface_modem_cdma, MM_IFACE_MODEM_CDMA, TRUE) INTERFACE_DISABLE_READY_FN (iface_modem_cdma, MM_IFACE_MODEM_CDMA, TRUE)
INTERFACE_DISABLE_READY_FN (iface_modem_location, MM_IFACE_MODEM_LOCATION, FALSE) INTERFACE_DISABLE_READY_FN (iface_modem_location, MM_IFACE_MODEM_LOCATION, FALSE)
static void
bearer_list_disconnect_all_bearers_ready (MMBearerList *list,
GAsyncResult *res,
DisablingContext *ctx)
{
GError *error = NULL;
if (!mm_bearer_list_disconnect_all_bearers_finish (list, res, &error)) {
g_simple_async_result_take_error (G_SIMPLE_ASYNC_RESULT (ctx->result), error);
disabling_context_complete_and_free (ctx);
return;
}
/* Go on to next step */
ctx->step++;
disabling_step (ctx);
}
static void static void
disabling_step (DisablingContext *ctx) disabling_step (DisablingContext *ctx)
{ {
@@ -4054,6 +4073,13 @@ disabling_step (DisablingContext *ctx)
/* Fall down to next step */ /* Fall down to next step */
ctx->step++; ctx->step++;
case DISABLING_STEP_DISCONNECT_BEARERS:
mm_bearer_list_disconnect_all_bearers (
ctx->self->priv->modem_bearer_list,
(GAsyncReadyCallback)bearer_list_disconnect_all_bearers_ready,
ctx);
return;
case DISABLING_STEP_IFACE_SIMPLE: case DISABLING_STEP_IFACE_SIMPLE:
/* Fall down to next step */ /* Fall down to next step */
ctx->step++; ctx->step++;