broadband-modem: fall back to +CSQ if +CIND signal quality checking fails

If +CIND fails for any reason (generic failure, wrong indexes, etc) or
reports zero signal strength (quirky modem) then fall back to +CSQ.

1 files changed, 29 insertions, 27 deletions

diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 174de9d1..94c41442 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -1426,53 +1426,55 @@ signal_quality_cind_ready (MMBroadbandModem *self,
     GError *error = NULL;
     const gchar *result;
     GByteArray *indicators;
-    guint quality;
+    guint quality = 0;
 
     result = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
-    if (!error)
-        indicators = mm_3gpp_parse_cind_read_response (result, &error);
-
     if (error) {
-        g_simple_async_result_take_error (ctx->result, error);
-        signal_quality_context_complete_and_free (ctx);
-        return;
+        g_clear_error (&error);
+        goto try_csq;
+    }
+
+    indicators = mm_3gpp_parse_cind_read_response (result, &error);
+    if (!indicators) {
+        mm_dbg ("(%s) Could not parse CIND signal quality results: %s",
+                mm_port_get_device (MM_PORT (ctx->port)),
+                error->message);
+        g_clear_error (&error);
+        goto try_csq;
     }
 
     if (indicators->len < self->priv->modem_cind_indicator_signal_quality) {
-        g_simple_async_result_set_error (ctx->result,
-                                         MM_CORE_ERROR,
-                                         MM_CORE_ERROR_FAILED,
-                                         "Could not parse CIND signal quality results "
-                                         "signal index (%u) outside received range (0-%u)",
+        mm_dbg ("(%s) Could not parse CIND signal quality results; signal "
+                "index (%u) outside received range (0-%u)",
+                mm_port_get_device (MM_PORT (ctx->port)),
                 self->priv->modem_cind_indicator_signal_quality,
                 indicators->len);
-        g_byte_array_free (indicators, TRUE);
-        signal_quality_context_complete_and_free (ctx);
-        return;
-    }
-
+    } else {
         quality = g_array_index (indicators,
                                  guint8,
                                  self->priv->modem_cind_indicator_signal_quality);
-    g_byte_array_free (indicators, TRUE);
-
         quality = normalize_ciev_cind_signal_quality (quality,
                                                       self->priv->modem_cind_min_signal_quality,
                                                       self->priv->modem_cind_max_signal_quality);
-
-    /* Some LTE devices say they support signal via CIND,
-     * but always report zero even though they have signal.  So
-     * if we get zero signal, try CSQ too.  (bgo #636040)
-     */
-    if (quality == 0) {
-        signal_quality_csq (ctx);
-        return;
     }
+    g_byte_array_free (indicators, TRUE);
 
+    if (quality > 0) {
+        /* +CIND success */
         g_simple_async_result_set_op_res_gpointer (ctx->result,
                                                    GUINT_TO_POINTER (quality),
                                                    NULL);
         signal_quality_context_complete_and_free (ctx);
+        return;
+    }
+
+try_csq:
+    /* Always fall back to +CSQ if for whatever reason +CIND failed.  Also,
+     * some QMI-based devices say they support signal via CIND, but always
+     * report zero even though they have signal.  So if we get zero signal
+     * from +CIND, try CSQ too.  (bgo #636040)
+     */
+    signal_quality_csq (ctx);
 }
 
 static void