Merge cros/upstream to cros/master
Contains the following commits:
214bacb intel-firmware-update: implement ModemReboot version 2 (som)
33e715d ms-voice-extensions: new service, including support for NITZ reporting (som)
8dcbbaf build: fix order of source files (Aleksander Morgado)
548190f intel-thermal-rf: implement RFIM cid (som)
6093648 mbim-codegen,struct: allow gboolean members (Aleksander Morgado)
d954f6a mbim-codegen,message: remove redundant check for personal info logging (Aleksander Morgado)
af96ed0 build: version bump to indicate existence of new API (hide personal info) (Aleksander Morgado)
fc21dc8 data,basic-connect: treat username and password as personal info (Aleksander Morgado)
5668aba data,phonebook: treat phonebook entry number and name as personal info (Aleksander Morgado)
a4c14b6 data,sms: treat PDU data and addresses as personal info (Aleksander Morgado)
3ea7d6e data,basic-connect: treat subscriber id (IMSI) as personal info (Aleksander Morgado)
0503138 data,basic-connect: treat device id (IMEI) as personal info (Aleksander Morgado)
f5cdd3a data,basic-connect: minor alignment fix (Aleksander Morgado)
9471eec libmbim-glib,device: if data less than 12 bytes, print it fully (Aleksander Morgado)
d97d2dc libmbim-glib,device: also hide binary data in sent messages (Aleksander Morgado)
6c03cbc libmbim-glib,device: fix leak in building printable string with hidden info (Aleksander Morgado)
bd63508 mbimcli: remove duplicated short option for --verbose-full (Aleksander Morgado)
f4d21e0 mbimcli: disallow running --verbose and --verbose-full together (Aleksander Morgado)
7a040bf build-aux,codegen: print the '###' hidden field contents in a single place (Aleksander Morgado)
99d757e libmbim-glib: allow hiding personal info while logging (som)
43d4022 libmbim-glib,net-port-manager: use unaligned netlink attribute length (Bjørn Mork)
03adbe0 mbimcli,basic-connect: fix key-value parser in --connect (Aleksander Morgado)
BUG=None
TEST=None
Change-Id: I6ecb2dc370ae870660d47ada03decb42480bf4e3
diff --git a/build-aux/mbim-codegen/Message.py b/build-aux/mbim-codegen/Message.py
index 0e24cac..488bd48 100644
--- a/build-aux/mbim-codegen/Message.py
+++ b/build-aux/mbim-codegen/Message.py
@@ -1261,6 +1261,14 @@
inner_template = (' guint32 _${field};\n')
template += (string.Template(inner_template).substitute(translations))
+ for field in fields:
+ if 'personal-info' in field:
+ template += (
+ ' gboolean show_field;\n'
+ '\n'
+ ' show_field = mbim_utils_get_show_personal_info ();\n')
+ break
+
if message_type == 'response':
template += (
'\n'
@@ -1282,6 +1290,11 @@
translations['struct_type'] = field['struct-type'] if 'struct-type' in field else ''
translations['array_size'] = field['array-size'] if 'array-size' in field else ''
+ if 'personal-info' in field:
+ translations['if_show_field'] = 'if (show_field) '
+ else:
+ translations['if_show_field'] = ''
+
inner_template = (
'\n'
' g_string_append_printf (str, "%s ${field_name} = ", line_prefix);\n')
@@ -1302,7 +1315,9 @@
' if (!_mbim_message_read_guint32 (message, offset, &_${field}, &inner_error))\n'
' goto out;\n'
' offset += 4;\n'
- ' g_string_append_printf (str, "\'%" G_GUINT32_FORMAT "\'", _${field});\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%" G_GUINT32_FORMAT "\'", _${field});\n'
+ ' }\n')
elif field['format'] == 'byte-array' or \
field['format'] == 'unsized-byte-array' or \
@@ -1345,10 +1360,12 @@
' offset += 4;\n')
inner_template += (
- ' g_string_append (str, "\'");\n'
- ' for (i = 0; i < tmpsize; i++)\n'
- ' g_string_append_printf (str, "%02x%s", tmp[i], (i == (tmpsize - 1)) ? "" : ":" );\n'
- ' g_string_append (str, "\'");\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append (str, "\'");\n'
+ ' for (i = 0; i < tmpsize; i++)\n'
+ ' g_string_append_printf (str, "%02x%s", tmp[i], (i == (tmpsize - 1)) ? "" : ":" );\n'
+ ' g_string_append (str, "\'");\n'
+ ' }\n')
elif field['format'] == 'uuid':
inner_template += (
@@ -1359,7 +1376,9 @@
' goto out;\n'
' offset += 16;\n'
' tmpstr = mbim_uuid_get_printable (tmp);\n'
- ' g_string_append_printf (str, "\'%s\'", tmpstr);\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%s\'", tmpstr);\n'
+ ' }\n')
elif field['format'] == 'guint16' or \
field['format'] == 'guint32' or \
@@ -1386,35 +1405,43 @@
if 'public-format' in field:
if field['public-format'] == 'gboolean':
inner_template += (
- ' g_string_append_printf (str, "\'%s\'", tmp ? "true" : "false");\n'
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%s\'", tmp ? "true" : "false");\n'
+ ' }\n'
'\n')
else:
translations['public_underscore'] = utils.build_underscore_name_from_camelcase(field['public-format'])
translations['public_underscore_upper'] = utils.build_underscore_name_from_camelcase(field['public-format']).upper()
inner_template += (
+ ' ${if_show_field}{\n'
'#if defined __${public_underscore_upper}_IS_ENUM__\n'
- ' g_string_append_printf (str, "\'%s\'", ${public_underscore}_get_string ((${public})tmp));\n'
+ ' g_string_append_printf (str, "\'%s\'", ${public_underscore}_get_string ((${public})tmp));\n'
'#elif defined __${public_underscore_upper}_IS_FLAGS__\n'
- ' {\n'
' g_autofree gchar *tmpstr = NULL;\n'
'\n'
' tmpstr = ${public_underscore}_build_string_from_mask ((${public})tmp);\n'
' g_string_append_printf (str, "\'%s\'", tmpstr);\n'
- ' }\n'
'#else\n'
'# error neither enum nor flags\n'
'#endif\n'
+ ' }\n'
'\n')
elif field['format'] == 'guint16':
inner_template += (
- ' g_string_append_printf (str, "\'%" G_GUINT16_FORMAT "\'", tmp);\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%" G_GUINT16_FORMAT "\'", tmp);\n'
+ ' }\n')
elif field['format'] == 'guint32':
inner_template += (
- ' g_string_append_printf (str, "\'%" G_GUINT32_FORMAT "\'", tmp);\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%" G_GUINT32_FORMAT "\'", tmp);\n'
+ ' }\n')
elif field['format'] == 'guint64':
inner_template += (
- ' g_string_append_printf (str, "\'%" G_GUINT64_FORMAT "\'", tmp);\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%" G_GUINT64_FORMAT "\'", tmp);\n'
+ ' }\n')
elif field['format'] == 'string':
inner_template += (
@@ -1423,7 +1450,9 @@
' if (!_mbim_message_read_string (message, 0, offset, &tmp, &inner_error))\n'
' goto out;\n'
' offset += 8;\n'
- ' g_string_append_printf (str, "\'%s\'", tmp);\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%s\'", tmp);\n'
+ ' }\n')
elif field['format'] == 'string-array':
inner_template += (
@@ -1434,53 +1463,59 @@
' goto out;\n'
' offset += (8 * _${array_size_field});\n'
'\n'
- ' g_string_append (str, "\'");\n'
- ' for (i = 0; i < _${array_size_field}; i++) {\n'
- ' g_string_append (str, tmp[i]);\n'
- ' if (i < (_${array_size_field} - 1))\n'
- ' g_string_append (str, ", ");\n'
- ' }\n'
- ' g_string_append (str, "\'");\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append (str, "\'");\n'
+ ' for (i = 0; i < _${array_size_field}; i++) {\n'
+ ' g_string_append (str, tmp[i]);\n'
+ ' if (i < (_${array_size_field} - 1))\n'
+ ' g_string_append (str, ", ");\n'
+ ' }\n'
+ ' g_string_append (str, "\'");\n'
+ ' }\n')
elif field['format'] == 'struct':
inner_template += (
' g_autoptr(${struct_type}) tmp = NULL;\n'
- ' g_autofree gchar *new_line_prefix = NULL;\n'
- ' g_autofree gchar *struct_str = NULL;\n'
' guint32 bytes_read = 0;\n'
'\n'
' tmp = _mbim_message_read_${struct_name}_struct (message, offset, &bytes_read, &inner_error);\n'
' if (!tmp)\n'
' goto out;\n'
' offset += bytes_read;\n'
- ' g_string_append (str, "{\\n");\n'
- ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
- ' struct_str = _mbim_message_print_${struct_name}_struct (tmp, new_line_prefix);\n'
- ' g_string_append (str, struct_str);\n'
- ' g_string_append_printf (str, "%s }", line_prefix);\n')
+ ' ${if_show_field}{\n'
+ ' g_autofree gchar *new_line_prefix = NULL;\n'
+ ' g_autofree gchar *struct_str = NULL;\n'
+ '\n'
+ ' g_string_append (str, "{\\n");\n'
+ ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
+ ' struct_str = _mbim_message_print_${struct_name}_struct (tmp, new_line_prefix);\n'
+ ' g_string_append (str, struct_str);\n'
+ ' g_string_append_printf (str, "%s }", line_prefix);\n'
+ ' }\n')
elif field['format'] == 'ms-struct':
inner_template += (
' g_autoptr(${struct_type}) tmp = NULL;\n'
- ' g_autofree gchar *new_line_prefix = NULL;\n'
'\n'
' if (!_mbim_message_read_${struct_name}_ms_struct (message, offset, &tmp, &inner_error))\n'
' goto out;\n'
' offset += 8;\n'
- ' g_string_append (str, "{\\n");\n'
- ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
- ' if (tmp) {\n'
- ' g_autofree gchar *struct_str = NULL;\n'
- ' struct_str = _mbim_message_print_${struct_name}_struct (tmp, new_line_prefix);\n'
- ' g_string_append (str, struct_str);\n'
- ' }\n'
- ' g_string_append_printf (str, "%s }", line_prefix);\n')
+ ' ${if_show_field}{\n'
+ ' g_autofree gchar *new_line_prefix = NULL;\n'
+ '\n'
+ ' g_string_append (str, "{\\n");\n'
+ ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
+ ' if (tmp) {\n'
+ ' g_autofree gchar *struct_str = NULL;\n'
+ ' struct_str = _mbim_message_print_${struct_name}_struct (tmp, new_line_prefix);\n'
+ ' g_string_append (str, struct_str);\n'
+ ' }\n'
+ ' g_string_append_printf (str, "%s }", line_prefix);\n'
+ ' }\n')
elif field['format'] == 'struct-array' or field['format'] == 'ref-struct-array' or field['format'] == 'ms-struct-array':
inner_template += (
- ' g_autoptr(${struct_type}Array) tmp = NULL;\n'
- ' g_autofree gchar *new_line_prefix = NULL;\n'
- ' guint i;\n')
+ ' g_autoptr(${struct_type}Array) tmp = NULL;\n')
if field['format'] == 'ms-struct-array':
inner_template += (
' guint32 tmp_count = 0;\n')
@@ -1504,25 +1539,30 @@
' offset += 8;\n')
inner_template += (
- ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
- ' g_string_append (str, "\'{\\n");\n')
+ ' ${if_show_field}{\n'
+ ' guint i;\n'
+ ' g_autofree gchar *new_line_prefix = NULL;\n'
+ '\n'
+ ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
+ ' g_string_append (str, "\'{\\n");\n')
if field['format'] == 'ms-struct-array':
inner_template += (
- ' for (i = 0; i < tmp_count; i++) {\n')
+ ' for (i = 0; i < tmp_count; i++) {\n')
else:
inner_template += (
- ' for (i = 0; i < _${array_size_field}; i++) {\n')
+ ' for (i = 0; i < _${array_size_field}; i++) {\n')
inner_template += (
- ' g_autofree gchar *struct_str = NULL;\n'
+ ' g_autofree gchar *struct_str = NULL;\n'
'\n'
- ' g_string_append_printf (str, "%s [%u] = {\\n", line_prefix, i);\n'
- ' struct_str = _mbim_message_print_${struct_name}_struct (tmp[i], new_line_prefix);\n'
- ' g_string_append (str, struct_str);\n'
- ' g_string_append_printf (str, "%s },\\n", line_prefix);\n'
- ' }\n'
- ' g_string_append_printf (str, "%s }\'", line_prefix);\n')
+ ' g_string_append_printf (str, "%s [%u] = {\\n", line_prefix, i);\n'
+ ' struct_str = _mbim_message_print_${struct_name}_struct (tmp[i], new_line_prefix);\n'
+ ' g_string_append (str, struct_str);\n'
+ ' g_string_append_printf (str, "%s },\\n", line_prefix);\n'
+ ' }\n'
+ ' g_string_append_printf (str, "%s }\'", line_prefix);\n'
+ ' }\n')
elif field['format'] == 'ipv4' or \
field['format'] == 'ref-ipv4' or \
@@ -1588,32 +1628,34 @@
' offset += 4;\n')
inner_template += (
- ' g_string_append (str, "\'");\n'
- ' if (tmp) {\n'
- ' for (i = 0; i < array_size; i++) {\n'
- ' g_autoptr(GInetAddress) addr = NULL;\n'
- ' g_autofree gchar *tmpstr = NULL;\n'
+ ' ${if_show_field}{\n'
+ ' g_string_append (str, "\'");\n'
+ ' if (tmp) {\n'
+ ' for (i = 0; i < array_size; i++) {\n'
+ ' g_autoptr(GInetAddress) addr = NULL;\n'
+ ' g_autofree gchar *tmpstr = NULL;\n'
'\n')
if field['format'] == 'ipv4' or \
field['format'] == 'ref-ipv4' or \
field['format'] == 'ipv4-array':
inner_template += (
- ' addr = g_inet_address_new_from_bytes ((guint8 *)&(tmp[i].addr), G_SOCKET_FAMILY_IPV4);\n')
+ ' addr = g_inet_address_new_from_bytes ((guint8 *)&(tmp[i].addr), G_SOCKET_FAMILY_IPV4);\n')
elif field['format'] == 'ipv6' or \
field['format'] == 'ref-ipv6' or \
field['format'] == 'ipv6-array':
inner_template += (
- ' addr = g_inet_address_new_from_bytes ((guint8 *)&(tmp[i].addr), G_SOCKET_FAMILY_IPV6);\n')
+ ' addr = g_inet_address_new_from_bytes ((guint8 *)&(tmp[i].addr), G_SOCKET_FAMILY_IPV6);\n')
inner_template += (
- ' tmpstr = g_inet_address_to_string (addr);\n'
- ' g_string_append_printf (str, "%s", tmpstr);\n'
- ' if (i < (array_size - 1))\n'
- ' g_string_append (str, ", ");\n'
+ ' tmpstr = g_inet_address_to_string (addr);\n'
+ ' g_string_append_printf (str, "%s", tmpstr);\n'
+ ' if (i < (array_size - 1))\n'
+ ' g_string_append (str, ", ");\n'
+ ' }\n'
' }\n'
- ' }\n'
- ' g_string_append (str, "\'");\n')
+ ' g_string_append (str, "\'");\n'
+ ' }\n')
elif field['format'] == 'tlv' or \
field['format'] == 'tlv-string' or \
@@ -1621,42 +1663,53 @@
inner_template += (
' g_autoptr(MbimTlv) tmp = NULL;\n'
' guint32 bytes_read = 0;\n'
- ' g_autofree gchar *tlv_str = NULL;\n'
- ' g_autofree gchar *new_line_prefix = NULL;\n'
'\n'
' if (!_mbim_message_read_tlv (message, offset, &tmp, &bytes_read, &inner_error))\n'
' goto out;\n'
' offset += bytes_read;\n'
'\n'
- ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
- ' tlv_str = _mbim_tlv_print (tmp, new_line_prefix);\n'
- ' g_string_append_printf (str, "\'%s\'", tlv_str);\n')
+ ' ${if_show_field}{\n'
+ ' g_autofree gchar *tlv_str = NULL;\n'
+ ' g_autofree gchar *new_line_prefix = NULL;\n'
+ '\n'
+ ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
+ ' tlv_str = _mbim_tlv_print (tmp, new_line_prefix);\n'
+ ' g_string_append_printf (str, "\'%s\'", tlv_str);\n'
+ ' }\n')
elif field['format'] == 'tlv-list':
inner_template += (
' GList *tmp = NULL;\n'
- ' GList *walker = NULL;\n'
' guint32 bytes_read = 0;\n'
- ' g_autofree gchar *new_line_prefix = NULL;\n'
'\n'
' if (!_mbim_message_read_tlv_list (message, offset, &tmp, &bytes_read, &inner_error))\n'
' goto out;\n'
' offset += bytes_read;\n'
'\n'
- ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
- ' g_string_append (str, "\'[ ");\n'
- ' for (walker = tmp; walker; walker = g_list_next (walker)) {\n'
- ' g_autofree gchar *tlv_str = NULL;\n'
+ ' ${if_show_field}{\n'
+ ' g_autofree gchar *new_line_prefix = NULL;\n'
+ ' GList *walker = NULL;\n'
'\n'
- ' tlv_str = _mbim_tlv_print ((MbimTlv *)walker->data, new_line_prefix);\n'
- ' g_string_append_printf (str, "%s,", tlv_str);\n'
+ ' new_line_prefix = g_strdup_printf ("%s ", line_prefix);\n'
+ ' g_string_append (str, "\'[ ");\n'
+ ' for (walker = tmp; walker; walker = g_list_next (walker)) {\n'
+ ' g_autofree gchar *tlv_str = NULL;\n'
+ '\n'
+ ' tlv_str = _mbim_tlv_print ((MbimTlv *)walker->data, new_line_prefix);\n'
+ ' g_string_append_printf (str, "%s,", tlv_str);\n'
+ ' }\n'
+ ' g_string_append_printf (str, "\\n%s ]\'", line_prefix);\n'
' }\n'
- ' g_string_append_printf (str, "\\n%s ]\'", line_prefix);\n'
' g_list_free_full (tmp, (GDestroyNotify)mbim_tlv_unref);\n')
else:
raise ValueError('Field format \'%s\' not printable' % field['format'])
+ if 'personal-info' in field:
+ inner_template += (
+ ' if (!show_field)\n'
+ ' g_string_append (str, "\'###\'");\n')
+
inner_template += (
' }\n'
' g_string_append (str, "\\n");\n')
diff --git a/build-aux/mbim-codegen/Struct.py b/build-aux/mbim-codegen/Struct.py
index 70a96a7..85dd474 100644
--- a/build-aux/mbim-codegen/Struct.py
+++ b/build-aux/mbim-codegen/Struct.py
@@ -338,7 +338,17 @@
' const ${name} *self,\n'
' const gchar *line_prefix)\n'
'{\n'
- ' GString *str;\n'
+ ' GString *str;\n')
+
+ for field in self.contents:
+ if 'personal-info' in field:
+ template += (
+ ' gboolean show_field;\n'
+ '\n'
+ ' show_field = mbim_utils_get_show_personal_info ();\n')
+ break
+
+ template += (
'\n'
' str = g_string_new ("");\n'
'\n')
@@ -350,119 +360,156 @@
translations['public_underscore'] = utils.build_underscore_name_from_camelcase(field['public-format']) if 'public-format' in field else ''
translations['public_underscore_upper'] = utils.build_underscore_name_from_camelcase(field['public-format']).upper() if 'public-format' in field else ''
+ if 'personal-info' in field:
+ translations['if_show_field'] = 'if (show_field) '
+ else:
+ translations['if_show_field'] = ''
+
inner_template = (
' g_string_append_printf (str, "%s ${field_name} = ", line_prefix);\n'
' {\n')
if field['format'] == 'uuid':
inner_template += (
- ' gchar *tmpstr;\n'
+ ' ${if_show_field}{\n'
+ ' g_autofree gchar *tmpstr = NULL;\n'
'\n'
- ' tmpstr = mbim_uuid_get_printable (&(self->${field_name_underscore}));\n'
- ' g_string_append_printf (str, "\'%s\'", tmpstr);\n'
- ' g_free (tmpstr);\n')
+ ' tmpstr = mbim_uuid_get_printable (&(self->${field_name_underscore}));\n'
+ ' g_string_append_printf (str, "\'%s\'", tmpstr);\n'
+ ' }\n')
elif field['format'] in ['byte-array', 'ref-byte-array', 'ref-byte-array-no-offset', 'unsized-byte-array']:
inner_template += (
- ' guint i;\n'
- ' guint array_size;\n'
+ ' ${if_show_field}{\n'
+ ' guint i;\n'
+ ' guint array_size;\n'
'\n')
if field['format'] == 'byte-array':
translations['array_size'] = field['array-size']
inner_template += (
- ' array_size = ${array_size};\n')
+ ' array_size = ${array_size};\n')
elif 'array-size-field' in field:
translations['array_size_field_name_underscore'] = utils.build_underscore_name_from_camelcase(field['array-size-field'])
inner_template += (
- ' array_size = self->${array_size_field_name_underscore};\n')
+ ' array_size = self->${array_size_field_name_underscore};\n')
else:
inner_template += (
- ' array_size = self->${field_name_underscore}_size;\n')
+ ' array_size = self->${field_name_underscore}_size;\n')
inner_template += (
- ' g_string_append (str, "\'");\n'
- ' for (i = 0; i < array_size; i++)\n'
- ' g_string_append_printf (str, "%02x%s", self->${field_name_underscore}[i], (i == (array_size - 1)) ? "" : ":" );\n'
- ' g_string_append (str, "\'");\n')
+ ' g_string_append (str, "\'");\n'
+ ' for (i = 0; i < array_size; i++)\n'
+ ' g_string_append_printf (str, "%02x%s", self->${field_name_underscore}[i], (i == (array_size - 1)) ? "" : ":" );\n'
+ ' g_string_append (str, "\'");\n'
+ ' }\n')
elif field['format'] in ['guint16', 'guint32', 'guint64']:
if 'public-format' in field:
- inner_template += (
- '#if defined __${public_underscore_upper}_IS_ENUM__\n'
- ' g_string_append_printf (str, "\'%s\'", ${public_underscore}_get_string ((${public})self->${field_name_underscore}));\n'
- '#elif defined __${public_underscore_upper}_IS_FLAGS__\n'
- ' {\n'
- ' g_autofree gchar *tmpstr = NULL;\n'
- '\n'
- ' tmpstr = ${public_underscore}_build_string_from_mask ((${public})self->${field_name_underscore});\n'
- ' g_string_append_printf (str, "\'%s\'", tmpstr);\n'
- ' }\n'
- '#else\n'
- '# error neither enum nor flags\n'
- '#endif\n'
- '\n')
+ if field['public-format'] == 'gboolean':
+ inner_template += (
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%s\'", (${public})self->${field_name_underscore} ? "true" : "false");\n'
+ ' }\n'
+ '\n')
+ else:
+ inner_template += (
+ ' ${if_show_field}{\n'
+ '#if defined __${public_underscore_upper}_IS_ENUM__\n'
+ ' g_string_append_printf (str, "\'%s\'", ${public_underscore}_get_string ((${public})self->${field_name_underscore}));\n'
+ '#elif defined __${public_underscore_upper}_IS_FLAGS__\n'
+ ' g_autofree gchar *tmpstr = NULL;\n'
+ '\n'
+ ' tmpstr = ${public_underscore}_build_string_from_mask ((${public})self->${field_name_underscore});\n'
+ ' g_string_append_printf (str, "\'%s\'", tmpstr);\n'
+ '#else\n'
+ '# error neither enum nor flags\n'
+ '#endif\n'
+ ' }\n'
+ '\n')
+
elif field['format'] == 'guint16':
inner_template += (
- ' g_string_append_printf (str, "\'%" G_GUINT16_FORMAT "\'", self->${field_name_underscore});\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%" G_GUINT16_FORMAT "\'", self->${field_name_underscore});\n'
+ ' }\n')
elif field['format'] == 'guint32':
inner_template += (
- ' g_string_append_printf (str, "\'%" G_GUINT32_FORMAT "\'", self->${field_name_underscore});\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%" G_GUINT32_FORMAT "\'", self->${field_name_underscore});\n'
+ ' }\n')
elif field['format'] == 'guint64':
inner_template += (
- ' g_string_append_printf (str, "\'%" G_GUINT64_FORMAT "\'", self->${field_name_underscore});\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%" G_GUINT64_FORMAT "\'", self->${field_name_underscore});\n'
+ ' }\n')
elif field['format'] == 'gint32':
- inner_template += (
- ' g_string_append_printf (str, "\'%" G_GINT32_FORMAT "\'", self->${field_name_underscore});\n')
+ inner_template += (
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%" G_GINT32_FORMAT "\'", self->${field_name_underscore});\n'
+ ' }\n')
elif field['format'] == 'guint32-array':
translations['array_size_field_name_underscore'] = utils.build_underscore_name_from_camelcase(field['array-size-field'])
inner_template += (
- ' guint i;\n'
+ ' ${if_show_field}{\n'
+ ' guint i;\n'
'\n'
- ' g_string_append (str, "\'");\n'
- ' for (i = 0; i < self->${array_size_field_name_underscore}; i++)\n'
- ' g_string_append_printf (str, "%" G_GUINT32_FORMAT "%s", self->${field_name_underscore}[i], (i == (self->${array_size_field_name_underscore} - 1)) ? "" : "," );\n'
- ' g_string_append (str, "\'");\n')
+ ' g_string_append (str, "\'");\n'
+ ' for (i = 0; i < self->${array_size_field_name_underscore}; i++)\n'
+ ' g_string_append_printf (str, "%" G_GUINT32_FORMAT "%s", self->${field_name_underscore}[i], (i == (self->${array_size_field_name_underscore} - 1)) ? "" : "," );\n'
+ ' g_string_append (str, "\'");\n'
+ ' }\n')
elif field['format'] == 'string':
inner_template += (
- ' g_string_append_printf (str, "\'%s\'", self->${field_name_underscore});\n')
+ ' ${if_show_field}{\n'
+ ' g_string_append_printf (str, "\'%s\'", self->${field_name_underscore});\n'
+ ' }\n')
elif field['format'] == 'string-array':
translations['array_size_field_name_underscore'] = utils.build_underscore_name_from_camelcase(field['array-size-field'])
inner_template += (
- ' guint i;\n'
+ ' ${if_show_field}{\n'
+ ' guint i;\n'
'\n'
- ' g_string_append (str, "\'");\n'
- ' for (i = 0; i < self->${array_size_field_name_underscore}; i++)\n'
- ' g_string_append_printf (str, "%s%s", self->${field_name_underscore}[i], (i == (self->${array_size_field_name_underscore} - 1)) ? "" : "," );\n'
- ' g_string_append (str, "\'");\n')
+ ' g_string_append (str, "\'");\n'
+ ' for (i = 0; i < self->${array_size_field_name_underscore}; i++)\n'
+ ' g_string_append_printf (str, "%s%s", self->${field_name_underscore}[i], (i == (self->${array_size_field_name_underscore} - 1)) ? "" : "," );\n'
+ ' g_string_append (str, "\'");\n'
+ ' }\n')
elif field['format'] == 'ipv4' or \
field['format'] == 'ref-ipv4' or \
field['format'] == 'ipv6' or \
field['format'] == 'ref-ipv6':
inner_template += (
- ' g_autoptr(GInetAddress) addr = NULL;\n'
- ' g_autofree gchar *tmpstr = NULL;\n'
+ ' ${if_show_field}{\n'
+ ' g_autoptr(GInetAddress) addr = NULL;\n'
+ ' g_autofree gchar *tmpstr = NULL;\n'
'\n')
if field['format'] == 'ipv4' or \
field['format'] == 'ref-ipv4':
inner_template += (
- ' addr = g_inet_address_new_from_bytes ((guint8 *)&(self->${field_name_underscore}.addr), G_SOCKET_FAMILY_IPV4);\n')
+ ' addr = g_inet_address_new_from_bytes ((guint8 *)&(self->${field_name_underscore}.addr), G_SOCKET_FAMILY_IPV4);\n')
elif field['format'] == 'ipv6' or \
field['format'] == 'ref-ipv6':
inner_template += (
- ' addr = g_inet_address_new_from_bytes ((guint8 *)&(self->${field_name_underscore}.addr), G_SOCKET_FAMILY_IPV6);\n')
+ ' addr = g_inet_address_new_from_bytes ((guint8 *)&(self->${field_name_underscore}.addr), G_SOCKET_FAMILY_IPV6);\n')
inner_template += (
- ' tmpstr = g_inet_address_to_string (addr);\n'
- ' g_string_append_printf (str, "\'%s\'", tmpstr);\n')
+ ' tmpstr = g_inet_address_to_string (addr);\n'
+ ' g_string_append_printf (str, "\'%s\'", tmpstr);\n'
+ ' }\n')
else:
raise ValueError('Cannot handle format \'%s\' in struct' % field['format'])
+ if 'personal-info' in field:
+ inner_template += (
+ ' if (!show_field)\n'
+ ' g_string_append (str, "\'###\'");\n')
+
inner_template += (
' }\n'
' g_string_append (str, "\\n");\n')
diff --git a/data/mbim-service-basic-connect.json b/data/mbim-service-basic-connect.json
index 6a45143..19544c7 100644
--- a/data/mbim-service-basic-connect.json
+++ b/data/mbim-service-basic-connect.json
@@ -21,9 +21,9 @@
{ "name" : "SimClass",
"format" : "guint32",
"public-format" : "MbimSimClass" },
- { "name" : "DataClass",
- "format" : "guint32",
- "public-format" : "MbimDataClass" },
+ { "name" : "DataClass",
+ "format" : "guint32",
+ "public-format" : "MbimDataClass" },
{ "name" : "SmsCaps",
"format" : "guint32",
"public-format" : "MbimSmsCaps" },
@@ -35,9 +35,10 @@
{ "name" : "CustomDataClass",
"format" : "string",
"max-size" : "22" },
- { "name" : "DeviceId",
- "format" : "string",
- "max-size" : "36" },
+ { "name" : "DeviceId",
+ "format" : "string",
+ "max-size" : "36",
+ "personal-info" : "true" },
{ "name" : "FirmwareInfo",
"format" : "string",
"max-size" : "60" },
@@ -55,10 +56,12 @@
"response" : [ { "name" : "ReadyState",
"format" : "guint32",
"public-format" : "MbimSubscriberReadyState" },
- { "name" : "SubscriberId",
- "format" : "string" },
- { "name" : "SimIccId",
- "format" : "string" },
+ { "name" : "SubscriberId",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "SimIccId",
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "ReadyInfo",
"format" : "guint32",
"public-format" : "MbimReadyInfoFlag" },
@@ -66,14 +69,17 @@
"format" : "guint32" },
{ "name" : "TelephoneNumbers",
"format" : "string-array",
- "array-size-field" : "TelephoneNumbersCount" } ],
+ "array-size-field" : "TelephoneNumbersCount",
+ "personal-info" : "true" } ],
"notification" : [ { "name" : "ReadyState",
"format" : "guint32",
"public-format" : "MbimSubscriberReadyState" },
- { "name" : "SubscriberId",
- "format" : "string" },
- { "name" : "SimIccId",
- "format" : "string" },
+ { "name" : "SubscriberId",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "SimIccId",
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "ReadyInfo",
"format" : "guint32",
"public-format" : "MbimReadyInfoFlag" },
@@ -81,7 +87,8 @@
"format" : "guint32" },
{ "name" : "TelephoneNumbers",
"format" : "string-array",
- "array-size-field" : "TelephoneNumbersCount" } ] },
+ "array-size-field" : "TelephoneNumbersCount",
+ "personal-info" : "true"} ] },
// *********************************************************************************
{ "name" : "Radio State",
@@ -388,10 +395,12 @@
"public-format" : "MbimActivationCommand" },
{ "name" : "AccessString",
"format" : "string" },
- { "name" : "UserName",
- "format" : "string" },
- { "name" : "Password",
- "format" : "string" },
+ { "name" : "UserName",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "Password",
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
@@ -459,10 +468,12 @@
"format" : "uuid" },
{ "name" : "AccessString",
"format" : "string" },
- { "name" : "UserName",
- "format" : "string" },
- { "name" : "Password",
- "format" : "string" },
+ { "name" : "UserName",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "Password",
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
@@ -479,10 +490,12 @@
"format" : "uuid" },
{ "name" : "AccessString",
"format" : "string" },
- { "name" : "UserName",
- "format" : "string" },
- { "name" : "Password",
- "format" : "string" },
+ { "name" : "UserName",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "Password",
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
diff --git a/data/mbim-service-intel-firmware-update-v2.json b/data/mbim-service-intel-firmware-update-v2.json
new file mode 100644
index 0000000..1e57c11
--- /dev/null
+++ b/data/mbim-service-intel-firmware-update-v2.json
@@ -0,0 +1,17 @@
+[
+ // *********************************************************************************
+ { "type" : "Service",
+ "name" : "Intel Firmware Update V2",
+ "mbimex-service" : "Intel Firmware Update",
+ "mbimex-version" : "2.0" },
+
+ // *********************************************************************************
+ { "name" : "Modem Reboot",
+ "type" : "Command",
+ "since" : "1.28",
+ "set" : [ { "name" : "BootMode",
+ "format" : "guint32",
+ "public-format" : "MbimIntelBootMode" },
+ { "name" : "Timeout",
+ "format" : "guint32" } ] }
+]
diff --git a/data/mbim-service-intel-thermal-rf.json b/data/mbim-service-intel-thermal-rf.json
new file mode 100644
index 0000000..4299ff0
--- /dev/null
+++ b/data/mbim-service-intel-thermal-rf.json
@@ -0,0 +1,71 @@
+[
+ // *********************************************************************************
+ { "type" : "Service",
+ "name" : "Intel Thermal RF" },
+
+ // ***********************************************************************************
+
+ { "name" : "MbimIntelRfimFrequencyValue",
+ "type" : "Struct",
+ "since" : "1.28",
+ "contents" : [ { "name" : "ServingCellInfo",
+ "format" : "guint32",
+ "public-format" : "MbimIntelServingCellInfo" },
+ { "name" : "CenterFrequency",
+ "format" : "guint64" },
+ { "name" : "Bandwidth",
+ "format" : "guint32" },
+
+ // 0: -140 or less dBm
+ // <97: dBm = -140 + rsrp
+ // 97: -43 or greater dBm
+ // 0xFFFFFFFF: unknown/undetectable
+ { "name" : "RSRP",
+ "format" : "guint32" },
+
+ // 0: -19.5 or less dB
+ // <34: dB = -19.5 + ((float)rsrq/2)
+ // 34: -2.5 or greater dB
+ // 0xFFFFFFFF: unknown/undetectable
+ { "name" : "RSRQ",
+ "format" : "guint32" },
+
+ // 0: -23 or less dB
+ //<127: ((float)sinr/2) - 23
+ // 127: 40 or greater dB
+ // 0xFFFFFFFF: unknown/undetectable
+ { "name" : "SINR",
+ "format" : "guint32" },
+
+ // 0-31: dBm = -113 + (2*rssi)
+ // 99: unknown/undetectable
+ { "name" : "RSSI",
+ "format" : "guint32" },
+ { "name" : "ConnectionStatus",
+ "format" : "guint32",
+ "public-format" : "gboolean" } ] },
+
+ { "name" : "RFIM",
+ "type" : "Command",
+ "service" : "Intel Thermal RF",
+ "since" : "1.28",
+ "set" : [ { "name" : "ActivationState",
+ "format" : "guint32",
+ "public-format" : "gboolean" } ],
+
+ "query" : [],
+
+ "response" : [ { "name" : "RfimFrequencyValuesCount",
+ "format" : "guint32" },
+ { "name" : "RfimFrequencyValues",
+ "format" : "ref-struct-array",
+ "struct-type" : "MbimIntelRfimFrequencyValue",
+ "array-size-field" : "RfimFrequencyValuesCount" } ],
+
+ "notification" : [ { "name" : "RfimFrequencyValuesCount",
+ "format" : "guint32" },
+ { "name" : "RfimFrequencyValues",
+ "format" : "ref-struct-array",
+ "struct-type" : "MbimIntelRfimFrequencyValue",
+ "array-size-field" : "RfimFrequencyValuesCount" } ] }
+]
diff --git a/data/mbim-service-ms-basic-connect-extensions-v3.json b/data/mbim-service-ms-basic-connect-extensions-v3.json
index 71ed7aa..fa83d4e 100644
--- a/data/mbim-service-ms-basic-connect-extensions-v3.json
+++ b/data/mbim-service-ms-basic-connect-extensions-v3.json
@@ -48,7 +48,8 @@
{ "name" : "CustomDataClass",
"format" : "tlv-string" },
{ "name" : "DeviceId",
- "format" : "tlv-string" },
+ "format" : "tlv-string",
+ "personal-info" : "true" },
{ "name" : "FirmwareInfo",
"format" : "tlv-string" },
{ "name" : "HardwareInfo",
@@ -133,9 +134,11 @@
{ "name" : "AccessString",
"format" : "string" },
{ "name" : "UserName",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Password",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
@@ -154,9 +157,11 @@
{ "name" : "AccessString",
"format" : "string" },
{ "name" : "UserName",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Password",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
diff --git a/data/mbim-service-ms-basic-connect-extensions.json b/data/mbim-service-ms-basic-connect-extensions.json
index a220ca9..5b18951 100755
--- a/data/mbim-service-ms-basic-connect-extensions.json
+++ b/data/mbim-service-ms-basic-connect-extensions.json
@@ -47,10 +47,12 @@
"public-format" : "MbimContextSource" },
{ "name" : "AccessString",
"format" : "string" },
- { "name" : "UserName",
- "format" : "string" },
- { "name" : "Password",
- "format" : "string" },
+ { "name" : "UserName",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "Password",
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
@@ -98,10 +100,12 @@
"public-format" : "MbimContextIpType" },
{ "name" : "AccessString",
"format" : "string" },
- { "name" : "UserName",
- "format" : "string" },
- { "name" : "Password",
- "format" : "string" },
+ { "name" : "UserName",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "Password",
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
@@ -116,10 +120,12 @@
"public-format" : "MbimContextIpType" },
{ "name" : "AccessString",
"format" : "string" },
- { "name" : "UserName",
- "format" : "string" },
- { "name" : "Password",
- "format" : "string" },
+ { "name" : "UserName",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "Password",
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
@@ -217,9 +223,10 @@
{ "name" : "CustomDataClass",
"format" : "string",
"max-size" : "22" },
- { "name" : "DeviceId",
- "format" : "string",
- "max-size" : "36" },
+ { "name" : "DeviceId",
+ "format" : "string",
+ "max-size" : "36",
+ "personal-info" : "true" },
{ "name" : "FirmwareInfo",
"format" : "string",
"max-size" : "60" },
@@ -275,9 +282,11 @@
{ "name" : "AccessString",
"format" : "string" },
{ "name" : "UserName",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Password",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
@@ -311,9 +320,11 @@
{ "name" : "AccessString",
"format" : "string" },
{ "name" : "UserName",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Password",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Compression",
"format" : "guint32",
"public-format" : "MbimCompression" },
diff --git a/data/mbim-service-ms-basic-connect-v3.json b/data/mbim-service-ms-basic-connect-v3.json
index 14a7e30..b430d4b 100644
--- a/data/mbim-service-ms-basic-connect-v3.json
+++ b/data/mbim-service-ms-basic-connect-v3.json
@@ -18,9 +18,11 @@
"format" : "guint32",
"public-format" : "MbimSubscriberReadyStatusFlag" },
{ "name" : "SubscriberId",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "SimIccId",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "ReadyInfo",
"format" : "guint32",
"public-format" : "MbimReadyInfoFlag" },
@@ -28,7 +30,8 @@
"format" : "guint32" },
{ "name" : "TelephoneNumbers",
"format" : "string-array",
- "array-size-field" : "TelephoneNumbersCount" } ],
+ "array-size-field" : "TelephoneNumbersCount",
+ "personal-info" : "true" } ],
"notification" : [ { "name" : "ReadyState",
"format" : "guint32",
"public-format" : "MbimSubscriberReadyState" },
@@ -36,9 +39,11 @@
"format" : "guint32",
"public-format" : "MbimSubscriberReadyStatusFlag" },
{ "name" : "SubscriberId",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "SimIccId",
- "format" : "string" },
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "ReadyInfo",
"format" : "guint32",
"public-format" : "MbimReadyInfoFlag" },
@@ -46,7 +51,8 @@
"format" : "guint32" },
{ "name" : "TelephoneNumbers",
"format" : "string-array",
- "array-size-field" : "TelephoneNumbersCount" } ] },
+ "array-size-field" : "TelephoneNumbersCount",
+ "personal-info" : "true"} ] },
// *********************************************************************************
{ "name" : "MbimTai",
@@ -134,9 +140,11 @@
{ "name" : "AccessString",
"format" : "tlv-string" },
{ "name" : "UserName",
- "format" : "tlv-string" },
+ "format" : "tlv-string",
+ "personal-info" : "true" },
{ "name" : "Password",
- "format" : "tlv-string" },
+ "format" : "tlv-string",
+ "personal-info" : "true" },
{ "name" : "UnnamedIes",
"format" : "tlv-list" } ],
"query" : [ { "name" : "SessionId",
diff --git a/data/mbim-service-ms-voice-extensions.json b/data/mbim-service-ms-voice-extensions.json
new file mode 100644
index 0000000..b38e63c
--- /dev/null
+++ b/data/mbim-service-ms-voice-extensions.json
@@ -0,0 +1,49 @@
+[
+ // ************************************************************************
+ { "type" : "Service",
+ "name" : "MS Voice Extensions" },
+
+ // ************************************************************************
+ { "name" : "NITZ",
+ "type" : "Command",
+ "since" : "1.28",
+ "query" : [ ],
+ "response" : [ { "name" : "Year",
+ "format" : "guint32" },
+ { "name" : "Month",
+ "format" : "guint32" },
+ { "name" : "Day",
+ "format" : "guint32" },
+ { "name" : "Hour",
+ "format" : "guint32" },
+ { "name" : "Minute",
+ "format" : "guint32" },
+ { "name" : "Second",
+ "format" : "guint32" },
+ { "name" : "TimeZoneOffsetMinutes",
+ "format" : "guint32" },
+ { "name" : "DaylightSavingTimeOffsetMinutes",
+ "format" : "guint32" },
+ { "name" : "DataClass",
+ "format" : "guint32",
+ "public-format" : "MbimDataClass" } ],
+ "notification" : [ { "name" : "Year",
+ "format" : "guint32" },
+ { "name" : "Month",
+ "format" : "guint32" },
+ { "name" : "Day",
+ "format" : "guint32" },
+ { "name" : "Hour",
+ "format" : "guint32" },
+ { "name" : "Minute",
+ "format" : "guint32" },
+ { "name" : "Second",
+ "format" : "guint32" },
+ { "name" : "TimeZoneOffsetMinutes",
+ "format" : "guint32" },
+ { "name" : "DaylightSavingTimeOffsetMinutes",
+ "format" : "guint32" },
+ { "name" : "DataClass",
+ "format" : "guint32",
+ "public-format" : "MbimDataClass" } ] }
+]
diff --git a/data/mbim-service-phonebook.json b/data/mbim-service-phonebook.json
index 170b0ee..e7ecfb8 100644
--- a/data/mbim-service-phonebook.json
+++ b/data/mbim-service-phonebook.json
@@ -38,10 +38,12 @@
"since" : "1.4",
"contents" : [ { "name" : "EntryIndex",
"format" : "guint32" },
- { "name" : "Number",
- "format" : "string" },
- { "name" : "Name",
- "format" : "string" } ] },
+ { "name" : "Number",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "Name",
+ "format" : "string",
+ "personal-info" : "true" } ] },
{ "name" : "Read",
"type" : "Command",
@@ -79,10 +81,12 @@
"public-format" : "MbimPhonebookWriteFlag" },
{ "name" : "SaveIndex",
"format" : "guint32" },
- { "name" : "Number",
- "format" : "string" },
- { "name" : "Name",
- "format" : "string" } ],
+ { "name" : "Number",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "Name",
+ "format" : "string",
+ "personal-info" : "true" } ],
"response" : [] }
]
diff --git a/data/mbim-service-sms.json b/data/mbim-service-sms.json
index e6c3211..f3ac1d0 100644
--- a/data/mbim-service-sms.json
+++ b/data/mbim-service-sms.json
@@ -36,8 +36,9 @@
{ "name" : "MessageStatus",
"format" : "guint32",
"public-format" : "MbimSmsStatus" },
- { "name" : "PduData",
- "format" : "ref-byte-array" } ] },
+ { "name" : "PduData",
+ "format" : "ref-byte-array",
+ "personal-info" : "true" } ] },
{ "name" : "MbimSmsCdmaReadRecord",
"type" : "Struct",
@@ -47,8 +48,9 @@
{ "name" : "MessageStatus",
"format" : "guint32",
"public-format" : "MbimSmsStatus" },
- { "name" : "Address",
- "format" : "string" },
+ { "name" : "Address",
+ "format" : "string",
+ "personal-info" : "true" },
{ "name" : "Timestamp",
"format" : "string" },
{ "name" : "Encoding",
@@ -57,8 +59,9 @@
{ "name" : "Language",
"format" : "guint32",
"public-format" : "MbimSmsCdmaLang" },
- { "name" : "EncodedMessage",
- "format" : "ref-byte-array" },
+ { "name" : "EncodedMessage",
+ "format" : "ref-byte-array",
+ "personal-info" : "true" },
{ "name" : "EncodedMessageSizeInCharacters",
"format" : "guint32" } ] },
@@ -116,8 +119,9 @@
{ "name" : "MbimSmsPduSendRecord",
"type" : "Struct",
"since" : "1.4",
- "contents" : [ { "name" : "PduData",
- "format" : "ref-byte-array" } ] },
+ "contents" : [ { "name" : "PduData",
+ "format" : "ref-byte-array",
+ "personal-info" : "true" } ] },
{ "name" : "MbimSmsCdmaSendRecord",
"type" : "Struct",
@@ -128,10 +132,12 @@
{ "name" : "Language",
"format" : "guint32",
"public-format" : "MbimSmsCdmaLang" },
- { "name" : "Address",
- "format" : "string" },
- { "name" : "EncodedMessage",
- "format" : "ref-byte-array" },
+ { "name" : "Address",
+ "format" : "string",
+ "personal-info" : "true" },
+ { "name" : "EncodedMessage",
+ "format" : "ref-byte-array",
+ "personal-info" : "true" },
{ "name" : "EncodedMessageSizeInCharacters",
"format" : "guint32" } ] },
diff --git a/docs/reference/libmbim-glib/libmbim-glib-common.sections b/docs/reference/libmbim-glib/libmbim-glib-common.sections
old mode 100755
new mode 100644
index ef30df7..4f90850
--- a/docs/reference/libmbim-glib/libmbim-glib-common.sections
+++ b/docs/reference/libmbim-glib/libmbim-glib-common.sections
@@ -31,6 +31,8 @@
MBIM_UUID_MS_SAR
MBIM_UUID_MS_UICC_LOW_LEVEL_ACCESS
MBIM_UUID_QUECTEL
+MBIM_UUID_INTEL_THERMAL_RF
+MBIM_UUID_MS_VOICE_EXTENSIONS
<SUBSECTION Methods>
mbim_service_get_string
mbim_service_lookup_name
@@ -71,6 +73,8 @@
MbimCidMsSar
MbimCidMsUiccLowLevelAccess
MbimCidQuectel
+MbimCidIntelThermalRf
+MbimCidMsVoiceExtensions
<SUBSECTION Methods>
mbim_cid_can_set
mbim_cid_can_query
@@ -94,6 +98,8 @@
mbim_cid_ms_sar_get_string
mbim_cid_ms_uicc_low_level_access_get_string
mbim_cid_quectel_get_string
+mbim_cid_intel_thermal_rf_get_string
+mbim_cid_ms_voice_extensions_get_string
<SUBSECTION Private>
mbim_cid_atds_build_string_from_mask
mbim_cid_basic_connect_build_string_from_mask
@@ -113,6 +119,8 @@
mbim_cid_ms_sar_build_string_from_mask
mbim_cid_ms_uicc_low_level_access_build_string_from_mask
mbim_cid_quectel_build_string_from_mask
+mbim_cid_intel_thermal_rf_build_string_from_mask
+mbim_cid_ms_voice_extensions_build_string_from_mask
<SUBSECTION Standard>
MBIM_TYPE_CID_ATDS
MBIM_TYPE_CID_AUTH
@@ -132,6 +140,8 @@
MBIM_TYPE_CID_MS_SAR
MBIM_TYPE_CID_MS_UICC_LOW_LEVEL_ACCESS
MBIM_TYPE_CID_QUECTEL
+MBIM_TYPE_CID_INTEL_THERMAL_RF
+MBIM_TYPE_CID_MS_VOICE_EXTENSIONS
mbim_cid_atds_get_type
mbim_cid_auth_get_type
mbim_cid_basic_connect_get_type
@@ -150,6 +160,8 @@
mbim_cid_ms_uicc_low_level_access_get_type
mbim_cid_ms_sar_get_type
mbim_cid_quectel_get_type
+mbim_cid_intel_thermal_rf_get_type
+mbim_cid_ms_voice_extensions_get_type
</SECTION>
<SECTION>
@@ -394,6 +406,8 @@
MbimWakeType
MbimQuectelRadioSwitchState
MbimAccessMediaType
+MbimIntelServingCellInfo
+MbimIntelBootMode
<SUBSECTION Methods>
mbim_device_type_get_string
mbim_cellular_class_build_string_from_mask
@@ -483,6 +497,8 @@
mbim_wake_type_get_string
mbim_quectel_radio_switch_state_get_string
mbim_access_media_type_get_string
+mbim_intel_serving_cell_info_get_string
+mbim_intel_boot_mode_get_string
<SUBSECTION Private>
mbim_device_type_build_string_from_mask
mbim_cellular_class_get_string
@@ -574,6 +590,8 @@
mbim_wake_type_build_string_from_mask
mbim_quectel_radio_switch_state_build_string_from_mask
mbim_access_media_type_build_string_from_mask
+mbim_intel_serving_cell_info_build_string_from_mask
+mbim_intel_boot_mode_build_string_from_mask
<SUBSECTION Standard>
MBIM_TYPE_ACTIVATION_COMMAND
MBIM_TYPE_ACTIVATION_STATE
@@ -668,6 +686,8 @@
MBIM_TYPE_WAKE_TYPE
MBIM_TYPE_QUECTEL_RADIO_SWITCH_STATE
MBIM_TYPE_ACCESS_MEDIA_TYPE
+MBIM_TYPE_INTEL_SERVING_CELL_INFO
+MBIM_TYPE_INTEL_BOOT_MODE
mbim_activation_command_get_type
mbim_activation_state_get_type
mbim_auth_protocol_get_type
@@ -761,6 +781,8 @@
mbim_wake_type_get_type
mbim_quectel_radio_switch_state_get_type
mbim_access_media_type_get_type
+mbim_intel_serving_cell_info_get_type
+mbim_intel_boot_mode_get_type
</SECTION>
<SECTION>
@@ -796,6 +818,8 @@
<FILE>mbim-utils</FILE>
mbim_utils_get_traces_enabled
mbim_utils_set_traces_enabled
+mbim_utils_set_show_personal_info
+mbim_utils_get_show_personal_info
</SECTION>
<SECTION>
diff --git a/docs/reference/libmbim-glib/libmbim-glib-docs.xml b/docs/reference/libmbim-glib/libmbim-glib-docs.xml
index 2e7a58b..8b11b72 100644
--- a/docs/reference/libmbim-glib/libmbim-glib-docs.xml
+++ b/docs/reference/libmbim-glib/libmbim-glib-docs.xml
@@ -84,6 +84,7 @@
<xi:include href="xml/mbim-ms-firmware-id.xml"/>
<xi:include href="xml/mbim-ms-host-shutdown.xml"/>
<xi:include href="xml/mbim-ms-sar.xml"/>
+ <xi:include href="xml/mbim-ms-voice-extensions.xml"/>
</chapter>
<chapter>
@@ -100,6 +101,8 @@
<chapter>
<title>Intel-defined Services</title>
<xi:include href="xml/mbim-intel-firmware-update.xml"/>
+ <xi:include href="xml/mbim-intel-firmware-update-v2.xml"/>
+ <xi:include href="xml/mbim-intel-thermal-rf.xml"/>
</chapter>
<chapter>
diff --git a/meson.build b/meson.build
index 5619d01..03e32b5 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@
project(
'libmbim', 'c',
- version: '1.27.5',
+ version: '1.27.6',
license: ['GPL-2.0-or-later', 'LGPL-2.1-or-later'],
default_options: [
'buildtype=debugoptimized',
diff --git a/src/libmbim-glib/generated/meson.build b/src/libmbim-glib/generated/meson.build
index c635a17..2ec85ea 100644
--- a/src/libmbim-glib/generated/meson.build
+++ b/src/libmbim-glib/generated/meson.build
@@ -92,12 +92,14 @@
['auth'],
['basic-connect', 'ms-basic-connect-v2', 'ms-basic-connect-v3'],
['dss'],
- ['intel-firmware-update'],
+ ['intel-firmware-update', 'intel-firmware-update-v2'],
+ ['intel-thermal-rf'],
['ms-basic-connect-extensions', 'ms-basic-connect-extensions-v2', 'ms-basic-connect-extensions-v3'],
['ms-uicc-low-level-access'],
['ms-firmware-id'],
['ms-host-shutdown'],
['ms-sar'],
+ ['ms-voice-extensions'],
['phonebook'],
['proxy-control'],
['qdu'],
diff --git a/src/libmbim-glib/libmbim-glib.h b/src/libmbim-glib/libmbim-glib.h
index b6214e3..ff2e468 100644
--- a/src/libmbim-glib/libmbim-glib.h
+++ b/src/libmbim-glib/libmbim-glib.h
@@ -43,6 +43,8 @@
#include "mbim-ms-basic-connect-extensions.h"
#include "mbim-ms-uicc-low-level-access.h"
#include "mbim-quectel.h"
+#include "mbim-intel-thermal-rf.h"
+#include "mbim-ms-voice-extensions.h"
/* backwards compatibility */
#include "mbim-compat.h"
diff --git a/src/libmbim-glib/mbim-cid.c b/src/libmbim-glib/mbim-cid.c
index a0a156e..ae77e52 100644
--- a/src/libmbim-glib/mbim-cid.c
+++ b/src/libmbim-glib/mbim-cid.c
@@ -195,6 +195,35 @@
{ NO_SET, QUERY, NO_NOTIFY }, /* MBIM_CID_QUECTEL_RADIO_STATE */
};
+/* Note: index of the array is CID-1 */
+#define MBIM_CID_INTEL_THERMAL_RF_LAST MBIM_CID_INTEL_THERMAL_RF_RFIM
+static const CidConfig cid_intel_thermal_rf_config [MBIM_CID_INTEL_THERMAL_RF_LAST] = {
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { SET, QUERY, NOTIFY }, /* MBIM_CID_INTEL_THERMAL_RF_RFIM */
+};
+
+/* Note: index of the array is CID-1 */
+#define MBIM_CID_MS_VOICE_EXTENSIONS_LAST MBIM_CID_MS_VOICE_EXTENSIONS_NITZ
+static const CidConfig cid_ms_voice_extensions_config [MBIM_CID_MS_VOICE_EXTENSIONS_LAST] = {
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, NO_QUERY, NO_NOTIFY }, /* Unused */
+ { NO_SET, QUERY, NOTIFY }, /* MBIM_CID_MS_VOICE_EXTENSIONS_NITZ */
+};
+
gboolean
mbim_cid_can_set (MbimService service,
guint cid)
@@ -242,6 +271,10 @@
return cid_ms_uicc_low_level_access_config[cid - 1].set;
case MBIM_SERVICE_QUECTEL:
return cid_quectel_config[cid - 1].set;
+ case MBIM_SERVICE_INTEL_THERMAL_RF:
+ return cid_intel_thermal_rf_config[cid - 1].set;
+ case MBIM_SERVICE_MS_VOICE_EXTENSIONS:
+ return cid_ms_voice_extensions_config[cid - 1].set;
case MBIM_SERVICE_INVALID:
case MBIM_SERVICE_LAST:
default:
@@ -297,6 +330,10 @@
return cid_ms_uicc_low_level_access_config[cid - 1].query;
case MBIM_SERVICE_QUECTEL:
return cid_quectel_config[cid - 1].query;
+ case MBIM_SERVICE_INTEL_THERMAL_RF:
+ return cid_intel_thermal_rf_config[cid - 1].query;
+ case MBIM_SERVICE_MS_VOICE_EXTENSIONS:
+ return cid_ms_voice_extensions_config[cid - 1].query;
case MBIM_SERVICE_INVALID:
case MBIM_SERVICE_LAST:
default:
@@ -352,6 +389,10 @@
return cid_ms_uicc_low_level_access_config[cid - 1].notify;
case MBIM_SERVICE_QUECTEL:
return cid_quectel_config[cid - 1].notify;
+ case MBIM_SERVICE_INTEL_THERMAL_RF:
+ return cid_intel_thermal_rf_config[cid - 1].notify;
+ case MBIM_SERVICE_MS_VOICE_EXTENSIONS:
+ return cid_ms_voice_extensions_config[cid - 1].notify;
case MBIM_SERVICE_INVALID:
case MBIM_SERVICE_LAST:
default:
@@ -408,6 +449,10 @@
return mbim_cid_ms_uicc_low_level_access_get_string (cid);
case MBIM_SERVICE_QUECTEL:
return mbim_cid_quectel_get_string (cid);
+ case MBIM_SERVICE_INTEL_THERMAL_RF:
+ return mbim_cid_intel_thermal_rf_get_string (cid);
+ case MBIM_SERVICE_MS_VOICE_EXTENSIONS:
+ return mbim_cid_ms_voice_extensions_get_string (cid);
case MBIM_SERVICE_LAST:
default:
g_assert_not_reached ();
diff --git a/src/libmbim-glib/mbim-cid.h b/src/libmbim-glib/mbim-cid.h
index 6322e96..a749f8b 100644
--- a/src/libmbim-glib/mbim-cid.h
+++ b/src/libmbim-glib/mbim-cid.h
@@ -407,6 +407,34 @@
} MbimCidQuectel;
/**
+ * MbimCidIntelThermalRf:
+ * @MBIM_CID_INTEL_THERMAL_RF_UNKNOWN: Unknown command.
+ * @MBIM_CID_INTEL_THERMAL_RF_RFIM: RFIM frequency command.
+ *
+ * MBIM commands in the %MBIM_SERVICE_INTEL_THERMAL_RF service.
+ *
+ * Since: 1.28
+ */
+typedef enum { /*< since=1.28 >*/
+ MBIM_CID_INTEL_THERMAL_RF_UNKNOWN = 0,
+ MBIM_CID_INTEL_THERMAL_RF_RFIM = 9,
+} MbimCidIntelThermalRf;
+
+/**
+ * MbimCidMsVoiceExtensions:
+ * @MBIM_CID_MS_VOICE_EXTENSIONS_UNKNOWN: Unknown command.
+ * @MBIM_CID_MS_VOICE_EXTENSIONS_NITZ: Network Identity and Time Zone information command.
+ *
+ * MBIM commands in the %MBIM_SERVICE_MS_VOICE_EXTENSIONS service.
+ *
+ * Since: 1.28
+ */
+typedef enum { /*< since=1.28 >*/
+ MBIM_CID_MS_VOICE_EXTENSIONS_UNKNOWN = 0,
+ MBIM_CID_MS_VOICE_EXTENSIONS_NITZ = 10,
+} MbimCidMsVoiceExtensions;
+
+/**
* mbim_cid_can_set:
* @service: a #MbimService.
* @cid: a command ID.
diff --git a/src/libmbim-glib/mbim-device.c b/src/libmbim-glib/mbim-device.c
index 6ba58ea..484a63c 100644
--- a/src/libmbim-glib/mbim-device.c
+++ b/src/libmbim-glib/mbim-device.c
@@ -42,6 +42,10 @@
#include "mbim-basic-connect.h"
#include "mbim-ms-basic-connect-extensions.h"
+/* maximum number of printed data bytes when personal info
+ * should be hidden */
+#define MAX_PRINTED_BYTES 12
+
static void async_initable_iface_init (GAsyncInitableIface *iface);
G_DEFINE_TYPE_EXTENDED (MbimDevice, mbim_device, G_TYPE_OBJECT, 0,
@@ -874,9 +878,17 @@
if (mbim_utils_get_traces_enabled ()) {
g_autofree gchar *printable = NULL;
- printable = mbim_common_str_hex (((GByteArray *)message)->data,
- ((GByteArray *)message)->len,
- ':');
+ if (mbim_utils_get_show_personal_info () || (((GByteArray *)message)->len < MAX_PRINTED_BYTES)) {
+ printable = mbim_common_str_hex (((GByteArray *)message)->data,
+ ((GByteArray *)message)->len,
+ ':');
+ } else {
+ g_autofree gchar *tmp = NULL;
+
+ tmp = mbim_common_str_hex (((GByteArray *)message)->data, MAX_PRINTED_BYTES, ':');
+ printable = g_strdup_printf ("%s...", tmp);
+ }
+
g_debug ("[%s] Received message...%s\n"
">>>>>> RAW:\n"
">>>>>> length = %u\n"
@@ -2350,7 +2362,15 @@
g_autofree gchar *hex = NULL;
g_autofree gchar *printable = NULL;
- hex = mbim_common_str_hex (raw_message, raw_message_len, ':');
+ if (mbim_utils_get_show_personal_info () || (raw_message_len < MAX_PRINTED_BYTES)) {
+ hex = mbim_common_str_hex (raw_message, raw_message_len, ':');
+ } else {
+ g_autofree gchar *tmp = NULL;
+
+ tmp = mbim_common_str_hex (raw_message, MAX_PRINTED_BYTES, ':');
+ hex = g_strdup_printf ("%s...", tmp);
+ }
+
g_debug ("[%s] Sent message...\n"
"<<<<<< RAW:\n"
"<<<<<< length = %u\n"
diff --git a/src/libmbim-glib/mbim-enums.h b/src/libmbim-glib/mbim-enums.h
index 234b22e..44c1257 100644
--- a/src/libmbim-glib/mbim-enums.h
+++ b/src/libmbim-glib/mbim-enums.h
@@ -1835,6 +1835,54 @@
MBIM_QUECTEL_RADIO_SWITCH_STATE_FCC_LOCKED = 4,
} MbimQuectelRadioSwitchState;
+/*****************************************************************************/
+/* 'Serving Cell Information' */
+
+/**
+ * MbimIntelServingCellInfo:
+ * @MBIM_INTEL_SERVING_CELL_INFO_PCELL: Primary cell.
+ * @MBIM_INTEL_SERVING_CELL_INFO_SCELL: Secondary cell.
+ * @MBIM_INTEL_SERVING_CELL_INFO_PSCELL: Primary cell in SCS.
+ * @MBIM_INTEL_SERVING_CELL_INFO_SSCELL: Secondary cell in SCS.
+ * @MBIM_INTEL_SERVING_CELL_INFO_RADIO_OFF: Radio state is off.
+ *
+ * Serving cell information.
+ *
+ * Since: 1.28
+ */
+typedef enum { /*< since=1.28 >*/
+ MBIM_INTEL_SERVING_CELL_INFO_PCELL = 0,
+ MBIM_INTEL_SERVING_CELL_INFO_SCELL = 1,
+ MBIM_INTEL_SERVING_CELL_INFO_PSCELL = 2,
+ MBIM_INTEL_SERVING_CELL_INFO_SSCELL = 3,
+ MBIM_INTEL_SERVING_CELL_INFO_RADIO_OFF = 0xFFFFFFFF,
+} MbimIntelServingCellInfo;
+
+/*****************************************************************************/
+/* 'Mbim Intel Boot Mode enums */
+
+/**
+ * MbimIntelBootMode:
+ * @MBIM_INTEL_BOOT_MODE_NORMAL_MODE: Normal boot mode.
+ * @MBIM_INTEL_BOOT_MODE_DOWNLOAD_MODE: Download boot mode.
+ * @MBIM_INTEL_BOOT_MODE_POWER_OFF_DEVICE: Power off device.
+ * @MBIM_INTEL_BOOT_MODE_NON_RESETABLE_REGISTER: Configure non-resetable register without reboot or power off.
+ * @MBIM_INTEL_BOOT_MODE_WITHOUT_REBOOT_POWER_OFF: Configure without reboot power-off.
+ * @MBIM_INTEL_BOOT_MODE_FAST_DOWNLOAD_MODE: Fast boot in download mode.
+ *
+ * Modem intel boot mode.
+ *
+ * Since: 1.28
+ */
+typedef enum { /*< since=1.28 >*/
+ MBIM_INTEL_BOOT_MODE_NORMAL_MODE = 0,
+ MBIM_INTEL_BOOT_MODE_DOWNLOAD_MODE = 1,
+ MBIM_INTEL_BOOT_MODE_POWER_OFF_DEVICE = 2,
+ MBIM_INTEL_BOOT_MODE_NON_RESETABLE_REGISTER = 3,
+ MBIM_INTEL_BOOT_MODE_WITHOUT_REBOOT_POWER_OFF = 4,
+ MBIM_INTEL_BOOT_MODE_FAST_DOWNLOAD_MODE = 5,
+} MbimIntelBootMode;
+
G_END_DECLS
#endif /* _LIBMBIM_GLIB_MBIM_ENUMS_H_ */
diff --git a/src/libmbim-glib/mbim-message.c b/src/libmbim-glib/mbim-message.c
index 3e6e731..9274d35 100644
--- a/src/libmbim-glib/mbim-message.c
+++ b/src/libmbim-glib/mbim-message.c
@@ -36,6 +36,8 @@
#include "mbim-ms-basic-connect-extensions.h"
#include "mbim-ms-uicc-low-level-access.h"
#include "mbim-quectel.h"
+#include "mbim-intel-thermal-rf.h"
+#include "mbim-ms-voice-extensions.h"
/*****************************************************************************/
@@ -1921,7 +1923,15 @@
fields_printable = __mbim_message_atds_get_printable_fields (self, line_prefix, &inner_error);
break;
case MBIM_SERVICE_INTEL_FIRMWARE_UPDATE:
- fields_printable = __mbim_message_intel_firmware_update_get_printable_fields (self, line_prefix, &inner_error);
+ if (mbimex_version_major < 2)
+ fields_printable = __mbim_message_intel_firmware_update_get_printable_fields (self, line_prefix, &inner_error);
+ else if (mbimex_version_major >= 2) {
+ fields_printable = __mbim_message_intel_firmware_update_v2_get_printable_fields (self, line_prefix, &inner_error);
+ if (g_error_matches (inner_error, MBIM_CORE_ERROR, MBIM_CORE_ERROR_UNSUPPORTED)) {
+ g_clear_error (&inner_error);
+ fields_printable = __mbim_message_intel_firmware_update_get_printable_fields (self, line_prefix, &inner_error);
+ }
+ }
break;
case MBIM_SERVICE_QDU:
fields_printable = __mbim_message_qdu_get_printable_fields (self, line_prefix, &inner_error);
@@ -1957,6 +1967,12 @@
case MBIM_SERVICE_QUECTEL:
fields_printable = __mbim_message_quectel_get_printable_fields (self, line_prefix, &inner_error);
break;
+ case MBIM_SERVICE_INTEL_THERMAL_RF:
+ fields_printable = __mbim_message_intel_thermal_rf_get_printable_fields (self, line_prefix, &inner_error);
+ break;
+ case MBIM_SERVICE_MS_VOICE_EXTENSIONS:
+ fields_printable = __mbim_message_ms_voice_extensions_get_printable_fields (self, line_prefix, &inner_error);
+ break;
case MBIM_SERVICE_INVALID:
case MBIM_SERVICE_LAST:
g_assert_not_reached ();
diff --git a/src/libmbim-glib/mbim-net-port-manager.c b/src/libmbim-glib/mbim-net-port-manager.c
index 4436c2e..032ed3f 100644
--- a/src/libmbim-glib/mbim-net-port-manager.c
+++ b/src/libmbim-glib/mbim-net-port-manager.c
@@ -100,7 +100,7 @@
memset ((char *) msg->data + old_len, 0, msg->len - old_len);
new_attr.rta_type = type;
- new_attr.rta_len = attr_len;
+ new_attr.rta_len = RTA_LENGTH (len);
next_attr_abs_pos = (char *) msg->data + next_attr_rel_pos;
memcpy (next_attr_abs_pos, &new_attr, sizeof (struct rtattr));
diff --git a/src/libmbim-glib/mbim-utils.c b/src/libmbim-glib/mbim-utils.c
index 1e78a51..8e8c939 100644
--- a/src/libmbim-glib/mbim-utils.c
+++ b/src/libmbim-glib/mbim-utils.c
@@ -18,6 +18,7 @@
*/
static volatile gint __traces_enabled = FALSE;
+static volatile gint __hide_personal_info = FALSE;
gboolean
mbim_utils_get_traces_enabled (void)
@@ -30,3 +31,15 @@
{
g_atomic_int_set (&__traces_enabled, enabled);
}
+
+void
+mbim_utils_set_show_personal_info (gboolean hide_personal_info)
+{
+ g_atomic_int_set (&__hide_personal_info, hide_personal_info);
+}
+
+gboolean
+mbim_utils_get_show_personal_info (void)
+{
+ return (gboolean) g_atomic_int_get (&__hide_personal_info);
+}
diff --git a/src/libmbim-glib/mbim-utils.h b/src/libmbim-glib/mbim-utils.h
index 4aa5994..3b5f4e8 100644
--- a/src/libmbim-glib/mbim-utils.h
+++ b/src/libmbim-glib/mbim-utils.h
@@ -40,6 +40,27 @@
*/
void mbim_utils_set_traces_enabled (gboolean enabled);
+/**
+ * mbim_utils_set_show_personal_info:
+ * @show_personal_info: %TRUE to show personal info in traces, %FALSE otherwise.
+ *
+ * Sets whether personal info is printed when traces are enabled.
+ *
+ * Since: 1.28
+ */
+void mbim_utils_set_show_personal_info (gboolean show_personal_info);
+
+/**
+ * mbim_utils_get_show_personal_info:
+ *
+ * Checks whether personal info should be hidden when traces are enabled.
+ *
+ * Returns: %TRUE to show personal info in trace, %FALSE otherwise.
+ *
+ * Since: 1.28
+ */
+gboolean mbim_utils_get_show_personal_info (void);
+
G_END_DECLS
#endif /* _LIBMBIM_GLIB_MBIM_UTILS_H_ */
diff --git a/src/libmbim-glib/mbim-uuid.c b/src/libmbim-glib/mbim-uuid.c
index ac2a258..cda7258 100644
--- a/src/libmbim-glib/mbim-uuid.c
+++ b/src/libmbim-glib/mbim-uuid.c
@@ -240,6 +240,22 @@
.e = { 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x11 }
};
+static const MbimUuid uuid_intel_thermal_rf = {
+ .a = { 0xfd, 0xc2, 0x2a, 0xf2 },
+ .b = { 0xf4, 0x41 },
+ .c = { 0x4d, 0x46 },
+ .d = { 0xaf, 0x8d },
+ .e = { 0x25, 0x9f, 0xcd, 0xde, 0x46, 0x35 }
+};
+
+static const MbimUuid uuid_ms_voice_extensions = {
+ .a = { 0x8d, 0x8b, 0x9e, 0xba },
+ .b = { 0x37, 0xbe },
+ .c = { 0x44, 0x9b },
+ .d = { 0x8f, 0x1e },
+ .e = { 0x61, 0xcb, 0x03, 0x4a, 0x70, 0x2e }
+};
+
static GList *mbim_custom_service_list = NULL;
typedef struct {
@@ -371,6 +387,10 @@
return &uuid_ms_uicc_low_level_access;
case MBIM_SERVICE_QUECTEL:
return &uuid_quectel;
+ case MBIM_SERVICE_INTEL_THERMAL_RF:
+ return &uuid_intel_thermal_rf;
+ case MBIM_SERVICE_MS_VOICE_EXTENSIONS:
+ return &uuid_ms_voice_extensions;
case MBIM_SERVICE_LAST:
g_assert_not_reached ();
default:
@@ -441,6 +461,12 @@
if (mbim_uuid_cmp (uuid, &uuid_quectel))
return MBIM_SERVICE_QUECTEL;
+ if (mbim_uuid_cmp (uuid, &uuid_intel_thermal_rf))
+ return MBIM_SERVICE_INTEL_THERMAL_RF;
+
+ if (mbim_uuid_cmp (uuid, &uuid_ms_voice_extensions))
+ return MBIM_SERVICE_MS_VOICE_EXTENSIONS;
+
for (l = mbim_custom_service_list; l != NULL; l = l->next) {
if (mbim_uuid_cmp (&((MbimCustomService *)l->data)->uuid, uuid))
return ((MbimCustomService *)l->data)->service_id;
diff --git a/src/libmbim-glib/mbim-uuid.h b/src/libmbim-glib/mbim-uuid.h
index 0ed1145..0fe9b05 100644
--- a/src/libmbim-glib/mbim-uuid.h
+++ b/src/libmbim-glib/mbim-uuid.h
@@ -111,6 +111,8 @@
* @MBIM_SERVICE_QDU: QDU firmware update service. Since 1.26.
* @MBIM_SERVICE_MS_UICC_LOW_LEVEL_ACCESS: Microsoft UICC Low Level Access service. Since 1.26.
* @MBIM_SERVICE_QUECTEL: Quectel specific operations. Since 1.26.2.
+ * @MBIM_SERVICE_INTEL_THERMAL_RF: Intel thermal rf related commands. Since 1.28
+ * @MBIM_SERVICE_MS_VOICE_EXTENSIONS: Microsoft Voice extensions service. Since 1.28.
* @MBIM_SERVICE_LAST: Internal value.
*
* Enumeration of the generic MBIM services.
@@ -137,6 +139,8 @@
MBIM_SERVICE_QDU = 16,
MBIM_SERVICE_MS_UICC_LOW_LEVEL_ACCESS = 17,
MBIM_SERVICE_QUECTEL = 18,
+ MBIM_SERVICE_INTEL_THERMAL_RF = 19,
+ MBIM_SERVICE_MS_VOICE_EXTENSIONS = 20,
#if defined LIBMBIM_GLIB_COMPILATION
MBIM_SERVICE_LAST /*< skip >*/
#endif
@@ -352,6 +356,29 @@
#define MBIM_UUID_QUECTEL mbim_uuid_from_service (MBIM_SERVICE_QUECTEL)
/**
+ * MBIM_UUID_INTEL_THERMAL_RF:
+ *
+ * Get the UUID of the %MBIM_SERVICE_INTEL_THERMAL_RF service.
+ *
+ * Returns: (transfer none): a #MbimUuid.
+ *
+ * Since: 1.28
+ */
+#define MBIM_UUID_INTEL_THERMAL_RF mbim_uuid_from_service (MBIM_SERVICE_INTEL_THERMAL_RF)
+
+
+/**
+ * MBIM_UUID_MS_VOICE_EXTENSIONS:
+ *
+ * Get the UUID of the %MBIM_SERVICE_MS_VOICE_EXTENSIONS service.
+ *
+ * Returns: (transfer none): a #MbimUuid.
+ *
+ * Since: 1.28
+ */
+#define MBIM_UUID_MS_VOICE_EXTENSIONS mbim_uuid_from_service (MBIM_SERVICE_MS_VOICE_EXTENSIONS)
+
+/**
* mbim_service_lookup_name:
* @service: a MbimService or custom service.
*
diff --git a/src/mbimcli/mbimcli-basic-connect.c b/src/mbimcli/mbimcli-basic-connect.c
index 50ca6d9..64f78a5 100644
--- a/src/mbimcli/mbimcli-basic-connect.c
+++ b/src/mbimcli/mbimcli-basic-connect.c
@@ -1391,7 +1391,7 @@
if (!mbimcli_parse_key_value_string (str,
&error,
connect_activate_properties_handle,
- &props)) {
+ props)) {
g_printerr ("error: couldn't parse input string: %s\n", error->message);
return FALSE;
}
diff --git a/src/mbimcli/mbimcli-helpers.h b/src/mbimcli/mbimcli-helpers.h
index cf99bb6..b512005 100644
--- a/src/mbimcli/mbimcli-helpers.h
+++ b/src/mbimcli/mbimcli-helpers.h
@@ -64,7 +64,8 @@
MBIMCLI_ENUM_LIST_ITEM (MbimDrxCycle, drx_cycle, "drx cycle") \
MBIMCLI_ENUM_LIST_ITEM (MbimLadnInfo, ladn_info, "ladn info") \
MBIMCLI_ENUM_LIST_ITEM (MbimDefaultPduActivationHint, default_pdu_activation_hint, "default pdu activation hint") \
- MBIMCLI_ENUM_LIST_ITEM (MbimAccessMediaType, access_media_type, "access media type")
+ MBIMCLI_ENUM_LIST_ITEM (MbimAccessMediaType, access_media_type, "access media type") \
+ MBIMCLI_ENUM_LIST_ITEM (MbimIntelBootMode, intel_boot_mode, "intel boot mode")
#define MBIMCLI_ENUM_LIST_ITEM(TYPE,TYPE_UNDERSCORE,DESCR) \
gboolean mbimcli_read_## TYPE_UNDERSCORE ##_from_string (const gchar *str, TYPE *out);
diff --git a/src/mbimcli/mbimcli-intel-firmware-update.c b/src/mbimcli/mbimcli-intel-firmware-update.c
index fdd2d28..d42736d 100644
--- a/src/mbimcli/mbimcli-intel-firmware-update.c
+++ b/src/mbimcli/mbimcli-intel-firmware-update.c
@@ -19,21 +19,28 @@
#include <libmbim-glib.h>
#include "mbimcli.h"
+#include "mbimcli-helpers.h"
/* Context */
typedef struct {
- MbimDevice *device;
+ MbimDevice *device;
GCancellable *cancellable;
} Context;
static Context *ctx;
/* Options */
-static gboolean modem_reboot_flag;
+static gboolean modem_reboot_set;
+static gchar *modem_reboot_str;
+
+static gboolean modem_reboot_arg_parse (const gchar *option_name,
+ const gchar *value,
+ gpointer user_data,
+ GError **error);
static GOptionEntry entries[] = {
- { "intel-modem-reboot", 0, 0, G_OPTION_ARG_NONE, &modem_reboot_flag,
- "Reboot modem",
- NULL
+ { "intel-modem-reboot", 0, G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, G_CALLBACK (modem_reboot_arg_parse),
+ "Reboot modem. Boot mode and timeout arguments only required if MBIMEx >= 2.0.",
+ "[(Boot Mode),(Timeout)]"
},
{ NULL }
};
@@ -53,16 +60,27 @@
return group;
}
+static gboolean
+modem_reboot_arg_parse (const gchar *option_name,
+ const gchar *value,
+ gpointer user_data,
+ GError **error)
+{
+ modem_reboot_set = TRUE;
+ modem_reboot_str = g_strdup (value);
+ return TRUE;
+}
+
gboolean
mbimcli_intel_firmware_update_options_enabled (void)
{
- static guint n_actions = 0;
+ static guint n_actions = 0;
static gboolean checked = FALSE;
if (checked)
return !!n_actions;
- n_actions = modem_reboot_flag;
+ n_actions = modem_reboot_set;
if (n_actions > 1) {
g_printerr ("error: too many Intel Firmware Update Service actions requested\n");
@@ -114,11 +132,44 @@
shutdown (TRUE);
}
+static gboolean
+modem_reboot_v2_input_parse (const gchar *str,
+ MbimIntelBootMode *out_boot_mode,
+ guint32 *out_timeout)
+{
+ g_auto(GStrv) split = NULL;
+
+ split = g_strsplit (modem_reboot_str, ",", -1);
+
+ if (g_strv_length (split) > 2) {
+ g_printerr ("error: couldn't parse input string, too many arguments\n");
+ return FALSE;
+ }
+
+ if (g_strv_length (split) < 2) {
+ g_printerr ("error: couldn't parse input string, missing arguments\n");
+ return FALSE;
+ }
+
+ if (!mbimcli_read_intel_boot_mode_from_string (split[0], out_boot_mode)) {
+ g_printerr ("error: couldn't read boot mode, wrong value given as input\n");
+ return FALSE;
+ }
+
+ if (!mbimcli_read_uint_from_string (split[1], out_timeout)) {
+ g_printerr ("error: couldn't read timeout value\n");
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
void
mbimcli_intel_firmware_update_run (MbimDevice *device,
GCancellable *cancellable)
{
g_autoptr(MbimMessage) request = NULL;
+ g_autoptr(GError) error = NULL;
/* Initialize context */
ctx = g_slice_new (Context);
@@ -126,9 +177,30 @@
ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
/* Request to reboot modem? */
- if (modem_reboot_flag) {
- g_debug ("Asynchronously rebooting modem...");
- request = (mbim_message_intel_firmware_update_modem_reboot_set_new (NULL));
+ if (modem_reboot_set) {
+ if (mbim_device_check_ms_mbimex_version (device, 2, 0)) {
+ MbimIntelBootMode boot_mode = MBIM_INTEL_BOOT_MODE_NORMAL_MODE;
+ guint32 timeout = 0;
+
+ if (!modem_reboot_v2_input_parse (modem_reboot_str, &boot_mode, &timeout)) {
+ g_printerr ("error: couldn't parse input arguments\n");
+ g_printerr ("error: device in MBIMEx >= 2.0 requires boot mode and timeout arguments.\n");
+ shutdown (FALSE);
+ return;
+ }
+
+ request = mbim_message_intel_firmware_update_v2_modem_reboot_set_new (boot_mode, timeout, NULL);
+ } else {
+ if (modem_reboot_str) {
+ g_printerr ("error: arguments are not expected in MBIMEx < 2.0\n");
+ shutdown (FALSE);
+ return;
+ }
+
+ g_debug ("Asynchronously rebooting modem...");
+ request = mbim_message_intel_firmware_update_modem_reboot_set_new (NULL);
+ }
+
mbim_device_command (ctx->device,
request,
10,
diff --git a/src/mbimcli/mbimcli-intel-thermal-rf.c b/src/mbimcli/mbimcli-intel-thermal-rf.c
new file mode 100644
index 0000000..b3a88c9
--- /dev/null
+++ b/src/mbimcli/mbimcli-intel-thermal-rf.c
@@ -0,0 +1,282 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * mbimcli -- Command line interface to control MBIM devices
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright (C) 2022 Intel Corporation
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include <libmbim-glib.h>
+
+#include "mbim-common.h"
+#include "mbimcli.h"
+#include "mbimcli-helpers.h"
+
+/* Context */
+typedef struct {
+ MbimDevice *device;
+ GCancellable *cancellable;
+} Context;
+static Context *ctx;
+
+/* Options */
+static gboolean query_rfim_flag;
+static gchar *set_rfim_str;
+
+static GOptionEntry entries[] = {
+ { "query-rfim", 0, 0, G_OPTION_ARG_NONE, &query_rfim_flag,
+ "Query RFIM frequency information",
+ NULL
+ },
+ { "set-rfim", 0, 0, G_OPTION_ARG_STRING, &set_rfim_str,
+ "Enable or disable RFIM (disabled by default)",
+ "[(on|off)]"
+ },
+ {NULL}
+};
+
+GOptionGroup *
+mbimcli_intel_thermal_rf_get_option_group (void)
+{
+ GOptionGroup *group;
+
+ group = g_option_group_new ("intel-thermal-rf",
+ "Intel Thermal RF Service options:",
+ "Show Intel Thermal RF Service options",
+ NULL,
+ NULL);
+ g_option_group_add_entries (group, entries);
+
+ return group;
+}
+
+gboolean
+mbimcli_intel_thermal_rf_options_enabled (void)
+{
+ static guint n_actions = 0;
+ static gboolean checked = FALSE;
+
+ if (checked)
+ return !!n_actions;
+
+ n_actions = (query_rfim_flag +
+ !!set_rfim_str);
+
+ if (n_actions > 1) {
+ g_printerr ("error: too many Intel Thermal RF actions requested\n");
+ exit (EXIT_FAILURE);
+ }
+
+ checked = TRUE;
+ return !!n_actions;
+}
+
+static void
+context_free (Context *context)
+{
+ if (!context)
+ return;
+
+ if (context->cancellable)
+ g_object_unref (context->cancellable);
+ if (context->device)
+ g_object_unref (context->device);
+ g_slice_free (Context, context);
+}
+
+static void
+shutdown (gboolean operation_status)
+{
+ /* Cleanup context and finish async operation */
+ context_free (ctx);
+ mbimcli_async_operation_done (operation_status);
+}
+
+static void
+query_rfim_ready (MbimDevice *device,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ guint32 i = 0;
+ g_autoptr(MbimMessage) response = NULL;
+ g_autoptr(GError) error = NULL;
+ guint32 element_count;
+ MbimIntelRfimFrequencyValueArray *rfim_frequency;
+ g_autofree gchar *rssi_str = NULL;
+ g_autofree gchar *sinr_str = NULL;
+ g_autofree gchar *rsrq_str = NULL;
+ g_autofree gchar *rsrp_str = NULL;
+
+ response = mbim_device_command_finish (device, res, &error);
+ if (!response || !mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error)) {
+ g_printerr ("error: operation failed: %s\n", error->message);
+ shutdown (FALSE);
+ return;
+ }
+
+ if (!mbim_message_intel_thermal_rf_rfim_response_parse (response,
+ &element_count,
+ &rfim_frequency,
+ &error)) {
+ g_printerr ("error: couldn't parse response message: %s\n", error->message);
+ shutdown (FALSE);
+ return;
+ }
+
+ g_print ("[%s] RFIM frequency values (%u):\n",
+ mbim_device_get_path_display (device),
+ element_count);
+
+ for (i = 0; i < element_count; i++) {
+ if (rfim_frequency[i]->rssi <= 31)
+ rssi_str = g_strdup_printf ("%d dBm", -113 + (2 * rfim_frequency[i]->rssi));
+ else
+ rssi_str = g_strdup_printf ("n/a");
+
+ if (rfim_frequency[i]->rsrq == 0)
+ rsrq_str = g_strdup_printf ("< -19.5 dB");
+ else if (rfim_frequency[i]->rsrq < 34)
+ rsrq_str = g_strdup_printf ("%.2lf dB", -19.5 + ((gdouble)rfim_frequency[i]->rsrq / 2));
+ else if (rfim_frequency[i]->rsrq == 34)
+ rsrq_str = g_strdup_printf (">= -2.5 dB");
+ else
+ rsrq_str = g_strdup_printf ("n/a");
+
+ if (rfim_frequency[i]->rsrp == 0)
+ rsrp_str = g_strdup_printf ("< -140 dBm");
+ else if (rfim_frequency[i]->rsrp < 97)
+ rsrp_str = g_strdup_printf ("%d dBm", -140 + rfim_frequency[i]->rsrp);
+ else if (rfim_frequency[i]->rsrp == 97)
+ rsrp_str = g_strdup_printf (">= -43 dBm");
+ else
+ rsrp_str = g_strdup_printf ("n/a");
+
+ if (rfim_frequency[i]->sinr == 0)
+ sinr_str = g_strdup_printf ("< -23 dB");
+ else if (rfim_frequency[i]->sinr < 97)
+ sinr_str = g_strdup_printf ("%.21f dB", -23 + ((gdouble)rfim_frequency[i]->sinr / 2));
+ else if (rfim_frequency[i]->sinr == 97)
+ sinr_str = g_strdup_printf (">= 40 dB");
+ else
+ sinr_str = g_strdup_printf ("n/a");
+
+ g_print ("\tElement Number: %u\n"
+ "\t Serving cell info: %s\n"
+ "\t Center frequency: %" G_GUINT64_FORMAT " Hz\n"
+ "\t Bandwidth: %u Hz\n"
+ "\t RSRP: %s\n"
+ "\t RSRQ: %s\n"
+ "\t SINR: %s\n"
+ "\t RSSI: %s\n"
+ "\t Connected: %s\n",
+ i + 1,
+ mbim_intel_serving_cell_info_get_string (rfim_frequency[i]->serving_cell_info),
+ rfim_frequency[i]->center_frequency,
+ rfim_frequency[i]->bandwidth,
+ rsrp_str,
+ rsrq_str,
+ sinr_str,
+ rssi_str,
+ rfim_frequency[i]->connection_status ? "yes" : "no");
+ }
+
+ shutdown(TRUE);
+}
+
+static void
+set_rfim_state_ready (MbimDevice *device,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ g_autoptr(MbimMessage) response = NULL;
+ g_autoptr(GError) error = NULL;
+
+ response = mbim_device_command_finish (device, res, &error);
+ if (!response) {
+ g_printerr ("error: operation failed: %s\n", error->message);
+ shutdown (FALSE);
+ return;
+ }
+
+ g_print ("[%s] Successfully requested modem to set RFIM state\n",
+ mbim_device_get_path_display (device));
+
+ shutdown (TRUE);
+}
+
+void
+mbimcli_intel_thermal_rf_run (MbimDevice *device,
+ GCancellable *cancellable)
+{
+ g_autoptr(MbimMessage) request = NULL;
+ g_autoptr(GError) error = NULL;
+
+ /* Initialize context */
+ ctx = g_slice_new (Context);
+ ctx->device = g_object_ref (device);
+ ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
+
+ /* Query RFIM Frequency information*/
+ if (query_rfim_flag) {
+ g_debug ("Asynchronously querying RFIM frequency information...");
+ request = mbim_message_intel_thermal_rf_rfim_query_new (NULL);
+ mbim_device_command (ctx->device,
+ request,
+ 10,
+ ctx->cancellable,
+ (GAsyncReadyCallback)query_rfim_ready,
+ NULL);
+ return;
+ }
+
+ /* Request to set rfim activation state */
+ if (set_rfim_str) {
+ gboolean activation_state;
+
+ g_debug ("Asynchronously setting RFIM activation state...");
+
+ if (g_ascii_strcasecmp (set_rfim_str, "on") == 0)
+ activation_state = TRUE;
+ else if (g_ascii_strcasecmp (set_rfim_str, "off") == 0)
+ activation_state = FALSE;
+ else {
+ g_printerr ("error: invalid RFIM state: '%s'\n", set_rfim_str);
+ shutdown (FALSE);
+ return;
+ }
+
+ request = mbim_message_intel_thermal_rf_rfim_set_new (activation_state, NULL);
+ mbim_device_command (ctx->device,
+ request,
+ 10,
+ ctx->cancellable,
+ (GAsyncReadyCallback)set_rfim_state_ready,
+ NULL);
+ return;
+ }
+
+ g_warn_if_reached ();
+}
diff --git a/src/mbimcli/mbimcli-ms-voice-extensions.c b/src/mbimcli/mbimcli-ms-voice-extensions.c
new file mode 100644
index 0000000..5d2b6ac
--- /dev/null
+++ b/src/mbimcli/mbimcli-ms-voice-extensions.c
@@ -0,0 +1,187 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * mbimcli -- Command line interface to control MBIM devices
+ *
+ * Copyright (C) 2022 Intel Corporation
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <string.h>
+#include <errno.h>
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include <libmbim-glib.h>
+
+#include "mbim-common.h"
+#include "mbimcli.h"
+#include "mbimcli-helpers.h"
+
+/* Context */
+typedef struct {
+ MbimDevice *device;
+ GCancellable *cancellable;
+} Context;
+static Context *ctx;
+
+/* Options */
+static gboolean query_nitz_flag;
+
+static GOptionEntry entries[] = {
+ { "query-nitz", 0, 0, G_OPTION_ARG_NONE, &query_nitz_flag,
+ "Query network identity and time zone",
+ NULL
+ },
+ { NULL }
+};
+
+GOptionGroup *
+mbimcli_ms_voice_extensions_get_option_group (void)
+{
+ GOptionGroup *group;
+
+ group = g_option_group_new ("ms-voice-extensions",
+ "Microsoft Voice Extensions Service options:",
+ "Show Microsoft Voice Extensions Service options",
+ NULL,
+ NULL);
+ g_option_group_add_entries (group, entries);
+
+ return group;
+}
+
+gboolean
+mbimcli_ms_voice_extensions_options_enabled (void)
+{
+ static guint n_actions = 0;
+ static gboolean checked = FALSE;
+
+ if (checked)
+ return !!n_actions;
+
+ n_actions = query_nitz_flag;
+
+ if (n_actions > 1) {
+ g_printerr ("error: too many Microsoft Voice Extensions Service actions requested\n");
+ exit (EXIT_FAILURE);
+ }
+
+ checked = TRUE;
+ return !!n_actions;
+}
+
+static void
+context_free (Context *context)
+{
+ if (!context)
+ return;
+
+ if (context->cancellable)
+ g_object_unref (context->cancellable);
+ if (context->device)
+ g_object_unref (context->device);
+ g_slice_free (Context, context);
+}
+
+static void
+shutdown (gboolean operation_status)
+{
+ /* Cleanup context and finish async operation */
+ context_free (ctx);
+ mbimcli_async_operation_done (operation_status);
+}
+
+static void
+query_nitz_ready (MbimDevice *device,
+ GAsyncResult *res)
+{
+ g_autoptr(MbimMessage) response = NULL;
+ g_autoptr(GError) error = NULL;
+ guint32 day = 0;
+ guint32 month = 0;
+ guint32 year = 0;
+ guint32 hour = 0;
+ guint32 minutes = 0;
+ guint32 second = 0;
+ guint32 time_zone_offset_minutes = 0;
+ guint32 daylight_saving_time_offset_minutes = 0;
+ MbimDataClass data_class;
+ g_autofree gchar *data_class_str = NULL;
+
+ response = mbim_device_command_finish (device, res, &error);
+ if (!response || !mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error)) {
+ g_printerr ("error: operation failed: %s\n", error->message);
+ shutdown (FALSE);
+ return;
+ }
+
+ if (!mbim_message_ms_voice_extensions_nitz_response_parse (
+ response,
+ &year,
+ &month,
+ &day,
+ &hour,
+ &minutes,
+ &second,
+ &time_zone_offset_minutes,
+ &daylight_saving_time_offset_minutes,
+ &data_class,
+ &error)) {
+ g_printerr ("error: couldn't parse response message: %s\n", error->message);
+ shutdown (FALSE);
+ return;
+ }
+
+ data_class_str = mbim_data_class_build_string_from_mask (data_class);
+
+ g_print ("Successfully queried NITZ info from modem:\n"
+ "\t Date: %02u/%02u/%u\n"
+ "\t Time: %02u:%02u:%02u\n"
+ "\t Time zone offset minutes: %u\n"
+ "\tDaylight saving time offset minutes: %u\n"
+ "\t Data class: %s\n",
+ day,
+ month,
+ year,
+ hour,
+ minutes,
+ second,
+ time_zone_offset_minutes,
+ daylight_saving_time_offset_minutes,
+ VALIDATE_UNKNOWN (data_class_str));
+
+ shutdown (TRUE);
+}
+
+void
+mbimcli_ms_voice_extensions_run (MbimDevice *device,
+ GCancellable *cancellable)
+{
+ g_autoptr(MbimMessage) request = NULL;
+
+ /* Initialize context */
+ ctx = g_slice_new (Context);
+ ctx->device = g_object_ref (device);
+ ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
+
+ /* Request to reboot modem? */
+ if (query_nitz_flag) {
+ g_debug ("Asynchronously querying nitz info...");
+ request = mbim_message_ms_voice_extensions_nitz_query_new (NULL);
+ mbim_device_command (ctx->device,
+ request,
+ 10,
+ ctx->cancellable,
+ (GAsyncReadyCallback)query_nitz_ready,
+ NULL);
+ return;
+ }
+
+ g_warn_if_reached ();
+}
diff --git a/src/mbimcli/mbimcli.c b/src/mbimcli/mbimcli.c
index d4a0bf4..65cf268 100644
--- a/src/mbimcli/mbimcli.c
+++ b/src/mbimcli/mbimcli.c
@@ -43,6 +43,7 @@
static gboolean no_close_flag;
static gboolean noop_flag;
static gboolean verbose_flag;
+static gboolean verbose_full_flag;
static gboolean silent_flag;
static gboolean version_flag;
@@ -79,6 +80,10 @@
"Run action with verbose logs, including the debug ones",
NULL
},
+ { "verbose-full", 0, 0, G_OPTION_ARG_NONE, &verbose_full_flag,
+ "Run action with verbose logs, including the debug ones and personal info",
+ NULL
+ },
{ "silent", 0, 0, G_OPTION_ARG_NONE, &silent_flag,
"Run action with no logs; not even the error/warning ones",
NULL
@@ -161,7 +166,7 @@
g_assert_not_reached ();
}
- if (!verbose_flag && !err)
+ if (!verbose_flag && !verbose_full_flag && !err)
return;
g_fprintf (err ? stderr : stdout,
@@ -297,6 +302,12 @@
case MBIM_SERVICE_QUECTEL:
mbimcli_quectel_run (dev, cancellable);
return;
+ case MBIM_SERVICE_INTEL_THERMAL_RF:
+ mbimcli_intel_thermal_rf_run (dev, cancellable);
+ return;
+ case MBIM_SERVICE_MS_VOICE_EXTENSIONS:
+ mbimcli_ms_voice_extensions_run (dev, cancellable);
+ return;
case MBIM_SERVICE_SMS:
case MBIM_SERVICE_USSD:
case MBIM_SERVICE_STK:
@@ -419,6 +430,16 @@
actions_enabled++;
}
+ if (mbimcli_intel_thermal_rf_options_enabled ()) {
+ service = MBIM_SERVICE_INTEL_THERMAL_RF;
+ actions_enabled++;
+ }
+
+ if (mbimcli_ms_voice_extensions_options_enabled ()) {
+ service = MBIM_SERVICE_MS_VOICE_EXTENSIONS;
+ actions_enabled++;
+ }
+
/* Noop */
if (noop_flag)
actions_enabled++;
@@ -464,6 +485,8 @@
g_option_context_add_group (context, mbimcli_ms_basic_connect_extensions_get_option_group ());
g_option_context_add_group (context, mbimcli_quectel_get_option_group ());
g_option_context_add_group (context, mbimcli_link_management_get_option_group ());
+ g_option_context_add_group (context, mbimcli_intel_thermal_rf_get_option_group ());
+ g_option_context_add_group (context, mbimcli_ms_voice_extensions_get_option_group ());
g_option_context_add_main_entries (context, main_entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error)) {
g_printerr ("error: %s\n", error->message);
@@ -475,8 +498,17 @@
g_log_set_handler (NULL, G_LOG_LEVEL_MASK, log_handler, NULL);
g_log_set_handler ("Mbim", G_LOG_LEVEL_MASK, log_handler, NULL);
- if (verbose_flag)
+
+ if (verbose_flag && verbose_full_flag) {
+ g_printerr ("error: cannot specify --verbose and --verbose-full at the same time\n");
+ exit (EXIT_FAILURE);
+ } else if (verbose_flag) {
mbim_utils_set_traces_enabled (TRUE);
+ mbim_utils_set_show_personal_info (FALSE);
+ } else if (verbose_full_flag) {
+ mbim_utils_set_traces_enabled (TRUE);
+ mbim_utils_set_show_personal_info (TRUE);
+ }
/* No device path given? */
if (!device_str) {
diff --git a/src/mbimcli/mbimcli.h b/src/mbimcli/mbimcli.h
index d1f747a..255e3f8 100644
--- a/src/mbimcli/mbimcli.h
+++ b/src/mbimcli/mbimcli.h
@@ -17,47 +17,55 @@
void mbimcli_async_operation_done (gboolean operation_status);
/* Basic Connect group */
-GOptionGroup *mbimcli_basic_connect_get_option_group (void);
-GOptionGroup *mbimcli_phonebook_get_option_group (void);
-GOptionGroup *mbimcli_dss_get_option_group (void);
-GOptionGroup *mbimcli_ms_firmware_id_get_option_group (void);
-GOptionGroup *mbimcli_ms_host_shutdown_get_option_group (void);
-GOptionGroup *mbimcli_ms_sar_get_option_group (void);
-GOptionGroup *mbimcli_atds_get_option_group (void);
-GOptionGroup *mbimcli_intel_firmware_update_get_option_group (void);
+GOptionGroup *mbimcli_basic_connect_get_option_group (void);
+GOptionGroup *mbimcli_phonebook_get_option_group (void);
+GOptionGroup *mbimcli_dss_get_option_group (void);
+GOptionGroup *mbimcli_ms_firmware_id_get_option_group (void);
+GOptionGroup *mbimcli_ms_host_shutdown_get_option_group (void);
+GOptionGroup *mbimcli_ms_sar_get_option_group (void);
+GOptionGroup *mbimcli_atds_get_option_group (void);
+GOptionGroup *mbimcli_intel_firmware_update_get_option_group (void);
GOptionGroup *mbimcli_ms_basic_connect_extensions_get_option_group (void);
-GOptionGroup *mbimcli_quectel_get_option_group (void);
+GOptionGroup *mbimcli_quectel_get_option_group (void);
+GOptionGroup *mbimcli_intel_thermal_rf_get_option_group (void);
+GOptionGroup *mbimcli_ms_voice_extensions_get_option_group (void);
-gboolean mbimcli_basic_connect_options_enabled (void);
-gboolean mbimcli_phonebook_options_enabled (void);
-gboolean mbimcli_dss_options_enabled (void);
-gboolean mbimcli_ms_firmware_id_options_enabled (void);
-gboolean mbimcli_ms_host_shutdown_options_enabled (void);
-gboolean mbimcli_ms_sar_options_enabled (void);
-gboolean mbimcli_atds_options_enabled (void);
-gboolean mbimcli_intel_firmware_update_options_enabled (void);
+gboolean mbimcli_basic_connect_options_enabled (void);
+gboolean mbimcli_phonebook_options_enabled (void);
+gboolean mbimcli_dss_options_enabled (void);
+gboolean mbimcli_ms_firmware_id_options_enabled (void);
+gboolean mbimcli_ms_host_shutdown_options_enabled (void);
+gboolean mbimcli_ms_sar_options_enabled (void);
+gboolean mbimcli_atds_options_enabled (void);
+gboolean mbimcli_intel_firmware_update_options_enabled (void);
gboolean mbimcli_ms_basic_connect_extensions_options_enabled (void);
-gboolean mbimcli_quectel_options_enabled (void);
+gboolean mbimcli_quectel_options_enabled (void);
+gboolean mbimcli_intel_thermal_rf_options_enabled (void);
+gboolean mbimcli_ms_voice_extensions_options_enabled (void);
-void mbimcli_basic_connect_run (MbimDevice *device,
+void mbimcli_basic_connect_run (MbimDevice *device,
GCancellable *cancellable);
-void mbimcli_phonebook_run (MbimDevice *device,
+void mbimcli_phonebook_run (MbimDevice *device,
GCancellable *cancellable);
-void mbimcli_dss_run (MbimDevice *device,
+void mbimcli_dss_run (MbimDevice *device,
GCancellable *cancellable);
-void mbimcli_ms_firmware_id_run (MbimDevice *device,
+void mbimcli_ms_firmware_id_run (MbimDevice *device,
GCancellable *cancellable);
-void mbimcli_ms_host_shutdown_run (MbimDevice *device,
+void mbimcli_ms_host_shutdown_run (MbimDevice *device,
GCancellable *cancellable);
-void mbimcli_ms_sar_run (MbimDevice *device,
+void mbimcli_ms_sar_run (MbimDevice *device,
GCancellable *cancellable);
-void mbimcli_atds_run (MbimDevice *device,
+void mbimcli_atds_run (MbimDevice *device,
GCancellable *cancellable);
-void mbimcli_intel_firmware_update_run (MbimDevice *device,
+void mbimcli_intel_firmware_update_run (MbimDevice *device,
GCancellable *cancellable);
-void mbimcli_ms_basic_connect_extensions_run (MbimDevice *device,
+void mbimcli_ms_basic_connect_extensions_run (MbimDevice *device,
GCancellable *cancellable);
-void mbimcli_quectel_run (MbimDevice *device,
+void mbimcli_quectel_run (MbimDevice *device,
+ GCancellable *cancellable);
+void mbimcli_intel_thermal_rf_run (MbimDevice *device,
+ GCancellable *cancellable);
+void mbimcli_ms_voice_extensions_run (MbimDevice *device,
GCancellable *cancellable);
diff --git a/src/mbimcli/meson.build b/src/mbimcli/meson.build
index e26ecdd..79c52da 100644
--- a/src/mbimcli/meson.build
+++ b/src/mbimcli/meson.build
@@ -7,10 +7,12 @@
'mbimcli.c',
'mbimcli-dss.c',
'mbimcli-intel-firmware-update.c',
+ 'mbimcli-intel-thermal-rf.c',
'mbimcli-ms-basic-connect-extensions.c',
'mbimcli-ms-firmware-id.c',
'mbimcli-ms-host-shutdown.c',
'mbimcli-ms-sar.c',
+ 'mbimcli-ms-voice-extensions.c',
'mbimcli-phonebook.c',
'mbimcli-quectel.c',
)
