diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-12-12 11:24:44 +0100 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2014-12-18 11:03:05 +0000 |
| commit | f5cd21543d332f6c14da88ebd50730750f791dd4 (patch) | |
| tree | b10694bfabdbdb3d20bb0c011fe9c489676d59e6 /epan/dissectors/packet-btavdtp.c | |
| parent | 4a467ff609f1b5ee99cbc1aaccdc7b78d3cbecbc (diff) | |
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 <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors/packet-btavdtp.c')
| -rw-r--r-- | epan/dissectors/packet-btavdtp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index d4c6fbcfff..ea63ef335a 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -30,11 +30,12 @@ #include <epan/wmem/wmem.h> #include <wiretap/wtap.h> +#include "packet-bluetooth.h" #include "packet-btl2cap.h" #include "packet-btsdp.h" #include "packet-btavdtp.h" -#include "packet-rtp.h" #include "packet-btavrcp.h" +#include "packet-rtp.h" #define AVDTP_MESSAGE_TYPE_MASK 0x03 #define AVDTP_PACKET_TYPE_MASK 0x0C @@ -500,8 +501,6 @@ static const value_string vendor_apt_codec_vals[] = { { 0, NULL } }; -extern value_string_ext bthci_evt_comp_id_ext; - enum sep_state { SEP_STATE_FREE, SEP_STATE_OPEN, @@ -1320,7 +1319,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) channels_info->control_remote_cid = l2cap_data->remote_cid; channels_info->media_local_cid = BTL2CAP_UNKNOWN_CID; channels_info->media_remote_cid = BTL2CAP_UNKNOWN_CID; - channels_info->disconnect_in_frame = G_MAXUINT32; + channels_info->disconnect_in_frame = max_disconnect_in_frame; channels_info->l2cap_disconnect_in_frame = l2cap_data->disconnect_in_frame; channels_info->hci_disconnect_in_frame = l2cap_data->hci_disconnect_in_frame; channels_info->adapter_disconnect_in_frame = l2cap_data->adapter_disconnect_in_frame; @@ -2510,7 +2509,7 @@ proto_register_btavdtp(void) }, { &hf_btavdtp_vendor_id, { "Vendor ID", "btavdtp.codec.vendor.vendor_id", - FT_UINT32, BASE_HEX|BASE_EXT_STRING, &bthci_evt_comp_id_ext, 0x00, + FT_UINT32, BASE_HEX|BASE_EXT_STRING, &bluetooth_company_id_vals_ext, 0x00, NULL, HFILL } }, { &hf_btavdtp_vendor_specific_codec_id, @@ -2932,7 +2931,7 @@ proto_register_bta2dp(void) }, { &hf_bta2dp_vendor_id, { "Vendor ID", "bta2dp.codec.vendor.vendor_id", - FT_UINT32, BASE_HEX|BASE_EXT_STRING, &bthci_evt_comp_id_ext, 0x00, + FT_UINT32, BASE_HEX|BASE_EXT_STRING, &bluetooth_company_id_vals_ext, 0x00, NULL, HFILL } }, { &hf_bta2dp_vendor_codec_id, |