diff options
| -rw-r--r-- | src/mm-modem-helpers.c | 2 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers.c | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 74e55462..9f71b240 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -876,7 +876,7 @@ mm_3gpp_parse_cgdcont_test_response (const gchar *response, return NULL; } - r = g_regex_new ("\\+CGDCONT:\\s*\\(\\s*(\\d+)\\s*-?\\s*(\\d+)?\\s*\\)\\s*,\\s*\\(?\"(\\S+)\"", + r = g_regex_new ("\\+CGDCONT:\\s*\\(\\s*(\\d+)\\s*-?\\s*(\\d+)?[^\\)]*\\)\\s*,\\s*\\(?\"(\\S+)\"", G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW, 0, &inner_error); g_assert (r != NULL); diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index ddd25af4..4c2d6db6 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -1831,6 +1831,21 @@ test_cgdcont_test_response_thuraya (void *f, gpointer d) test_cgdcont_test_results ("Thuraya", reply, &expected[0], G_N_ELEMENTS (expected)); } + +static void +test_cgdcont_test_response_cinterion_phs8 (void *f, gpointer d) +{ + const gchar *reply = + "+CGDCONT: (1-17,101-116),\"IP\",,,(0),(0-4)\r\n"; + static MM3gppPdpContextFormat expected[] = { + { 1, 17, MM_BEARER_IP_FAMILY_IPV4 } + }; + + test_cgdcont_test_results ("Cinterion PHS8-USA REVISION 03.001", reply, &expected[0], G_N_ELEMENTS (expected)); +} + + + /*****************************************************************************/ /* Test CGDCONT read responses */ @@ -2862,6 +2877,7 @@ int main (int argc, char **argv) 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_test_response_thuraya, NULL)); + g_test_suite_add (suite, TESTCASE (test_cgdcont_test_response_cinterion_phs8, 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)); |