broadband-bearer: rely on profile management for the cid selection

There is no longer need to perform all the CID selection logic in the
broadband bearer connection procedure, we can rely on the new profile
management operations to do the same thing.

We can do this because we're sure that all the MMBroadbandModem
objects implement the MMModem3gppProfileManager interface.

Additionally, given that we now provide the profile ID value as part
of the MMBearerConnectResult, we no longer need a custom
mm_broadband_bearer_get_3gpp_cid() as we can use the generic
mm_base_bearer_get_profile_id() for the same purpose.

1 files changed, 0 insertions, 111 deletions

diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c
index 9a389ec3..405b3332 100644
--- a/src/mm-modem-helpers.c
+++ b/src/mm-modem-helpers.c
@@ -1500,117 +1500,6 @@ mm_3gpp_pdp_context_format_list_find_range (GList            *pdp_format_list,
     return FALSE;
 }
 
-guint
-mm_3gpp_select_best_cid (const gchar      *apn,
-                         MMBearerIpFamily  ip_family,
-                         GList            *context_list,
-                         GList            *context_format_list,
-                         gpointer          log_object,
-                         gboolean         *out_cid_reused,
-                         gboolean         *out_cid_overwritten)
-{
-    GList *l;
-    guint  prev_cid = 0;
-    guint  exact_cid = 0;
-    guint  unused_cid = 0;
-    guint  max_cid = 0;
-    guint  max_allowed_cid = 0;
-    guint  blank_cid = 0;
-    gchar *ip_family_str;
-
-    g_assert (out_cid_reused);
-    g_assert (out_cid_overwritten);
-
-    ip_family_str = mm_bearer_ip_family_build_string_from_mask (ip_family);
-    mm_obj_dbg (log_object, "looking for best CID matching APN '%s' and PDP type '%s'...",
-                apn, ip_family_str);
-    g_free (ip_family_str);
-
-    /* Look for the exact PDP context we want */
-    for (l = context_list; l; l = g_list_next (l)) {
-        MM3gppPdpContext *pdp = l->data;
-
-        /* Match PDP type */
-        if (pdp->pdp_type == ip_family) {
-            /* Try to match exact APN and PDP type */
-            if (mm_3gpp_cmp_apn_name (apn, pdp->apn)) {
-                exact_cid = pdp->cid;
-                break;
-            }
-
-            /* Same PDP type but with no APN set? we may use that one if no exact match found */
-            if ((!pdp->apn || !pdp->apn[0]) && !blank_cid)
-                blank_cid = pdp->cid;
-        }
-
-        /* If an unused CID was not found yet and the previous CID is not (CID - 1),
-         * this means that (previous CID + 1) is an unused CID that can be used.
-         * This logic will allow us using unused CIDs that are available in the gaps
-         * between already defined contexts.
-         */
-        if (!unused_cid && prev_cid && ((prev_cid + 1) < pdp->cid))
-            unused_cid = prev_cid + 1;
-
-        /* Update previous CID value to the current CID for use in the next loop,
-         * unless an unused CID was already found.
-         */
-        if (!unused_cid)
-            prev_cid = pdp->cid;
-
-        /* Update max CID if we found a bigger one */
-        if (max_cid < pdp->cid)
-            max_cid = pdp->cid;
-    }
-
-    /* Always prefer an exact match */
-    if (exact_cid) {
-        mm_obj_dbg (log_object, "found exact context at CID %u", exact_cid);
-        *out_cid_reused = TRUE;
-        *out_cid_overwritten = FALSE;
-        return exact_cid;
-    }
-
-    /* Try to use an unused CID detected in between the already defined contexts */
-    if (unused_cid) {
-        mm_obj_dbg (log_object, "found unused context at CID %u", unused_cid);
-        *out_cid_reused = FALSE;
-        *out_cid_overwritten = FALSE;
-        return unused_cid;
-    }
-
-    /* If the max existing CID found during CGDCONT? is below the max allowed
-     * CID, then we can use the next available CID because it's an unused one. */
-    mm_3gpp_pdp_context_format_list_find_range (context_format_list, ip_family, NULL, &max_allowed_cid);
-    if (max_cid && (max_cid < max_allowed_cid)) {
-        mm_obj_dbg (log_object, "found unused context at CID %u (<%u)", max_cid + 1, max_allowed_cid);
-        *out_cid_reused = FALSE;
-        *out_cid_overwritten = FALSE;
-        return (max_cid + 1);
-    }
-
-    /* Rewrite a context defined with no APN, if any */
-    if (blank_cid) {
-        mm_obj_dbg (log_object, "rewriting context with empty APN at CID %u", blank_cid);
-        *out_cid_reused = FALSE;
-        *out_cid_overwritten = TRUE;
-        return blank_cid;
-    }
-
-    /* Rewrite the last existing one found */
-    if (max_cid) {
-        mm_obj_dbg (log_object, "rewriting last context detected at CID %u", max_cid);
-        *out_cid_reused = FALSE;
-        *out_cid_overwritten = TRUE;
-        return max_cid;
-    }
-
-    /* Otherwise, just fallback to CID=1 */
-    mm_obj_dbg (log_object, "falling back to CID 1");
-    *out_cid_reused = FALSE;
-    *out_cid_overwritten = TRUE;
-    return 1;
-}
-
 /*************************************************************************/
 
 MM3gppProfile *