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

modem-helpers: handle +CGDCONT=? replies with single context

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=708983
This commit is contained in:
Aleksander Morgado
2013-11-01 15:44:18 +01:00
parent 04b52d590f
commit 1b3114a0f9
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -764,7 +764,7 @@ mm_3gpp_parse_cgdcont_test_response (const gchar *response,
return NULL;
}
r = g_regex_new ("\\+CGDCONT:\\s*\\((\\d+)-(\\d+)\\),\\(?\"(\\S+)\"",
r = g_regex_new ("\\+CGDCONT:\\s*\\((\\d+)-?(\\d+)?\\),\\(?\"(\\S+)\"",
G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW,
0, &inner_error);
g_assert (r != NULL);
@@ -786,19 +786,18 @@ mm_3gpp_parse_cgdcont_test_response (const gchar *response,
if (!mm_get_uint_from_match_info (match_info, 1, &min_cid))
mm_warn ("Invalid min CID in CGDCONT=? reply for PDP type '%s'", pdp_type_str);
else {
/* Read max CID */
MM3gppPdpContextFormat *format;
/* Read max CID: Optional! If no value given, we default to min CID */
if (!mm_get_uint_from_match_info (match_info, 2, &max_cid))
mm_warn ("Invalid max CID in CGDCONT=? reply for PDP type '%s'", pdp_type_str);
else {
MM3gppPdpContextFormat *format;
max_cid = min_cid;
format = g_slice_new (MM3gppPdpContextFormat);
format->pdp_type = pdp_type;
format->min_cid = min_cid;
format->max_cid = max_cid;
format = g_slice_new (MM3gppPdpContextFormat);
format->pdp_type = pdp_type;
format->min_cid = min_cid;
format->max_cid = max_cid;
list = g_list_prepend (list, format);
}
list = g_list_prepend (list, format);
}
}