[PATCH] mm-modem-mbm.c: Abort connect attempt on e2nap: 0

[Torgny Johansson <torgny johansson gmail com>]

Hi!

The attached patch slightly modifies the handling of e2nap unsolicited
messages. If e2nap: 0 is received while connecting the connect attempt
is now aborted since it will not be successful. Without this patch MM
will poll enap for an additional ~50 seconds before giving up.

The patch also moves the at*e2nap=1 call before the at*enap=1 call to
make sure that no unsolicited message can be missed.

Regards
Torgny Johansson

diff --git a/plugins/mm-modem-mbm.c b/plugins/mm-modem-mbm.c
index 4e08c68..c29e7c1 100644
--- a/plugins/mm-modem-mbm.c
+++ b/plugins/mm-modem-mbm.c
@@ -521,12 +521,20 @@ mbm_ciev_received (MMSerialPort *port,
 }
 
 static void
-mbm_do_connect_done (MMModemMbm *self)
+mbm_do_connect_done (MMModemMbm *self, gboolean success)
 {
     MMModemMbmPrivate *priv = MM_MODEM_MBM_GET_PRIVATE (self);
 
     if (priv->pending_connect_info) {
-        mm_generic_gsm_connect_complete (MM_GENERIC_GSM (self), NULL, priv->pending_connect_info);
+        if (success)
+            mm_generic_gsm_connect_complete (MM_GENERIC_GSM (self), NULL, priv->pending_connect_info);
+        else {
+            GError *connect_error;
+            
+            connect_error = mm_modem_connect_error_for_code (MM_MODEM_CONNECT_ERROR_BUSY);
+            mm_generic_gsm_connect_complete (MM_GENERIC_GSM (self), connect_error, priv->pending_connect_info);
+            g_error_free (connect_error);
+        }   
         priv->pending_connect_info = NULL;
     }
 }
@@ -543,11 +551,12 @@ mbm_e2nap_received (MMSerialPort *port,
     if (str)
         state = atoi (str);
 
-    if (MBM_E2NAP_DISCONNECTED == state)
+    if (MBM_E2NAP_DISCONNECTED == state) {
         g_debug ("%s, disconnected", __func__);
-    else if (MBM_E2NAP_CONNECTED == state) {
+        mbm_do_connect_done (MM_MODEM_MBM (user_data), FALSE);
+    } else if (MBM_E2NAP_CONNECTED == state) {
         g_debug ("%s, connected", __func__);
-        mbm_do_connect_done (MM_MODEM_MBM (user_data));
+        mbm_do_connect_done (MM_MODEM_MBM (user_data), TRUE);
     } else if (MBM_E2NAP_CONNECTING == state)
         g_debug("%s, connecting", __func__);
     else {
@@ -619,7 +628,6 @@ enap_done (MMSerialPort *port,
     tid = g_timeout_add_seconds (1, enap_poll, user_data);
     /* remember poll id as callback info object, with source_remove as free func */
     mm_callback_info_set_data (info, "mbm-enap-poll-id", GUINT_TO_POINTER (tid), (GFreeFunc) g_source_remove);
-    mm_serial_port_queue_command (port, "AT*E2NAP=1", 3, NULL, NULL);
 }
 
 static void
@@ -639,6 +647,9 @@ mbm_auth_done (MMSerialPort *port,
     }
 
     cid = mm_generic_gsm_get_cid (modem);
+
+    mm_serial_port_queue_command (port, "AT*E2NAP=1", 3, NULL, NULL);
+        
     command = g_strdup_printf ("AT*ENAP=1,%d", cid);
     mm_serial_port_queue_command (port, command, 3, enap_done, user_data);
     g_free (command);