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

modem-helpers: allow leading zeroes in CREG/CGREG responses

Browse Source
This commit is contained in:
Aleksander Morgado
2012-02-14 16:00:15 +01:00
parent 5589df8946
commit 2a12322a80
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -542,7 +542,7 @@ mm_3gpp_parse_pdp_query_response (const gchar *reply,
#define CREG7 "\\+(CREG|CGREG):\\s*0*([0-9]),\\s*0*([0-9])\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*[^,\\s]*" #define CREG7 "\\+(CREG|CGREG):\\s*0*([0-9]),\\s*0*([0-9])\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*[^,\\s]*"
/* +CREG: <stat>,<lac>,<ci>,<AcT>,<RAC> (ETSI 27.007 v9.20 CREG=2 unsolicited with RAC) */ /* +CREG: <stat>,<lac>,<ci>,<AcT>,<RAC> (ETSI 27.007 v9.20 CREG=2 unsolicited with RAC) */
#define CREG8 "\\+(CREG|CGREG):\\s*(\\d{1})\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*(\\d{1,2})\\s*,\\s*([^,\\s]*)" #define CREG8 "\\+(CREG|CGREG):\\s*0*([0-9])\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*0*([0-9])\\s*,\\s*([^,\\s]*)"
GPtrArray * GPtrArray *
mm_3gpp_creg_regex_get (gboolean solicited) mm_3gpp_creg_regex_get (gboolean solicited)

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

@@ -624,7 +624,7 @@ test_creg2_iridium_solicited (void *f, gpointer d)
{ {
TestData *data = (TestData *) d; TestData *data = (TestData *) d;
const char *reply = "+CREG:002,001,\"18d8\",\"ffff\""; const char *reply = "+CREG:002,001,\"18d8\",\"ffff\"";
const CregResult result = { 1, 0x18D8, 0xFFFF, -1 , 4, FALSE}; const CregResult result = { 1, 0x18D8, 0xFFFF, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN, 4, FALSE};
test_creg_match ("Iridium, CREG=2", TRUE, reply, data, &result); test_creg_match ("Iridium, CREG=2", TRUE, reply, data, &result);
} }