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

modem-helpers: improve CGDCONT read response parsing

Browse Source 
SIM A7600E-H sends only 3 parameters in CGDCONT read response (+CGDCONT: 1,"IP","nate.sktelecom.com").
The parsing regex requeres 4 parameters, so the response is not matched.
In addition fourth parameter is not used by parsing code.
This commit is contained in:
Petr Krasnoshchekov
2023-12-01 12:49:45 +00:00
committed by Aleksander Morgado
parent d6d9be125e
commit 277d785735
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-modem-helpers.c
+1 -1
View File
@@ -1826,7 +1826,7 @@ mm_3gpp_parse_cgdcont_read_response (const gchar *reply,
/* No APNs configured, all done */
return NULL;
r = g_regex_new ("\\+CGDCONT:\\s*(\\d+)\\s*,([^, \\)]*)\\s*,([^, \\)]*)\\s*,([^, \\)]*)",
r = g_regex_new ("\\+CGDCONT:\\s*(\\d+)\\s*,([^, \\)]*)\\s*,([^,\\s\\)]*)",
G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW,
0, NULL);
g_assert (r);
src/tests/test-modem-helpers.c
+17
View File
@@ -2688,6 +2688,22 @@ test_cgdcont_read_response_samsung (void *f, gpointer d)
test_cgdcont_read_results ("Samsung", reply, &expected[0], G_N_ELEMENTS (expected));
}
static void
test_cgdcont_read_response_simcom (void *f, gpointer d)
{
const gchar *reply =
"+CGDCONT: 1,\"IP\",\"nate.sktelecom.com\"\r\n"
"+CGDCONT: 2,\"IP\",\"epc.tmobile.com\"\r\n"
"+CGDCONT: 3,\"IP\",\"MAXROAM.com\"\r\n";
static MM3gppPdpContext expected[] = {
{ 1, MM_BEARER_IP_FAMILY_IPV4, (gchar *) "nate.sktelecom.com" },
{ 2, MM_BEARER_IP_FAMILY_IPV4, (gchar *) "epc.tmobile.com" },
{ 3, MM_BEARER_IP_FAMILY_IPV4, (gchar *) "MAXROAM.com" }
};
test_cgdcont_read_results ("Simcom", reply, &expected[0], G_N_ELEMENTS (expected));
}
/*****************************************************************************/
/* Test CGDCONT read responses */
@@ -4778,6 +4794,7 @@ int main (int argc, char **argv)
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_simcom, NULL));
g_test_suite_add (suite, TESTCASE (test_profile_selection, NULL));