From 0e8164354078bfa47db4db20b9f80e01ba1aad55 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Tue, 27 Aug 2013 05:08:34 +0000 Subject: From Michal Labedzki: Full dissection of EIR/AD and little improve filtering, cd https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050 svn path=/trunk/; revision=51527 --- epan/dissectors/packet-bthci_cmd.c | 10 ++- epan/dissectors/packet-bthci_evt.c | 154 ++++++++++++++++++------------------- 2 files changed, 86 insertions(+), 78 deletions(-) (limited to 'epan') diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 8e3c48ec21..9646aac1ef 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -1426,8 +1426,16 @@ void proto_reg_handoff_bthci_cmd(void); static int dissect_bthci_cmd_bd_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { + guint8 bd_addr[6]; - proto_tree_add_item(tree, hf_bthci_cmd_bd_addr, tvb, offset, 6, ENC_NA); + bd_addr[5] = tvb_get_guint8(tvb, offset); + bd_addr[4] = tvb_get_guint8(tvb, offset + 1); + bd_addr[3] = tvb_get_guint8(tvb, offset + 2); + bd_addr[2] = tvb_get_guint8(tvb, offset + 3); + bd_addr[1] = tvb_get_guint8(tvb, offset + 4); + bd_addr[0] = tvb_get_guint8(tvb, offset + 5); + + proto_tree_add_ether(tree, hf_bthci_cmd_bd_addr, tvb, offset, 6, bd_addr); offset += 6; return offset; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 18bc144de8..7254cb951b 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -966,7 +966,7 @@ dissect_bthci_evt_bd_addr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, if (bdaddr) memcpy(bdaddr, bd_addr, 6); - proto_tree_add_item(tree, hf_bthci_evt_bd_addr, tvb, offset, 6, ENC_NA); + proto_tree_add_ether(tree, hf_bthci_evt_bd_addr, tvb, offset, 6, bd_addr); offset += 6; return offset; @@ -4371,77 +4371,77 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_link_type_2dh1, { "ACL Link Type 2-DH1", "bthci_evt.link_type_2dh1", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0002, + FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL } }, { &hf_bthci_evt_link_type_3dh1, { "ACL Link Type 3-DH1", "bthci_evt.link_type_3dh1", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0004, + FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL } }, { &hf_bthci_evt_link_type_dm1, { "ACL Link Type DM1", "bthci_evt.link_type_dm1", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0008, + FT_BOOLEAN, 16, NULL, 0x0008, NULL, HFILL } }, { &hf_bthci_evt_link_type_dh1, { "ACL Link Type DH1", "bthci_evt.link_type_dh1", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0010, + FT_BOOLEAN, 16, NULL, 0x0010, NULL, HFILL } }, { &hf_bthci_evt_link_type_2dh3, { "ACL Link Type 2-DH3", "bthci_evt.link_type_2dh3", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0100, + FT_BOOLEAN, 16, NULL, 0x0100, NULL, HFILL } }, { &hf_bthci_evt_link_type_3dh3, { "ACL Link Type 3-DH3", "bthci_evt.link_type_3dh3", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0200, + FT_BOOLEAN, 16, NULL, 0x0200, NULL, HFILL } }, { &hf_bthci_evt_link_type_dm3, { "ACL Link Type DM3", "bthci_evt.link_type_dm3", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0400, + FT_BOOLEAN, 16, NULL, 0x0400, NULL, HFILL } }, { &hf_bthci_evt_link_type_dh3, { "ACL Link Type DH3", "bthci_evt.link_type_dh3", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0800, + FT_BOOLEAN, 16, NULL, 0x0800, NULL, HFILL } }, { &hf_bthci_evt_link_type_2dh5, { "ACL Link Type 2-DH5", "bthci_evt.link_type_2dh5", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x1000, + FT_BOOLEAN, 16, NULL, 0x1000, NULL, HFILL } }, { &hf_bthci_evt_link_type_3dh5, { "ACL Link Type 3-DH5", "bthci_evt.link_type_3dh5", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x2000, + FT_BOOLEAN, 16, NULL, 0x2000, NULL, HFILL } }, { &hf_bthci_evt_link_type_dm5, { "ACL Link Type DM5", "bthci_evt.link_type_dm5", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x4000, + FT_BOOLEAN, 16, NULL, 0x4000, NULL, HFILL } }, { &hf_bthci_evt_link_type_dh5, { "ACL Link Type DH5", "bthci_evt.link_type_dh5", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x8000, + FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL } }, { &hf_bthci_evt_link_type_hv1, { "SCO Link Type HV1", "bthci_evt.link_type_hv1", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0020, + FT_BOOLEAN, 16, NULL, 0x0020, NULL, HFILL } }, { &hf_bthci_evt_link_type_hv2, { "SCO Link Type HV2", "bthci_evt.link_type_hv2", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0040, + FT_BOOLEAN, 16, NULL, 0x0040, NULL, HFILL } }, { &hf_bthci_evt_link_type_hv3, { "SCO Link Type HV3", "bthci_evt.link_type_hv3", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0080, + FT_BOOLEAN, 16, NULL, 0x0080, NULL, HFILL } }, { &hf_lmp_features, @@ -4801,22 +4801,22 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_link_policy_setting_switch, { "Enable Master Slave Switch", "bthci_evt.link_policy_switch", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0001, + FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL } }, { &hf_bthci_evt_link_policy_setting_hold, { "Enable Hold Mode", "bthci_evt.link_policy_hold", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0002, + FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL } }, { &hf_bthci_evt_link_policy_setting_sniff, { "Enable Sniff Mode", "bthci_evt.link_policy_sniff", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0004, + FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL } }, { &hf_bthci_evt_link_policy_setting_park, { "Enable Park Mode", "bthci_evt.link_policy_park", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0008, + FT_BOOLEAN, 16, NULL, 0x0008, NULL, HFILL } }, { &hf_bthci_evt_curr_role, @@ -4896,17 +4896,17 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_hold_mode_act_page, { "Suspend Page Scan", "bthci_evt.hold_mode_page", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x1, + FT_BOOLEAN, 8, NULL, 0x1, "Device can enter low power state", HFILL } }, { &hf_bthci_evt_hold_mode_act_inquiry, { "Suspend Inquiry Scan", "bthci_evt.hold_mode_inquiry", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x2, + FT_BOOLEAN, 8, NULL, 0x2, "Device can enter low power state", HFILL } }, { &hf_bthci_evt_hold_mode_act_periodic, { "Suspend Periodic Inquiries", "bthci_evt.hold_mode_periodic", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x4, + FT_BOOLEAN, 8, NULL, 0x4, "Device can enter low power state", HFILL } }, { &hf_bthci_evt_transmit_power_level, @@ -4991,7 +4991,7 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_fec_required, {"FEC Required", "bthci_evt.fec_required", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, 8, NULL, 0x0, NULL, HFILL} }, { &hf_bthci_evt_err_data_reporting, @@ -5191,7 +5191,7 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_location_domain_aware, { "Location Domain Aware", "bthci_evt.location_domain_aware", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, 8, NULL, 0x0, NULL, HFILL } }, { &hf_bthci_evt_location_domain, @@ -5291,7 +5291,7 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_pal_capabilities_00, { "Guaranteed Service", "bthci_evt.pal_capabilities", - FT_BOOLEAN, 16, TFS(&tfs_true_false), 0x0001, + FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL } }, { &hf_bthci_evt_max_amp_assoc_length, @@ -5356,7 +5356,7 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_short_range_mode_state, { "Short Range Mode State", "bthci_evt.short_range_mode_state", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, 8, NULL, 0x0, NULL, HFILL } }, { &hf_bthci_evt_transmit_power_level_gfsk, @@ -5381,12 +5381,12 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_le_supported_host, { "LE Supported Host", "bthci_evt.le_supported_host", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, 8, NULL, 0x0, NULL, HFILL } }, { &hf_bthci_evt_le_simultaneous_host, { "Simultaneous LE Host", "bthci_evt.le_simlutaneous_host", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, + FT_BOOLEAN, 8, NULL, 0x0, "Support for both LE and BR/EDR to same device", HFILL } }, { &hf_bthci_evt_le_acl_data_pkt_len, @@ -5401,7 +5401,7 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_le_feature_00, { "LE Encryption", "bthci_evt.le_feature", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_bthci_evt_white_list_size, @@ -5481,27 +5481,27 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_flags_limited_disc_mode, { "LE Limited Discoverable Mode", "bthci_evt.le_flags.limit_disc_mode", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_bthci_evt_flags_general_disc_mode, { "LE General Discoverable Mode", "bthci_evt.le_flags.general_disc_mode", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_bthci_evt_flags_bredr_not_support, { "BR/EDR Not Supported", "bthci_evt.le_flags.bredr_not_supported", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_bthci_evt_flags_le_bredr_support_ctrl, { "Simultaneous LE and BR/EDR to Same Device Capable (Controller)", "bthci_evt.le_flags.bredr_support_ctrl", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL } }, { &hf_bthci_evt_flags_le_bredr_support_host, { "Simultaneous LE and BR/EDR to Same Device Capable (Host)", "bthci_evt.le_flags.bredr_support_host", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL } }, { &hf_bthci_evt_flags_reserved, @@ -5511,17 +5511,17 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_oob_flags_oob_data_present, { "OOB Data Present", "bthci_evt.oob_flags.oob_data_present", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_bthci_evt_oob_flags_le_supported_host, { "LE Supported By Host", "bthci_evt.oob_flags.le_supported_host", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_bthci_evt_oob_flags_simultaneous_le_and_br_edr_host, { "Simultaneous LE and BR/EDR to Same Device Capable (Host)", "bthci_evt.oob_flags.simultaneous_le_and_br_edr_host", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_bthci_evt_oob_flags_address_type, @@ -5531,147 +5531,147 @@ proto_register_bthci_evt(void) }, { &hf_bthci_evt_le_states_00, { "Non-connectable Advertising State", "bthci_evt.le_states_00", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_bthci_evt_le_states_01, { "Scannable Advertising State", "bthci_evt.le_states_01", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_bthci_evt_le_states_02, { "Connectable Advertising State", "bthci_evt.le_states_02", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_bthci_evt_le_states_03, { "Directed Advertising State", "bthci_evt.le_states_03", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL } }, { &hf_bthci_evt_le_states_04, { "Passive Scanning State", "bthci_evt.le_states_04", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL } }, { &hf_bthci_evt_le_states_05, { "Active Scanning State", "bthci_evt.le_states_05", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL } }, { &hf_bthci_evt_le_states_06, { "Initiating State. Connection State in Master Role", "bthci_evt.le_states_06", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x40, + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL } }, { &hf_bthci_evt_le_states_07, { "Connection State in Slave Role", "bthci_evt.le_states_07", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL } }, { &hf_bthci_evt_le_states_10, { "Non-connectable Advertising State and Passive Scanning State combination", "bthci_evt.le_states_10", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_bthci_evt_le_states_11, { "Scannable Advertising State and Passive Scanning State combination", "bthci_evt.le_states_11", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_bthci_evt_le_states_12, { "Connectable Advertising State and Passive Scanning State combination", "bthci_evt.le_states_12", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_bthci_evt_le_states_13, { "Directed Advertising State and Passive Scanning State combination", "bthci_evt.le_states_13", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL } }, { &hf_bthci_evt_le_states_14, { "Non-connectable Advertising State and Active Scanning State combination", "bthci_evt.le_states_14", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL } }, { &hf_bthci_evt_le_states_15, { "Scannable Advertising State and Active Scanning State combination", "bthci_evt.le_states_15", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL } }, { &hf_bthci_evt_le_states_16, { "Connectable Advertising State and Active Scanning State combination", "bthci_evt.le_states_16", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x40, + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL } }, { &hf_bthci_evt_le_states_17, { "Directed Advertising State and Active Scanning State combination", "bthci_evt.le_states_17", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL } }, { &hf_bthci_evt_le_states_20, { "Non-connectable Advertising State and Initiating State combination", "bthci_evt.le_states_20", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_bthci_evt_le_states_21, { "Scannable Advertising State and Initiating State combination", "bthci_evt.le_states_21", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_bthci_evt_le_states_22, { "Non-connectable Advertising State and Master Role combination", "bthci_evt.le_states_22", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_bthci_evt_le_states_23, { "Scannable Advertising State and Master Role combination", "bthci_evt.le_states_23", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL } }, { &hf_bthci_evt_le_states_24, { "Non-connectable Advertising State and Slave Role combination", "bthci_evt.le_states_24", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL } }, { &hf_bthci_evt_le_states_25, { "Scannable Advertising State and Slave Role combination", "bthci_evt.le_states_25", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL } }, { &hf_bthci_evt_le_states_26, { "Passive Scanning State and Initiating State combination", "bthci_evt.le_states_26", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x40, + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL } }, { &hf_bthci_evt_le_states_27, { "Active Scanning State and Initiating State combination", "bthci_evt.le_states_27", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL } }, { &hf_bthci_evt_le_states_30, { "Passive Scanning State and Master Role combination", "bthci_evt.le_states_30", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_bthci_evt_le_states_31, { "Active Scanning State and Master Role combination", "bthci_evt.le_states_31", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_bthci_evt_le_states_32, { "Passive Scanning state and Slave Role combination", "bthci_evt.le_states_32", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_bthci_evt_le_states_33, { "Active Scanning state and Slave Role combination", "bthci_evt.le_states_33", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x08, + FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL } }, { &hf_bthci_evt_le_states_34, { "Initiating State and Master Role combination. Master Role and Master Role combination", "bthci_evt.le_states_34", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL } }, { &hf_bthci_evt_eir_ad_ssp_oob_length, @@ -5691,27 +5691,27 @@ proto_register_bthci_evt(void) }, { &hf_3ds_association_notification, { "3DS Association Notification", "bthci_evt.eir_ad.3ds.association_notification", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_3ds_battery_level_reporting, { "3DS Battery Level Reporting", "bthci_evt.eir_ad.3ds.battery_level_reporting", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x02, + FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL } }, { &hf_3ds_send_battery_level_report_on_startup, { "3DS Send Battery Level Report on Startup", "bthci_evt.eir_ad.3ds.send_battery_level_report_on_startup", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, + FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL } }, { &hf_3ds_reserved, { "Reserved", "bthci_evt.eir_ad.3ds.reserved", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x78, + FT_BOOLEAN, 8, NULL, 0x78, NULL, HFILL } }, { &hf_3ds_factory_test_mode, { "3DS Factory Test Mode", "bthci_evt.eir_ad.3ds.factory_test_mode", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL } }, { &hf_3ds_path_loss_threshold, @@ -5726,7 +5726,7 @@ proto_register_bthci_evt(void) }, { &hf_3ds_legacy_3d_capable_tv, { "3DS Legacy Capable TV", "bthci_evt.eir_ad.3ds_legacy.capable_tv", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x01, + FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL } }, { &hf_3ds_legacy_ignored_1_3, @@ -5736,22 +5736,22 @@ proto_register_bthci_evt(void) }, { &hf_3ds_legacy_fixed_4, { "3DS Legacy Fixed", "bthci_evt.eir_ad.3ds_legacy.fixed.4", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x10, + FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL } }, { &hf_3ds_legacy_ignored_5, { "3DS Legacy Ignored", "bthci_evt.eir_ad.3ds_legacy.ignored.5", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x20, + FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL } }, { &hf_3ds_legacy_fixed_6, { "3DS Legacy Fixed", "bthci_evt.eir_ad.3ds_legacy.fixed.4", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x40, + FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL } }, { &hf_3ds_legacy_test_mode, { "3DS Legacy Test Mode", "bthci_evt.eir_ad.3ds_legacy.test_mode", - FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x80, + FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL } }, { &hf_3ds_legacy_path_loss_threshold, -- cgit v1.2.3