Attachment 123525 Details for Bug 95302 – Patch 2/2

Patch 2/2

0004-mbm-wait-until-the-E2NAP-response-for-disconnecting.patch (text/plain), 5.83 KB, created by Lubomir Rintel on 2016-05-06 17:32:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubomir Rintel

Created: 2016-05-06 17:32:58 UTC

Size: 5.83 KB

patch

obsolete

>From 89816a1bcc0d06a6f96dce647eef77641533da5a Mon Sep 17 00:00:00 2001
>From: Lubomir Rintel <lkundrak@v3.sk>
>Date: Fri, 6 May 2016 10:20:07 +0200
>Subject: [PATCH 4/4] mbm: wait until the E2NAP response for disconnecting
>
>Otherwise the client may start connecting again (such as NetworkManager
>on autoconnect retry) and the anychronous E2NAP may abort it.
>---
> plugins/mbm/mm-broadband-bearer-mbm.c | 87 +++++++++++++++++++++--------------
> 1 file changed, 52 insertions(+), 35 deletions(-)
>
>diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/plugins/mbm/mm-broadband-bearer-mbm.c
>index 5d97fee..1afdae8 100644
>--- a/plugins/mbm/mm-broadband-bearer-mbm.c
>+++ b/plugins/mbm/mm-broadband-bearer-mbm.c
>@@ -46,6 +46,7 @@ G_DEFINE_TYPE (MMBroadbandBearerMbm, mm_broadband_bearer_mbm, MM_TYPE_BROADBAND_
> 
> struct _MMBroadbandBearerMbmPrivate {
>     gpointer connect_pending;
>+    gpointer disconnect_pending;
>     guint connect_pending_id;
>     gulong connect_cancellable_id;
> };
>@@ -89,12 +90,12 @@ disconnect_enap_ready (MMBaseModem *modem,
>     /* Ignore errors for now */
>     mm_base_modem_at_command_full_finish (modem, res, &error);
>     if (error) {
>+        MM_BROADBAND_BEARER_MBM (modem)->priv->disconnect_pending = NULL;
>         mm_dbg ("Disconnection failed (not fatal): %s", error->message);
>         g_error_free (error);
>+        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
>+        disconnect_context_complete_and_free (ctx);
>     }
>-
>-    g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
>-    disconnect_context_complete_and_free (ctx);
> }
> 
> static void
>@@ -120,6 +121,7 @@ disconnect_3gpp (MMBroadbandBearer *self,
>                                              user_data,
>                                              disconnect_3gpp);
> 
>+    MM_BROADBAND_BEARER_MBM (self)->priv->disconnect_pending = ctx;
>     mm_base_modem_at_command_full (MM_BASE_MODEM (modem),
>                                    primary,
>                                    "*ENAP=0",
>@@ -202,17 +204,58 @@ report_connection_status (MMBaseBearer *bearer,
>                           MMBearerConnectionStatus status)
> {
>     MMBroadbandBearerMbm *self = MM_BROADBAND_BEARER_MBM (bearer);
>-    Dial3gppContext *ctx;
> 
>     g_assert (status == MM_BEARER_CONNECTION_STATUS_CONNECTED ||
>               status == MM_BEARER_CONNECTION_STATUS_DISCONNECTED);
> 
>-    /* Recover context (if any) and remove both cancellation and timeout (if any)*/
>-    ctx = self->priv->connect_pending;
>-    self->priv->connect_pending = NULL;
> 
>-    /* Connection status reported but no connection attempt? */
>-    if (!ctx) {
>+    if (self->priv->connect_pending) {
>+        Dial3gppContext *ctx;
>+
>+        /* Recover context (if any) and remove both cancellation and timeout (if any)*/
>+        ctx = self->priv->connect_pending;
>+        self->priv->connect_pending = NULL;
>+
>+        if (self->priv->connect_pending_id) {
>+            g_source_remove (self->priv->connect_pending_id);
>+            self->priv->connect_pending_id = 0;
>+        }
>+
>+        if (self->priv->connect_cancellable_id) {
>+            g_cancellable_disconnect (ctx->cancellable,
>+                                      self->priv->connect_cancellable_id);
>+            self->priv->connect_cancellable_id = 0;
>+        }
>+
>+        /* Reporting connected */
>+        if (status == MM_BEARER_CONNECTION_STATUS_CONNECTED) {
>+            g_simple_async_result_set_op_res_gpointer (ctx->result,
>+                                                       g_object_ref (ctx->data),
>+                                                       (GDestroyNotify)g_object_unref);
>+            dial_3gpp_context_complete_and_free (ctx);
>+            return;
>+        }
>+
>+        /* Reporting disconnected */
>+        g_simple_async_result_set_error (ctx->result,
>+                                         MM_CORE_ERROR,
>+                                         MM_CORE_ERROR_FAILED,
>+                                         "Call setup failed");
>+        dial_3gpp_context_complete_and_free (ctx);
>+    } else if (self->priv->disconnect_pending) {
>+        /* Finished disconnecting */
>+        DisconnectContext *ctx;
>+
>+        ctx = self->priv->disconnect_pending;
>+        self->priv->disconnect_pending = NULL;
>+
>+        if (status != MM_BEARER_CONNECTION_STATUS_DISCONNECTED)
>+            mm_dbg ("Disconnection failed (not fatal)");
>+
>+        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
>+        disconnect_context_complete_and_free (ctx);
>+    } else {
>+        /* Connection status reported but no connection attempt? */
>         g_assert (self->priv->connect_pending_id == 0);
> 
>         mm_dbg ("Received spontaneous *E2NAP (%s)",
>@@ -226,34 +269,8 @@ report_connection_status (MMBaseBearer *bearer,
>                 status);
>         }
>         return;
>-    }
>-
>-    if (self->priv->connect_pending_id) {
>-        g_source_remove (self->priv->connect_pending_id);
>-        self->priv->connect_pending_id = 0;
>-    }
>-
>-    if (self->priv->connect_cancellable_id) {
>-        g_cancellable_disconnect (ctx->cancellable,
>-                                  self->priv->connect_cancellable_id);
>-        self->priv->connect_cancellable_id = 0;
>-    }
> 
>-    /* Reporting connected */
>-    if (status == MM_BEARER_CONNECTION_STATUS_CONNECTED) {
>-        g_simple_async_result_set_op_res_gpointer (ctx->result,
>-                                                   g_object_ref (ctx->data),
>-                                                   (GDestroyNotify)g_object_unref);
>-        dial_3gpp_context_complete_and_free (ctx);
>-        return;
>     }
>-
>-    /* Reporting disconnected */
>-    g_simple_async_result_set_error (ctx->result,
>-                                     MM_CORE_ERROR,
>-                                     MM_CORE_ERROR_FAILED,
>-                                     "Call setup failed");
>-    dial_3gpp_context_complete_and_free (ctx);
> }
> 
> static void
>-- 
>2.5.5
>

Actions: View

Attachments on bug 95302: 123522 | 123525

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.