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

cinterion: support number ranges in CNMI=? parser

Browse Source 
https://lists.freedesktop.org/archives/modemmanager-devel/2017-February/003911.html
This commit is contained in:
Aleksander Morgado
2017-02-13 10:42:06 +01:00
parent 91613543d5
commit 421713208b
2 changed files with 88 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
plugins/cinterion/mm-modem-helpers-cinterion.c
View File

@@ -247,43 +247,6 @@ mm_cinterion_parse_scfg_response (const gchar *response,
* +CNMI: (0,1,2),(0,1),(0,2),(0),(1)
*/
static GArray *
read_number_list (const gchar *str)
{
GError *inner_error = NULL;
GArray *out = NULL;
GRegex *r;
GMatchInfo *match_info;
if (!str)
return NULL;
r = g_regex_new ("(\\d),?", G_REGEX_UNGREEDY, 0, NULL);
g_assert (r != NULL);
g_regex_match_full (r, str, strlen (str), 0, 0, &match_info, &inner_error);
while (!inner_error && g_match_info_matches (match_info)) {
guint aux;
if (mm_get_uint_from_match_info (match_info, 1, &aux)) {
if (!out)
out = g_array_sized_new (FALSE, FALSE, sizeof (guint), 3);
g_array_append_val (out, aux);
}
g_match_info_next (match_info, &inner_error);
}
if (inner_error) {
mm_warn ("Unexpected error matching +CNMI response: '%s'", inner_error->message);
g_error_free (inner_error);
}
g_match_info_free (match_info);
g_regex_unref (r);
return out;
}
gboolean
mm_cinterion_parse_cnmi_test (const gchar *response,
GArray **supported_mode,
@@ -296,6 +259,11 @@ mm_cinterion_parse_cnmi_test (const gchar *response,
GRegex *r;
GMatchInfo *match_info;
GError *inner_error = NULL;
GArray *tmp_supported_mode = NULL;
GArray *tmp_supported_mt = NULL;
GArray *tmp_supported_bm = NULL;
GArray *tmp_supported_ds = NULL;
GArray *tmp_supported_bfr = NULL;
if (!response) {
g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Missing response");
@@ -313,77 +281,76 @@ mm_cinterion_parse_cnmi_test (const gchar *response,
gchar *str;
str = mm_get_string_unquoted_from_match_info (match_info, 1);
*supported_mode = read_number_list (str);
tmp_supported_mode = mm_parse_uint_list (str, &inner_error);
g_free (str);
if (inner_error)
goto out;
}
if (supported_mt) {
gchar *str;
str = mm_get_string_unquoted_from_match_info (match_info, 2);
*supported_mt = read_number_list (str);
tmp_supported_mt = mm_parse_uint_list (str, &inner_error);
g_free (str);
if (inner_error)
goto out;
}
if (supported_bm) {
gchar *str;
str = mm_get_string_unquoted_from_match_info (match_info, 3);
*supported_bm = read_number_list (str);
tmp_supported_bm = mm_parse_uint_list (str, &inner_error);
g_free (str);
if (inner_error)
goto out;
}
if (supported_ds) {
gchar *str;
str = mm_get_string_unquoted_from_match_info (match_info, 4);
*supported_ds = read_number_list (str);
tmp_supported_ds = mm_parse_uint_list (str, &inner_error);
g_free (str);
if (inner_error)
goto out;
}
if (supported_bfr) {
gchar *str;
str = mm_get_string_unquoted_from_match_info (match_info, 5);
*supported_bfr = read_number_list (str);
tmp_supported_bfr = mm_parse_uint_list (str, &inner_error);
g_free (str);
if (inner_error)
goto out;
}
}
out:
if (match_info)
g_match_info_free (match_info);
g_regex_unref (r);
if ((supported_mode && *supported_mode == NULL) ||
(supported_mt && *supported_mt == NULL) ||
(supported_bm && *supported_bm == NULL) ||
(supported_ds && *supported_ds == NULL) ||
(supported_bfr && *supported_bfr == NULL))
inner_error = g_error_new (MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Error parsing +CNMI=? response");
if (inner_error) {
if (supported_mode && *supported_mode) {
g_array_unref (*supported_mode);
*supported_mode = NULL;
}
if (supported_mt && *supported_mt) {
g_array_unref (*supported_mt);
*supported_mt = NULL;
}
if (supported_bm && *supported_bm) {
g_array_unref (*supported_bm);
*supported_bm = NULL;
}
if (supported_ds && *supported_ds) {
g_array_unref (*supported_ds);
*supported_ds = NULL;
}
if (supported_bfr && *supported_bfr) {
g_array_unref (*supported_bfr);
*supported_bfr = NULL;
}
g_clear_pointer (&tmp_supported_mode, g_array_unref);
g_clear_pointer (&tmp_supported_mt, g_array_unref);
g_clear_pointer (&tmp_supported_bm, g_array_unref);
g_clear_pointer (&tmp_supported_ds, g_array_unref);
g_clear_pointer (&tmp_supported_bfr, g_array_unref);
g_propagate_error (error, inner_error);
return FALSE;
}
if (supported_mode)
*supported_mode = tmp_supported_mode;
if (supported_mt)
*supported_mt = tmp_supported_mt;
if (supported_bm)
*supported_bm = tmp_supported_bm;
if (supported_ds)
*supported_ds = tmp_supported_ds;
if (supported_bfr)
*supported_bfr = tmp_supported_bfr;
return TRUE;
}

50
plugins/cinterion/tests/test-modem-helpers-cinterion.c
View File

@@ -330,6 +330,55 @@ test_cnmi_phs8 (void)
g_array_unref (expected_bfr);
}
static void
test_cnmi_other (void)
{
GArray *expected_mode;
GArray *expected_mt;
GArray *expected_bm;
GArray *expected_ds;
GArray *expected_bfr;
guint val;
const gchar *response =
"+CNMI: (0-3),(0,1),(0,2,3),(0,2),(1)\r\n"
"\r\n";
expected_mode = g_array_sized_new (FALSE, FALSE, sizeof (guint), 3);
val = 0, g_array_append_val (expected_mode, val);
val = 1, g_array_append_val (expected_mode, val);
val = 2, g_array_append_val (expected_mode, val);
val = 3, g_array_append_val (expected_mode, val);
expected_mt = g_array_sized_new (FALSE, FALSE, sizeof (guint), 2);
val = 0, g_array_append_val (expected_mt, val);
val = 1, g_array_append_val (expected_mt, val);
expected_bm = g_array_sized_new (FALSE, FALSE, sizeof (guint), 2);
val = 0, g_array_append_val (expected_bm, val);
val = 2, g_array_append_val (expected_bm, val);
val = 3, g_array_append_val (expected_bm, val);
expected_ds = g_array_sized_new (FALSE, FALSE, sizeof (guint), 1);
val = 0, g_array_append_val (expected_ds, val);
val = 2, g_array_append_val (expected_ds, val);
expected_bfr = g_array_sized_new (FALSE, FALSE, sizeof (guint), 1);
val = 1, g_array_append_val (expected_bfr, val);
common_test_cnmi (response,
expected_mode,
expected_mt,
expected_bm,
expected_ds,
expected_bfr);
g_array_unref (expected_mode);
g_array_unref (expected_mt);
g_array_unref (expected_bm);
g_array_unref (expected_ds);
g_array_unref (expected_bfr);
}
/*****************************************************************************/
/* Test ^SWWAN read */
@@ -548,6 +597,7 @@ int main (int argc, char **argv)
g_test_add_func ("/MM/cinterion/scfg/response/2g", test_scfg_response_2g);
g_test_add_func ("/MM/cinterion/scfg/response/2g/ucs2", test_scfg_response_2g_ucs2);
g_test_add_func ("/MM/cinterion/cnmi/phs8", test_cnmi_phs8);
g_test_add_func ("/MM/cinterion/cnmi/other", test_cnmi_other);
g_test_add_func ("/MM/cinterion/swwan/pls8", test_swwan_pls8);
g_test_add_func ("/MM/cinterion/sind/response/simstatus", test_sind_response_simstatus);