From f5cd21543d332f6c14da88ebd50730750f791dd4 Mon Sep 17 00:00:00 2001 From: Michal Labedzki Date: Fri, 12 Dec 2014 11:24:44 +0100 Subject: Bluetooth: Add generic Bluetooth dissector Bluetooth dissector is used to add ability to filter all bluetooth payload from capture files (there are many transport like: hci_h4, hci_h1, hci_usb, hci_mon, btle). Also it is used to placeholder for all data tree used to store additional informations like bd_addrs, names, etc. Finally it is used to be one point for Bluetooth Endpoints/Conversation filtering what is enabled now. Also add Master/Slave Role and Connection Mode tracking. Change-Id: I67048080fb8ee16fa0f4ec429c1257de81ddd737 Reviewed-on: https://code.wireshark.org/review/5771 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Michal Labedzki --- epan/dissectors/packet-usb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-usb.c') diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index a2ed1559cd..6befa27417 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -2665,7 +2665,7 @@ try_dissect_next_protocol(proto_tree *tree, tvbuff_t *next_tvb, packet_info *pin /* try dissect by "usb.device" */ ret = dissector_try_uint_new(device_to_dissector, (guint32)(usb_conv_info->bus_id<<16 | usb_conv_info->device_address), - next_tvb, pinfo, parent, FALSE, usb_conv_info); + next_tvb, pinfo, parent, TRUE, usb_conv_info); if (ret) return tvb_captured_length(next_tvb); @@ -2690,7 +2690,7 @@ try_dissect_next_protocol(proto_tree *tree, tvbuff_t *next_tvb, packet_info *pin device_protocol_data->device_address == usb_conv_info->device_address) { ret = dissector_try_uint_new(protocol_to_dissector, (guint32)device_protocol_data->protocol, - next_tvb, pinfo, parent, FALSE, usb_conv_info); + next_tvb, pinfo, parent, TRUE, usb_conv_info); if (ret) return tvb_captured_length(next_tvb); } @@ -2701,7 +2701,7 @@ try_dissect_next_protocol(proto_tree *tree, tvbuff_t *next_tvb, packet_info *pin device_product_data->device_address == usb_conv_info->device_address) { ret = dissector_try_uint_new(product_to_dissector, (guint32)(device_product_data->vendor<<16 | device_product_data->product), - next_tvb, pinfo, parent, FALSE, usb_conv_info); + next_tvb, pinfo, parent, TRUE, usb_conv_info); if (ret) return tvb_captured_length(next_tvb); } -- cgit v1.2.3