diff options
| author | Dan Williams <dcbw@redhat.com> | 2009-11-26 13:52:50 -0800 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2009-11-26 13:52:50 -0800 |
| commit | 15595b33dc88724253a147b7894c953a5d3110e6 (patch) | |
| tree | 01098303d41fc6bbd11310e398e9f35ea3fc5bd0 /src | |
| parent | 8dd2421e9c7c2d8afa5af4080eabed41c5689d81 (diff) | |
gsm: CGDCONT parsing fixes (bgo #602552)
Ignore spaces and account for random parentheses in the CGDCONT
response. Also fixes parsing CGDCONT=? on nozomi.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-generic-gsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c index f2053c53..5bd1c328 100644 --- a/src/mm-generic-gsm.c +++ b/src/mm-generic-gsm.c @@ -1319,7 +1319,7 @@ cid_range_read (MMSerialPort *port, GRegex *r; GMatchInfo *match_info; - r = g_regex_new ("\\+CGDCONT: \\((\\d+)-(\\d+)\\),\"(\\S+)\"", + r = g_regex_new ("\\+CGDCONT:\\s*\\((\\d+)-(\\d+)\\),\\(?\"(\\S+)\"", G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW, 0, &info->error); if (r) { @@ -1385,7 +1385,7 @@ existing_apns_read (MMSerialPort *port, GRegex *r; GMatchInfo *match_info; - r = g_regex_new ("\\+CGDCONT: (\\d+)\\s*,\"(\\S+)\",\"(\\S+)\",\"(\\S+)\"", + r = g_regex_new ("\\+CGDCONT:\\s*(\\d+)\\s*,\"(\\S+)\",\"(\\S+)\",\"(\\S*)\"", G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW, 0, &info->error); if (r) { |