Merge request !1399 from 'cesq-space'
modem-helpers: handle no space after "+CESQ:" https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1399
This commit is contained in:
@@ -2755,7 +2755,7 @@ mm_3gpp_parse_cesq_response (const gchar *response,
|
|||||||
/* Response may be e.g.:
|
/* Response may be e.g.:
|
||||||
* +CESQ: 99,99,255,255,20,80
|
* +CESQ: 99,99,255,255,20,80
|
||||||
*/
|
*/
|
||||||
r = g_regex_new ("\\+CESQ: (\\d+),(\\d+),(\\d+),(\\d+),(\\d+),(\\d+)(?:\\r\\n)?", 0, 0, NULL);
|
r = g_regex_new ("\\+CESQ:\\s*(\\d+),(\\d+),(\\d+),(\\d+),(\\d+),(\\d+)(?:\\r\\n)?", 0, 0, NULL);
|
||||||
g_assert (r != NULL);
|
g_assert (r != NULL);
|
||||||
|
|
||||||
g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &inner_error);
|
g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &inner_error);
|
||||||
|
|||||||
@@ -4171,6 +4171,13 @@ static const CesqResponseTest cesq_response_tests[] = {
|
|||||||
.gsm_info = TRUE, .rxlev = 10, .rssi = -101.0, .ber = 6,
|
.gsm_info = TRUE, .rxlev = 10, .rssi = -101.0, .ber = 6,
|
||||||
.umts_info = FALSE, .rscp_level = 255, .ecn0_level = 255,
|
.umts_info = FALSE, .rscp_level = 255, .ecn0_level = 255,
|
||||||
.lte_info = FALSE, .rsrq_level = 255, .rsrp_level = 255,
|
.lte_info = FALSE, .rsrq_level = 255, .rsrp_level = 255,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
/* No space after ':' */
|
||||||
|
.str = "+CESQ:10,6,255,255,255,255",
|
||||||
|
.gsm_info = TRUE, .rxlev = 10, .rssi = -101.0, .ber = 6,
|
||||||
|
.umts_info = FALSE, .rscp_level = 255, .ecn0_level = 255,
|
||||||
|
.lte_info = FALSE, .rsrq_level = 255, .rsrp_level = 255,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user