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

huawei: handle unquoted strings in ^SYSINFOEX response

Browse Source 
The original sysinfoex_parse() in MMBroadbandModemHuawei does not handle
unquoted <sysmode_name> and <submode_name> fields in ^SYSINFOEX responses,
which are sen on some Huawei modems (e.g. E303). This patch moves the
^SYSINFOEX parsing code to mm-modem-helpers-huawei.c, fixes the regex for
handling unquoted strings in ^SYSINFOEX responses, and adds unit tests.
This commit is contained in:
Ben Chan
2013-10-18 02:56:51 -07:00
committed by Aleksander Morgado
parent 49d4163a2b
commit 18053540ea
4 changed files with 140 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
plugins/huawei/tests/test-modem-helpers-huawei.c
View File

@@ -148,9 +148,9 @@ static const SysinfoTest sysinfo_tests[] = {
{ "^SYSINFO:2,4,5,3,1,,", 2, 4, 5, 3, 1, FALSE, 0 },
{ "^SYSINFO:2,4,5,3,1,6", 2, 4, 5, 3, 1, FALSE, 6 },
{ "^SYSINFO:2,4,5,3,1,6,", 2, 4, 5, 3, 1, FALSE, 6 },
{ "^SYSINFO:2,4,5,3,1,,3", 2, 4, 5, 3, 1, TRUE, 3 },
{ "^SYSINFO:2,4,5,3,1,0,3", 2, 4, 5, 3, 1, TRUE, 3 },
{ "^SYSINFO: 2,4,5,3,1,0,3", 2, 4, 5, 3, 1, TRUE, 3 },
{ "^SYSINFO:2,4,5,3,1,,6", 2, 4, 5, 3, 1, TRUE, 6 },
{ "^SYSINFO:2,4,5,3,1,0,6", 2, 4, 5, 3, 1, TRUE, 6 },
{ "^SYSINFO: 2,4,5,3,1,0,6", 2, 4, 5, 3, 1, TRUE, 6 },
{ NULL, 0, 0, 0, 0, 0, FALSE, 0 }
};
@@ -191,6 +191,59 @@ test_sysinfo (void)
}
}
/*****************************************************************************/
/* Test ^SYSINFOEX responses */
typedef struct {
const gchar *str;
guint expected_srv_status;
guint expected_srv_domain;
guint expected_roam_status;
guint expected_sim_state;
guint expected_sys_mode;
guint expected_sys_submode;
} SysinfoexTest;
static const SysinfoexTest sysinfoex_tests[] = {
{ "^SYSINFOEX:2,4,5,1,,3,WCDMA,41,HSPA+", 2, 4, 5, 1, 3, 41 },
{ "^SYSINFOEX:2,4,5,1,,3,\"WCDMA\",41,\"HSPA+\"", 2, 4, 5, 1, 3, 41 },
{ "^SYSINFOEX: 2,4,5,1,0,3,\"WCDMA\",41,\"HSPA+\"", 2, 4, 5, 1, 3, 41 },
{ NULL, 0, 0, 0, 0, 0, 0 }
};
static void
test_sysinfoex (void)
{
guint i;
for (i = 0; sysinfoex_tests[i].str; i++) {
GError *error = NULL;
guint srv_status = 0;
guint srv_domain = 0;
guint roam_status = 0;
guint sim_state = 0;
guint sys_mode = 0;
guint sys_submode = 0;
g_assert (mm_huawei_parse_sysinfoex_response (sysinfoex_tests[i].str,
&srv_status,
&srv_domain,
&roam_status,
&sim_state,
&sys_mode,
&sys_submode,
&error) == TRUE);
g_assert_no_error (error);
g_assert (srv_status == sysinfoex_tests[i].expected_srv_status);
g_assert (srv_domain == sysinfoex_tests[i].expected_srv_domain);
g_assert (roam_status == sysinfoex_tests[i].expected_roam_status);
g_assert (sim_state == sysinfoex_tests[i].expected_sim_state);
g_assert (sys_mode == sysinfoex_tests[i].expected_sys_mode);
g_assert (sys_submode == sysinfoex_tests[i].expected_sys_submode);
}
}
/*****************************************************************************/
int main (int argc, char **argv)
@@ -202,6 +255,7 @@ int main (int argc, char **argv)
g_test_add_func ("/MM/huawei/ndisstatqry", test_ndisstatqry);
g_test_add_func ("/MM/huawei/sysinfo", test_sysinfo);
g_test_add_func ("/MM/huawei/sysinfoex", test_sysinfoex);
return g_test_run ();
}