From 4442173dcff34fb6f2ce0d07b10c95a06a31a8f5 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Thu, 11 Feb 2016 13:45:09 +0100 Subject: modem-helpers: allow optional whitespace in +CGDCONT response Add testcase for Thuraya XT. Signed-off-by: Thomas Sailer --- src/mm-modem-helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mm-modem-helpers.c') diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 17ad8d28..0331aa7b 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -867,7 +867,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*\\(\\s*(\\d+)\\s*-?\\s*(\\d+)?\\s*\\)\\s*,\\s*\\(?\"(\\S+)\"", G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW, 0, &inner_error); g_assert (r != NULL); @@ -955,7 +955,7 @@ mm_3gpp_parse_cgdcont_read_response (const gchar *reply, return NULL; list = NULL; - r = g_regex_new ("\\+CGDCONT:\\s*(\\d+)\\s*,([^,\\)]*),([^,\\)]*),([^,\\)]*)", + r = g_regex_new ("\\+CGDCONT:\\s*(\\d+)\\s*,([^, \\)]*)\\s*,([^, \\)]*)\\s*,([^, \\)]*)", G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW, 0, &inner_error); if (r) { -- cgit v1.2.3-70-g09d2