osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Bluetooth: add RSI and Broadcast_Name AD parser

This commit is contained in:
Jakub Pawlowski 2022-10-14 22:09:27 +02:00 committed by AndersBroman
parent 76e4bc1c69
commit c76ef65af5
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
epan/dissectors/packet-bthci_cmd.c
View File

@ -943,6 +943,8 @@ static gint hf_btcommon_eir_ad_biginfo_gskd = -1;
static gint hf_btcommon_eir_ad_biginfo_big_control_access_address = -1;
static gint hf_btcommon_eir_ad_biginfo_bis_access_address = -1;
static gint hf_btcommon_eir_ad_broadcast_code = -1;
static gint hf_btcommon_eir_ad_rsi = -1;
static gint hf_btcommon_eir_ad_broadcast_name = -1;
static gint hf_btcommon_cod_class_of_device = -1;
static gint hf_btcommon_cod_format_type = -1;
@ -1835,6 +1837,9 @@ static const value_string bthci_cmd_eir_data_type_vals[] = {
{0x2B, "Mesh Beacon" },
{0x2C, "BIGInfo" },
{0x2D, "Broadcast Code" },
{0x2E, "Resolvable Set Identifier" },
{0x2F, "Advertising Interval - long" },
{0x30, "Broadcast_Name" },
{0x3D, "3D Information Data" },
{0xFF, "Manufacturer Specific" },
{ 0, NULL }
@ -9483,6 +9488,16 @@ dissect_eir_ad_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, bluetoo
proto_item_append_text(entry_item, ": %s", tvb_format_text(pinfo->pool, tvb, offset, length));
offset += length;
break;
case 0x2e: /* Resolvable Set Identifier */
proto_tree_add_item(entry_tree, hf_btcommon_eir_ad_rsi, tvb, offset, length, ENC_NA);
offset += length;
break;
case 0x30: /* Broadcast Name */
proto_tree_add_item(entry_tree, hf_btcommon_eir_ad_broadcast_name, tvb, offset, length, ENC_UTF_8 | ENC_NA);
offset += length;
break;
case 0xFF: /* Manufacturer Specific */ {
guint16 company_id;
@ -10469,6 +10484,16 @@ proto_register_btcommon(void)
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btcommon_eir_ad_rsi,
{ "Resolvable Set Identifier", "btcommon.eir_ad.entry.rsi",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btcommon_eir_ad_broadcast_name,
{ "Broadcast Name", "btcommon.eir_ad.entry.broadcast_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btcommon_cod_class_of_device,
{ "Class of Device", "btcommon.cod.class_of_device",
FT_UINT24, BASE_HEX, NULL, 0x0,