aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bthci_vendor.c
diff options
context:
space:
mode:
authorMichal Labedzki <michal.labedzki@tieto.com>2014-12-29 08:53:15 +0100
committerMichal Labedzki <michal.labedzki@tieto.com>2015-01-10 15:36:02 +0000
commit55df238efd77a3d1787a8adc1d5c81d05469bcc8 (patch)
treef08fe2c15cc2b6114c8eebf472cbd0b8c9a34d98 /epan/dissectors/packet-bthci_vendor.c
parentd6e040989280e9999ddbe0a2b41f9fd80c746dbd (diff)
Bluetooth: SMP: Add missing opcode for "Identity Address Information"
Also fix tvb_length, tvb_length_remaining warnings. Bug: 10299 Change-Id: Ib8b55ea9f2220394a5896d13e5cc4e2cefff1e13 Reviewed-on: https://code.wireshark.org/review/6407 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors/packet-bthci_vendor.c')
-rw-r--r--epan/dissectors/packet-bthci_vendor.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-bthci_vendor.c b/epan/dissectors/packet-bthci_vendor.c
index 259b2f1deb..7a42898cea 100644
--- a/epan/dissectors/packet-bthci_vendor.c
+++ b/epan/dissectors/packet-bthci_vendor.c
@@ -314,12 +314,6 @@ static const value_string batch_scan_mode_vals[] = {
{ 0, NULL }
};
-static const value_string address_type_vals[] = {
- { 0x00, "Public" },
- { 0x01, "Random" },
- { 0, NULL }
-};
-
static const value_string batch_scan_discard_rule_vals[] = {
{ 0x00, "Old Items" },
{ 0x01, "Lower RSSI Items" },
@@ -1270,7 +1264,7 @@ proto_register_bthci_vendor_broadcom(void)
},
{ &hf_le_batch_scan_address_type,
{ "Address Type", "bthci_vendor.broadcom.le.batch_scan.address_type",
- FT_UINT8, BASE_HEX, VALS(address_type_vals), 0x0,
+ FT_UINT8, BASE_HEX, VALS(bluetooth_address_type_vals), 0x0,
NULL, HFILL }
},
{ &hf_le_batch_scan_discard_rule,
@@ -1305,7 +1299,7 @@ proto_register_bthci_vendor_broadcom(void)
},
{ &hf_le_multi_advertising_address_type,
{ "Address Type", "bthci_vendor.broadcom.le.multi_advertising.address_type",
- FT_UINT8, BASE_HEX, VALS(address_type_vals), 0x0,
+ FT_UINT8, BASE_HEX, VALS(bluetooth_address_type_vals), 0x0,
NULL, HFILL }
},
{ &hf_le_multi_advertising_type,