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

broadband-modem: normalize also operator code

Browse Source 
The operator code (MCCMNC) may also be given encoded in the current
charset (e.g. UCS2).

Based on a patch from Colin Helliwell <colin.helliwell@ln-systems.com>
This commit is contained in:
Aleksander Morgado
2017-04-02 10:06:13 +02:00
parent f824602bdd
commit fba49d8d00
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/test-modem-helpers.c
+6 -1
View File
@@ -876,13 +876,18 @@ typedef struct {
static const NormalizeOperatorTest normalize_operator_tests[] = {
/* charset unknown */
{ "Verizon", MM_MODEM_CHARSET_UNKNOWN, "Verizon" },
{ "311480", MM_MODEM_CHARSET_UNKNOWN, "311480" },
/* charset configured as IRA (ASCII) */
{ "Verizon", MM_MODEM_CHARSET_IRA, "Verizon" },
{ "311480", MM_MODEM_CHARSET_IRA, "311480" },
/* charset configured as GSM7 */
{ "Verizon", MM_MODEM_CHARSET_GSM, "Verizon" },
{ "311480", MM_MODEM_CHARSET_GSM, "311480" },
/* charset configured as UCS2 */
{ "0056006500720069007A006F006E", MM_MODEM_CHARSET_UCS2, "Verizon" },
{ "003300310031003400380030", MM_MODEM_CHARSET_UCS2, "311480" },
{ "Verizon", MM_MODEM_CHARSET_UCS2, "Verizon" },
{ "311480", MM_MODEM_CHARSET_UCS2, "311480" },
};
static void
@@ -891,7 +896,7 @@ common_test_normalize_operator (const NormalizeOperatorTest *t)
gchar *str;
str = g_strdup (t->input);
mm_3gpp_normalize_operator_name (&str, t->charset);
mm_3gpp_normalize_operator (&str, t->charset);
if (!t->normalized)
g_assert (!str);
else