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

modem-helpers: new helper to lookup range from CGDCONT=? response

Browse Source
This commit is contained in:
Aleksander Morgado
2021-04-04 10:30:33 +02:00
parent 7e0404c6c2
commit 83a00a9457
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mm-modem-helpers.c
View File

@@ -1477,20 +1477,27 @@ mm_3gpp_cmp_apn_name (const gchar *requested,
/*************************************************************************/ /*************************************************************************/
static guint gboolean
find_max_allowed_cid (GList *context_format_list, mm_3gpp_pdp_context_format_list_find_range (GList *pdp_format_list,
MMBearerIpFamily ip_family) MMBearerIpFamily ip_family,
guint *out_min_cid,
guint *out_max_cid)
{ {
GList *l; GList *l;
for (l = context_format_list; l; l = g_list_next (l)) { for (l = pdp_format_list; l; l = g_list_next (l)) {
MM3gppPdpContextFormat *format = l->data; MM3gppPdpContextFormat *format = l->data;
/* Found exact PDP type? */ /* Found exact PDP type? */
if (format->pdp_type == ip_family) if (format->pdp_type == ip_family) {
return format->max_cid; if (out_min_cid)
*out_min_cid = format->min_cid;
if (out_max_cid)
*out_max_cid = format->max_cid;
return TRUE;
} }
return 0; }
return FALSE;
} }
guint guint
@@ -1573,7 +1580,7 @@ mm_3gpp_select_best_cid (const gchar *apn,
/* If the max existing CID found during CGDCONT? is below the max allowed /* 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. */ * CID, then we can use the next available CID because it's an unused one. */
max_allowed_cid = find_max_allowed_cid (context_format_list, ip_family); 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)) { 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); mm_obj_dbg (log_object, "found unused context at CID %u (<%u)", max_cid + 1, max_allowed_cid);
*out_cid_reused = FALSE; *out_cid_reused = FALSE;

5
src/mm-modem-helpers.h
View File

@@ -185,6 +185,11 @@ GList *mm_3gpp_parse_cgdcont_test_response (const gchar *reply,
gpointer log_object, gpointer log_object,
GError **error); GError **error);
gboolean mm_3gpp_pdp_context_format_list_find_range (GList *pdp_format_list,
MMBearerIpFamily ip_family,
guint *out_min_cid,
guint *out_max_cid);
/* AT+CGDCONT? (PDP context query) response parser */ /* AT+CGDCONT? (PDP context query) response parser */
typedef struct { typedef struct {
guint cid; guint cid;