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

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

@@ -764,7 +764,7 @@ mm_3gpp_parse_cgdcont_test_response (const gchar *response,
return NULL; 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, G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW,
0, &inner_error); 0, &inner_error);
g_assert (r != NULL); g_assert (r != NULL);
@@ -785,13 +785,13 @@ mm_3gpp_parse_cgdcont_test_response (const gchar *response,
/* Read min CID */ /* Read min CID */
if (!mm_get_uint_from_match_info (match_info, 1, &min_cid)) 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); mm_warn ("Invalid min CID in CGDCONT=? reply for PDP type '%s'", pdp_type_str);
else {
/* Read max 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 { else {
MM3gppPdpContextFormat *format; 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))
max_cid = min_cid;
format = g_slice_new (MM3gppPdpContextFormat); format = g_slice_new (MM3gppPdpContextFormat);
format->pdp_type = pdp_type; format->pdp_type = pdp_type;
format->min_cid = min_cid; format->min_cid = min_cid;
@@ -800,7 +800,6 @@ mm_3gpp_parse_cgdcont_test_response (const gchar *response,
list = g_list_prepend (list, format); list = g_list_prepend (list, format);
} }
} }
}
g_free (pdp_type_str); g_free (pdp_type_str);
g_match_info_next (match_info, &inner_error); g_match_info_next (match_info, &inner_error);

15
src/tests/test-modem-helpers.c
View File

@@ -1707,6 +1707,20 @@ test_cgdcont_test_response_multiple_and_ignore (void *f, gpointer d)
test_cgdcont_test_results ("Multiple and Ignore", reply, &expected[0], G_N_ELEMENTS (expected)); test_cgdcont_test_results ("Multiple and Ignore", reply, &expected[0], G_N_ELEMENTS (expected));
} }
static void
test_cgdcont_test_response_single_context (void *f, gpointer d)
{
const gchar *reply =
"+CGDCONT: (1),\"IP\",,,(0),(0)\r\n"
"+CGDCONT: (1),\"IPV6\",,,(0),(0)\r\n";
static MM3gppPdpContextFormat expected[] = {
{ 1, 1, MM_BEARER_IP_FAMILY_IPV4 },
{ 1, 1, MM_BEARER_IP_FAMILY_IPV6 }
};
test_cgdcont_test_results ("Single Context", reply, &expected[0], G_N_ELEMENTS (expected));
}
/*****************************************************************************/ /*****************************************************************************/
/* Test CGDCONT read responses */ /* Test CGDCONT read responses */
@@ -2443,6 +2457,7 @@ int main (int argc, char **argv)
g_test_suite_add (suite, TESTCASE (test_cgdcont_test_response_single, NULL)); g_test_suite_add (suite, TESTCASE (test_cgdcont_test_response_single, NULL));
g_test_suite_add (suite, TESTCASE (test_cgdcont_test_response_multiple, NULL)); g_test_suite_add (suite, TESTCASE (test_cgdcont_test_response_multiple, NULL));
g_test_suite_add (suite, TESTCASE (test_cgdcont_test_response_multiple_and_ignore, NULL)); g_test_suite_add (suite, TESTCASE (test_cgdcont_test_response_multiple_and_ignore, NULL));
g_test_suite_add (suite, TESTCASE (test_cgdcont_test_response_single_context, NULL));
g_test_suite_add (suite, TESTCASE (test_cgdcont_read_response_nokia, NULL)); g_test_suite_add (suite, TESTCASE (test_cgdcont_read_response_nokia, NULL));
g_test_suite_add (suite, TESTCASE (test_cgdcont_read_response_samsung, NULL)); g_test_suite_add (suite, TESTCASE (test_cgdcont_read_response_samsung, NULL));