osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/epan/dissectors/packet-btle.c

5221 lines
239 KiB
C
Raw Normal View History

From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
/* packet-btle.c
* Routines for Bluetooth Low Energy Link Layer dissection
* https://www.bluetooth.org/Technical/Specifications/adopted.htm
*
* Copyright 2013, Mike Ryan, mikeryan /at/ isecpartners /dot/ com
* Copyright 2013, Michal Labedzki for Tieto Corporation
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
* Copyright 2014, Christopher D. Kilgour, techie at whiterocker dot com
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
* Copyright 2017, Stig Bjorlykke for Nordic Semiconductor
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
* Copyright 2021, Thomas Sailer
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
dissectors: use SPDX identifiers. Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-12 11:23:27 +00:00
* SPDX-License-Identifier: GPL-2.0-or-later
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
*/
#include "config.h"
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/expert.h>
Move the proto data stuff out of frame_data.[ch]. It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-25 01:10:20 +00:00
#include <epan/proto_data.h>
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
#include <epan/reassemble.h>
Move the proto data stuff out of frame_data.[ch]. It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-25 01:10:20 +00:00
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
#include <wiretap/wtap.h>
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
#include "packet-btle.h"
Bluetooth: HCI: Add command-event tracking HCI Commands in most cases generate response in Event queue, so try to map event to command and give user response time information. Change-Id: Ib4956829b7d0064ab528aa3202f8f959d8d371b7 Reviewed-on: https://code.wireshark.org/review/8514 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-03 11:50:42 +00:00
#include "packet-bthci_cmd.h"
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
#include "packet-bthci_acl.h"
static int proto_btle = -1;
Bluetooth: BTLE: Fix data handling from previous dissector Check previous dissector before cast data parameter. That also causes Head overflow too. Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e Reviewed-on: https://code.wireshark.org/review/8512 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-08 07:10:35 +00:00
static int proto_btle_rf = -1;
[BLE] Make the Nordic BLE dissector fill in the btle_context_t struct. Change-Id: I14e62126d022dde10dcce2d7e974def0dc664b20 Reviewed-on: https://code.wireshark.org/review/16840 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 11:54:46 +00:00
static int proto_nordic_ble = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_access_address = -1;
Bluetooth: Add support for dissecting packet format on LE Coded PHY Add support for dissecting packet format on LE Coded PHY. This only includes one additional field, the Coding Indicator (CI) which provides information about the symbol rate of the FEC Block 2 of the pdu. The TERM1 and TERM2 bytes are like the preamble assumed not included in the PDU, these blocks are just bit-sequences for the radio and contains no important information. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531d Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36787 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-11 14:02:03 +00:00
static int hf_coding_indicator = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_crc = -1;
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>
2014-12-12 10:24:44 +00:00
static int hf_master_bd_addr = -1;
static int hf_slave_bd_addr = -1;
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
static int hf_length = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_advertising_header = -1;
static int hf_advertising_header_pdu_type = -1;
btle: Add Channel Selection Algorithm Change-Id: I4d215bfb991ecf057ee9f6dda346b2fe6cee0bad Reviewed-on: https://code.wireshark.org/review/23324 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-31 11:37:31 +00:00
static int hf_advertising_header_ch_sel = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_advertising_header_rfu_1 = -1;
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
static int hf_advertising_header_rfu_2 = -1;
static int hf_advertising_header_rfu_3 = -1;
static int hf_advertising_header_rfu_4 = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_advertising_header_randomized_tx = -1;
static int hf_advertising_header_randomized_rx = -1;
static int hf_advertising_header_length = -1;
static int hf_advertising_address = -1;
static int hf_initiator_addresss = -1;
Bluetooth: Set correct name of target address in ADV_DIRECT_IND PDU The initiator address field of the directed advertising PDU has been renamed to target address in newer versions of the Bluetooth specification. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345313 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36778 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-01 14:13:01 +00:00
static int hf_target_addresss = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_scanning_address = -1;
static int hf_scan_response_data = -1;
static int hf_link_layer_data = -1;
static int hf_link_layer_data_access_address = -1;
static int hf_link_layer_data_crc_init = -1;
static int hf_link_layer_data_window_size = -1;
static int hf_link_layer_data_window_offset = -1;
static int hf_link_layer_data_interval = -1;
static int hf_link_layer_data_latency = -1;
static int hf_link_layer_data_timeout = -1;
static int hf_link_layer_data_channel_map = -1;
static int hf_link_layer_data_hop = -1;
static int hf_link_layer_data_sleep_clock_accuracy = -1;
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
static int hf_extended_advertising_header = -1;
static int hf_extended_advertising_header_length = -1;
static int hf_extended_advertising_mode = -1;
static int hf_extended_advertising_flags = -1;
static int hf_extended_advertising_flags_adva = -1;
static int hf_extended_advertising_flags_targeta = -1;
static int hf_extended_advertising_flags_cteinfo = -1;
static int hf_extended_advertising_flags_advdatainfo = -1;
static int hf_extended_advertising_flags_aux_ptr = -1;
static int hf_extended_advertising_flags_sync_info = -1;
static int hf_extended_advertising_flags_tx_power = -1;
static int hf_extended_advertising_flags_reserved = -1;
static int hf_extended_advertising_cte_info = -1;
static int hf_extended_advertising_cte_info_time = -1;
static int hf_extended_advertising_cte_info_rfu = -1;
static int hf_extended_advertising_cte_info_type = -1;
static int hf_extended_advertising_data_info = -1;
static int hf_extended_advertising_data_info_did = -1;
static int hf_extended_advertising_data_info_sid = -1;
static int hf_extended_advertising_aux_ptr = -1;
static int hf_extended_advertising_aux_ptr_channel = -1;
static int hf_extended_advertising_aux_ptr_ca = -1;
static int hf_extended_advertising_aux_ptr_offset_units = -1;
static int hf_extended_advertising_aux_ptr_aux_offset = -1;
static int hf_extended_advertising_aux_ptr_aux_phy = -1;
static int hf_extended_advertising_sync_info = -1;
static int hf_extended_advertising_sync_info_offset = -1;
static int hf_extended_advertising_sync_info_offset_units = -1;
static int hf_extended_advertising_sync_info_offset_adjust = -1;
static int hf_extended_advertising_sync_info_reserved = -1;
static int hf_extended_advertising_sync_info_interval = -1;
static int hf_extended_advertising_sync_info_channel_map = -1;
static int hf_extended_advertising_sync_info_sleep_clock_accuracy = -1;
static int hf_extended_advertising_sync_info_access_address = -1;
static int hf_extended_advertising_sync_info_crc_init = -1;
static int hf_extended_advertising_sync_info_event_counter = -1;
static int hf_extended_advertising_tx_power = -1;
static int hf_extended_advertising_header_acad = -1;
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
static int hf_extended_advertising_had_fragment = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_data_header = -1;
static int hf_data_header_length = -1;
static int hf_data_header_rfu = -1;
static int hf_data_header_llid = -1;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static int hf_data_header_llid_connectediso = -1;
static int hf_data_header_llid_broadcastiso = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_data_header_more_data = -1;
static int hf_data_header_sequence_number = -1;
static int hf_data_header_next_expected_sequence_number = -1;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static int hf_data_header_rfu_57 = -1;
static int hf_data_header_rfu_67 = -1;
static int hf_data_header_close_isochronous_event = -1;
static int hf_data_header_null_pdu_indicator = -1;
static int hf_data_header_control_subevent_sequence_number = -1;
static int hf_data_header_control_subevent_transmission_flag = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_control_opcode = -1;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
static int hf_l2cap_index = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static int hf_l2cap_fragment = -1;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
static int hf_connection_parameters_in = -1;
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
static int hf_control_reject_opcode = -1;
static int hf_control_error_code = -1;
static int hf_control_unknown_type = -1;
static int hf_control_version_number = -1;
static int hf_control_company_id = -1;
static int hf_control_subversion_number = -1;
static int hf_control_feature_set = -1;
static int hf_control_feature_set_le_encryption = -1;
static int hf_control_feature_set_connection_parameters_request_procedure = -1;
static int hf_control_feature_set_extended_reject_indication = -1;
static int hf_control_feature_set_slave_initiated_features_exchange = -1;
static int hf_control_feature_set_le_ping = -1;
[BTLE] Add new Link layer Feature flags. Change-Id: Ib646d90c6e44075e7ae67f2022dc633fe6423c20 Reviewed-on: https://code.wireshark.org/review/16724 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-27 12:48:00 +00:00
static int hf_control_feature_set_le_pkt_len_ext = -1;
static int hf_control_feature_set_ll_privacy = -1;
static int hf_control_feature_set_ext_scan_flt_pol = -1;
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
static int hf_control_feature_set_le_2m_phy = -1;
static int hf_control_feature_set_stable_modulation_index_transmitter = -1;
static int hf_control_feature_set_stable_modulation_index_receiver = -1;
static int hf_control_feature_set_le_coded_phy = -1;
static int hf_control_feature_set_le_extended_advertising = -1;
static int hf_control_feature_set_le_periodic_advertising = -1;
static int hf_control_feature_set_channel_selection_algorithm_2 = -1;
static int hf_control_feature_set_le_power_class_1 = -1;
static int hf_control_feature_set_minimum_number_of_used_channels_procedure = -1;
static int hf_control_feature_set_reserved_bits = -1;
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
static int hf_control_feature_set_reserved = -1;
static int hf_control_window_size = -1;
static int hf_control_window_offset = -1;
static int hf_control_interval = -1;
static int hf_control_latency = -1;
static int hf_control_timeout = -1;
static int hf_control_instant = -1;
static int hf_control_interval_min = -1;
static int hf_control_interval_max = -1;
More spelling fixes, start of second pass of dissectors. Now easier to find errors due to script improvements and more complete dictionary file.
2020-08-30 21:34:34 +00:00
static int hf_control_preferred_periodicity = -1;
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
static int hf_control_reference_connection_event_count = -1;
static int hf_control_offset_0 = -1;
static int hf_control_offset_1 = -1;
static int hf_control_offset_2 = -1;
static int hf_control_offset_3 = -1;
static int hf_control_offset_4 = -1;
static int hf_control_offset_5 = -1;
static int hf_control_channel_map = -1;
static int hf_control_random_number = -1;
static int hf_control_encrypted_diversifier = -1;
static int hf_control_master_session_key_diversifier = -1;
static int hf_control_master_session_initialization_vector = -1;
static int hf_control_slave_session_key_diversifier = -1;
static int hf_control_slave_session_initialization_vector = -1;
btle: Add LL_LENGTH_REQ/RSP control data Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e Reviewed-on: https://code.wireshark.org/review/17932 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 18:17:29 +00:00
static int hf_control_max_rx_octets = -1;
static int hf_control_max_rx_time = -1;
static int hf_control_max_tx_octets = -1;
static int hf_control_max_tx_time = -1;
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
static int hf_control_phys_sender_le_1m_phy = -1;
static int hf_control_phys_sender_le_2m_phy = -1;
static int hf_control_phys_sender_le_coded_phy = -1;
static int hf_control_phys_update_le_1m_phy = -1;
static int hf_control_phys_update_le_2m_phy = -1;
static int hf_control_phys_update_le_coded_phy = -1;
static int hf_control_phys_reserved_bits = -1;
static int hf_control_tx_phys = -1;
static int hf_control_rx_phys = -1;
static int hf_control_m_to_s_phy = -1;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static int hf_control_m_to_s_phy_le_1m_phy = -1;
static int hf_control_m_to_s_phy_le_2m_phy = -1;
static int hf_control_m_to_s_phy_le_coded_phy = -1;
static int hf_control_m_to_s_phy_reserved_bits = -1;
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
static int hf_control_s_to_m_phy = -1;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static int hf_control_s_to_m_phy_le_1m_phy = -1;
static int hf_control_s_to_m_phy_le_2m_phy = -1;
static int hf_control_s_to_m_phy_le_coded_phy = -1;
static int hf_control_s_to_m_phy_reserved_bits = -1;
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
static int hf_control_phys = -1;
static int hf_control_phys_le_1m_phy = -1;
static int hf_control_phys_le_2m_phy = -1;
static int hf_control_phys_le_coded_phy = -1;
static int hf_control_min_used_channels = -1;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static int hf_control_cte_min_len_req = -1;
static int hf_control_cte_rfu = -1;
static int hf_control_cte_type_req = -1;
static int hf_control_sync_id = -1;
static int hf_control_sync_info_offset = -1;
static int hf_control_sync_info_offset_units = -1;
static int hf_control_sync_info_offset_adjust = -1;
static int hf_control_sync_info_reserved = -1;
static int hf_control_sync_info_interval = -1;
static int hf_control_sync_info_channel_map = -1;
static int hf_control_sync_info_sleep_clock_accuracy = -1;
static int hf_control_sync_info_access_address = -1;
static int hf_control_sync_info_crc_init = -1;
static int hf_control_sync_info_event_counter = -1;
static int hf_control_sync_conn_event_count = -1;
static int hf_control_sync_last_pa_event_counter = -1;
static int hf_control_sync_sid = -1;
static int hf_control_sync_atype = -1;
static int hf_control_sync_sleep_clock_accuracy = -1;
static int hf_control_sync_sync_conn_event_counter = -1;
static int hf_control_sleep_clock_accuracy = -1;
static int hf_control_cig_id = -1;
static int hf_control_cis_id = -1;
static int hf_control_max_sdu_m_to_s = -1;
static int hf_control_rfu_1 = -1;
static int hf_control_framed = -1;
static int hf_control_max_sdu_s_to_m = -1;
static int hf_control_rfu_2 = -1;
static int hf_control_sdu_interval_m_to_s = -1;
static int hf_control_rfu_3 = -1;
static int hf_control_sdu_interval_s_to_m = -1;
static int hf_control_rfu_4 = -1;
static int hf_control_max_pdu_m_to_s = -1;
static int hf_control_max_pdu_s_to_m = -1;
static int hf_control_num_sub_events = -1;
static int hf_control_sub_interval = -1;
static int hf_control_bn_m_to_s = -1;
static int hf_control_bn_s_to_m = -1;
static int hf_control_ft_m_to_s = -1;
static int hf_control_ft_s_to_m = -1;
static int hf_control_iso_interval = -1;
static int hf_control_cis_offset_min = -1;
static int hf_control_cis_offset_max = -1;
static int hf_control_conn_event_count = -1;
static int hf_control_access_address = -1;
static int hf_control_cis_offset = -1;
static int hf_control_cig_sync_delay = -1;
static int hf_control_cis_sync_delay = -1;
static int hf_control_pwr_phy = -1;
static int hf_control_pwr_phy_le_1m_phy = -1;
static int hf_control_pwr_phy_le_2m_phy = -1;
static int hf_control_pwr_phy_le_coded_s8_phy = -1;
static int hf_control_pwr_phy_le_coded_s2_phy = -1;
static int hf_control_pwr_phy_reserved_bits = -1;
static int hf_control_delta = -1;
static int hf_control_txpwr = -1;
static int hf_control_pwrflags = -1;
static int hf_control_pwrflags_min = -1;
static int hf_control_pwrflags_max = -1;
static int hf_control_pwrflags_reserved_bits = -1;
static int hf_control_acceptable_power_reduction = -1;
static int hf_big_control_opcode = -1;
static int hf_isochronous_data = -1;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
static int hf_btle_l2cap_msg_fragments = -1;
static int hf_btle_l2cap_msg_fragment = -1;
static int hf_btle_l2cap_msg_fragment_overlap = -1;
static int hf_btle_l2cap_msg_fragment_overlap_conflicts = -1;
static int hf_btle_l2cap_msg_fragment_multiple_tails = -1;
static int hf_btle_l2cap_msg_fragment_too_long_fragment = -1;
static int hf_btle_l2cap_msg_fragment_error = -1;
static int hf_btle_l2cap_msg_fragment_count = -1;
static int hf_btle_l2cap_msg_reassembled_in = -1;
static int hf_btle_l2cap_msg_reassembled_length = -1;
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
static int hf_btle_ea_host_advertising_data_fragments = -1;
static int hf_btle_ea_host_advertising_data_fragment = -1;
static int hf_btle_ea_host_advertising_data_fragment_overlap = -1;
static int hf_btle_ea_host_advertising_data_fragment_overlap_conflicts = -1;
static int hf_btle_ea_host_advertising_data_fragment_multiple_tails = -1;
static int hf_btle_ea_host_advertising_data_fragment_too_long_fragment = -1;
static int hf_btle_ea_host_advertising_data_fragment_error = -1;
static int hf_btle_ea_host_advertising_data_fragment_count = -1;
static int hf_btle_ea_host_advertising_data_reassembled_in = -1;
static int hf_btle_ea_host_advertising_data_reassembled_length = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
static int hf_request_in_frame = -1;
static int hf_response_in_frame = -1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static gint ett_btle = -1;
static gint ett_advertising_header = -1;
static gint ett_link_layer_data = -1;
static gint ett_data_header = -1;
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
static gint ett_features = -1;
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
static gint ett_tx_phys = -1;
static gint ett_rx_phys = -1;
static gint ett_m_to_s_phy = -1;
static gint ett_s_to_m_phy = -1;
static gint ett_phys = -1;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static gint ett_pwr_phy = -1;
static gint ett_cte = -1;
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
static gint ett_channel_map = -1;
static gint ett_scan_response_data = -1;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static gint ett_pwrflags = -1;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
static gint ett_btle_l2cap_msg_fragment = -1;
static gint ett_btle_l2cap_msg_fragments = -1;
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
static gint ett_btle_ea_host_advertising_data_fragment = -1;
static gint ett_btle_ea_host_advertising_data_fragments = -1;
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
static gint ett_extended_advertising_header = -1;
static gint ett_extended_advertising_flags = -1;
static gint ett_extended_advertising_cte_info = -1;
static gint ett_extended_advertising_data_info = -1;
static gint ett_extended_advertising_aux_pointer = -1;
static gint ett_extended_advertising_sync_info = -1;
Bluetooth: Complete Additional Controller Advertising Data dissecting Complete Additional Controller Advertising Data dissecting, this was just reported as advertising data in the extended header. Put it under a new tree for ACAD info in the extended header. Also fix the wrong length field used for the length of the ACAD field. In addition put the scan response data under it's own scan response, similar to SCAN_RSP handling. We can only do this if the context has given us the information that this is the aux scan response data. Remove an accidental addition used for debugging, and an empty if-statement for a reserved flag. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531e Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36835 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13 20:27:05 +00:00
static gint ett_extended_advertising_acad = -1;
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
Fix the type of arrays of pointers to hf_ values for bitfield routines. The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-19 01:14:46 +00:00
static int * const hfx_extended_advertising_flags[] = {
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
&hf_extended_advertising_flags_adva,
&hf_extended_advertising_flags_targeta,
&hf_extended_advertising_flags_cteinfo,
&hf_extended_advertising_flags_advdatainfo,
&hf_extended_advertising_flags_aux_ptr,
&hf_extended_advertising_flags_sync_info,
&hf_extended_advertising_flags_tx_power,
&hf_extended_advertising_flags_reserved,
NULL
};
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Fix the type of arrays of pointers to hf_ values for bitfield routines. The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-19 01:14:46 +00:00
static int * const hfx_control_feature_set_1[] = {
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
&hf_control_feature_set_le_encryption,
&hf_control_feature_set_connection_parameters_request_procedure,
&hf_control_feature_set_extended_reject_indication,
&hf_control_feature_set_slave_initiated_features_exchange,
&hf_control_feature_set_le_ping,
&hf_control_feature_set_le_pkt_len_ext,
&hf_control_feature_set_ll_privacy,
&hf_control_feature_set_ext_scan_flt_pol,
NULL
};
Fix the type of arrays of pointers to hf_ values for bitfield routines. The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-19 01:14:46 +00:00
static int * const hfx_control_feature_set_2[] = {
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
&hf_control_feature_set_le_2m_phy,
&hf_control_feature_set_stable_modulation_index_transmitter,
&hf_control_feature_set_stable_modulation_index_receiver,
&hf_control_feature_set_le_coded_phy,
&hf_control_feature_set_le_extended_advertising,
&hf_control_feature_set_le_periodic_advertising,
&hf_control_feature_set_channel_selection_algorithm_2,
&hf_control_feature_set_le_power_class_1,
NULL
};
Fix the type of arrays of pointers to hf_ values for bitfield routines. The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-19 01:14:46 +00:00
static int * const hfx_control_feature_set_3[] = {
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
&hf_control_feature_set_minimum_number_of_used_channels_procedure,
&hf_control_feature_set_reserved_bits,
NULL
};
Fix the type of arrays of pointers to hf_ values for bitfield routines. The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-19 01:14:46 +00:00
static int * const hfx_control_phys_sender[] = {
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
&hf_control_phys_sender_le_1m_phy,
&hf_control_phys_sender_le_2m_phy,
&hf_control_phys_sender_le_coded_phy,
&hf_control_phys_reserved_bits,
NULL
};
Fix the type of arrays of pointers to hf_ values for bitfield routines. The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-19 01:14:46 +00:00
static int * const hfx_control_phys_update[] = {
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
&hf_control_phys_update_le_1m_phy,
&hf_control_phys_update_le_2m_phy,
&hf_control_phys_update_le_coded_phy,
&hf_control_phys_reserved_bits,
NULL
};
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static int * const hfx_control_m_to_s_phy[] = {
&hf_control_m_to_s_phy_le_1m_phy,
&hf_control_m_to_s_phy_le_2m_phy,
&hf_control_m_to_s_phy_le_coded_phy,
&hf_control_m_to_s_phy_reserved_bits,
NULL
};
static int * const hfx_control_s_to_m_phy[] = {
&hf_control_s_to_m_phy_le_1m_phy,
&hf_control_s_to_m_phy_le_2m_phy,
&hf_control_s_to_m_phy_le_coded_phy,
&hf_control_s_to_m_phy_reserved_bits,
NULL
};
Fix the type of arrays of pointers to hf_ values for bitfield routines. The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-19 01:14:46 +00:00
static int * const hfx_control_phys[] = {
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
&hf_control_phys_le_1m_phy,
&hf_control_phys_le_2m_phy,
&hf_control_phys_le_coded_phy,
&hf_control_phys_reserved_bits,
NULL
};
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static int * const hfx_control_pwr_phy[] = {
&hf_control_pwr_phy_le_1m_phy,
&hf_control_pwr_phy_le_2m_phy,
&hf_control_pwr_phy_le_coded_s8_phy,
&hf_control_pwr_phy_le_coded_s2_phy,
&hf_control_pwr_phy_reserved_bits,
NULL
};
static int * const hfx_control_cte[] = {
&hf_control_cte_min_len_req,
&hf_control_cte_rfu,
&hf_control_cte_type_req,
NULL
};
static int * const hfx_control_periodicsyncflags[] = {
&hf_control_sync_sid,
&hf_control_sync_atype,
&hf_control_sync_sleep_clock_accuracy,
NULL
};
static int * const hfx_control_pwrflags[] = {
&hf_control_pwrflags_min,
&hf_control_pwrflags_max,
&hf_control_pwrflags_reserved_bits,
NULL
};
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static expert_field ei_unknown_data = EI_INIT;
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
static expert_field ei_access_address_matched = EI_INIT;
static expert_field ei_access_address_bit_errors = EI_INIT;
static expert_field ei_access_address_illegal = EI_INIT;
static expert_field ei_crc_cannot_be_determined = EI_INIT;
static expert_field ei_crc_incorrect = EI_INIT;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
static expert_field ei_missing_fragment_start = EI_INIT;
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
static expert_field ei_retransmit = EI_INIT;
bluetooth: Add context information for next expected sequence number Add context information for next expected sequence number so that analysing for acknowledgedment or request for retransmit can be done without comparing packets manually. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:56:45 +00:00
static expert_field ei_nack = EI_INIT;
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
static expert_field ei_control_proc_overlapping = EI_INIT;
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
static expert_field ei_control_proc_invalid_collision = EI_INIT;
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
static expert_field ei_control_proc_wrong_seq = EI_INIT;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static dissector_handle_t btle_handle;
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedski 1. add support for new btsnoop "format" introduced by BlueZ team in "btmon" tool 2. Bluetooth: Make EIR, AD and COD more generic 3. Bluetooth: HCI/LL: Update Error Codes to Core 4.1 Specification 4. Ubertooth: Fix response command handling 5. Ubertooth: Update to support firmware version 6. Ubertooth: Dissect by Vendor Id/Product Id svn path=/trunk/; revision=54699
2014-01-12 00:50:41 +00:00
static dissector_handle_t btcommon_ad_handle;
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
static dissector_handle_t btcommon_le_channel_map_handle;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static dissector_handle_t btl2cap_handle;
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
static wmem_tree_t *connection_info_tree;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static wmem_tree_t *broadcastiso_connection_info_tree;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
static wmem_tree_t *connection_parameter_info_tree;
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
static wmem_tree_t *adi_to_first_frame_tree;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
static guint32 l2cap_index;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
/* Reassembly */
static reassembly_table btle_l2cap_msg_reassembly_table;
static const fragment_items btle_l2cap_msg_frag_items = {
/* Fragment subtrees */
&ett_btle_l2cap_msg_fragment,
&ett_btle_l2cap_msg_fragments,
/* Fragment fields */
&hf_btle_l2cap_msg_fragments,
&hf_btle_l2cap_msg_fragment,
&hf_btle_l2cap_msg_fragment_overlap,
&hf_btle_l2cap_msg_fragment_overlap_conflicts,
&hf_btle_l2cap_msg_fragment_multiple_tails,
&hf_btle_l2cap_msg_fragment_too_long_fragment,
&hf_btle_l2cap_msg_fragment_error,
&hf_btle_l2cap_msg_fragment_count,
/* Reassembled in field */
&hf_btle_l2cap_msg_reassembled_in,
/* Reassembled length field */
&hf_btle_l2cap_msg_reassembled_length,
/* Reassembled data field */
NULL,
/* Tag */
btle: Renamed Message fragments to L2CAP fragments The already used terminology is L2CAP fragments. Change-Id: I900f5fed479e53c3a23154caa3b8a569c58dbb20 Reviewed-on: https://code.wireshark.org/review/16984 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-09 19:55:15 +00:00
"BTLE L2CAP fragments"
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
};
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>
2014-12-12 10:24:44 +00:00
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
/* Extended Advertising Host Advertising Data Reassembly */
static reassembly_table btle_ea_host_advertising_data_reassembly_table;
static const fragment_items btle_ea_host_advertising_data_frag_items = {
/* Fragment subtrees */
&ett_btle_ea_host_advertising_data_fragment,
&ett_btle_ea_host_advertising_data_fragments,
/* Fragment fields */
&hf_btle_ea_host_advertising_data_fragments,
&hf_btle_ea_host_advertising_data_fragment,
&hf_btle_ea_host_advertising_data_fragment_overlap,
&hf_btle_ea_host_advertising_data_fragment_overlap_conflicts,
&hf_btle_ea_host_advertising_data_fragment_multiple_tails,
&hf_btle_ea_host_advertising_data_fragment_too_long_fragment,
&hf_btle_ea_host_advertising_data_fragment_error,
&hf_btle_ea_host_advertising_data_fragment_count,
/* Reassembled in field */
&hf_btle_ea_host_advertising_data_reassembled_in,
/* Reassembled length field */
&hf_btle_ea_host_advertising_data_reassembled_length,
/* Reassembled data field */
NULL,
/* Tag */
"BTLE EA HAD fragments"
};
typedef struct _ae_had_info_t {
guint fragment_counter;
guint32 first_frame_num;
} ae_had_info_t;
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
typedef struct _control_proc_info_t {
/* Sequence of frame numbers of the control procedure used for request/response matching.
* The first entry corresponds to the request, the remaining frames are responses.
* The longest sequence is needed for the encryption start procedure,
* which consists of 5 frames. */
guint frames[5];
/* Opcode of the first control procedure packet. */
guint8 proc_opcode;
/* The frame where the procedure completes. Set to 0 when not yet known.
* This is used to avoid adding another frame to the control procedure
* sequence after the procedure was aborted early.
*
* This frame number may be ignored in the case where an LL_UNKNOWN_RSP is
* received after a procedure involving only one packet, like the
* LL_MIN_USED_CHANNELS_IND. */
guint last_frame;
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
/* The frame number of the packet containing the instant value.
* If set to 0, there is no such frame.
*
* We need to store this frame number, as any event counter is
* a valid instant. */
guint frame_with_instant_value;
/* The event counter corresponding to the instant of the control procedure. */
guint16 instant;
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
} control_proc_info_t;
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
/* Store information about a connection direction */
typedef struct _direction_info_t {
guint prev_seq_num : 1; /* Previous sequence number for this direction */
guint segmentation_started : 1; /* 0 = No, 1 = Yes */
guint segment_len_rem; /* The remaining segment length, used to find last segment */
guint32 l2cap_index; /* Unique identifier for each L2CAP message */
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
wmem_tree_t *control_procs; /* Control procedures initiated from this direction. */
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
} direction_info_t;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
typedef struct _connection_parameter_info_t {
guint32 parameters_frame;
} connection_parameter_info_t;
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
/* Store information about a connection */
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
typedef struct _connection_info_t {
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
/* Address information */
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>
2014-12-12 10:24:44 +00:00
guint32 interface_id;
guint32 adapter_id;
guint32 access_address;
guint8 master_bd_addr[6];
guint8 slave_bd_addr[6];
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
guint16 connection_parameter_update_instant;
connection_parameter_info_t *connection_parameter_update_info;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
/* Connection information */
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
/* Data used on the first pass to get info from previous frame, result will be in per_packet_data */
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
guint first_data_frame_seen : 1;
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
direction_info_t direction_info[3]; /* UNKNOWN, MASTER_SLAVE and SLAVE_MASTER */
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
} connection_info_t;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
/* Store information about a broadcast isochronous connection */
typedef struct _broadcastiso_connection_info_t {
/* Address information */
guint32 interface_id;
guint32 adapter_id;
guint32 access_address;
guint8 master_bd_addr[6];
} broadcastiso_connection_info_t;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
/* */
typedef struct _btle_frame_info_t {
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
guint retransmit : 1; /* 0 = No, 1 = Retransmitted frame */
bluetooth: Add context information for next expected sequence number Add context information for next expected sequence number so that analysing for acknowledgedment or request for retransmit can be done without comparing packets manually. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:56:45 +00:00
guint ack : 1; /* 0 = Nack, 1 = Ack */
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
guint more_fragments : 1; /* 0 = Last fragment, 1 = More fragments */
guint missing_start : 1; /* 0 = No, 1 = Missing fragment start */
guint32 l2cap_index; /* Unique identifier for each L2CAP message */
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
} btle_frame_info_t;
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>
2014-12-12 10:24:44 +00:00
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static const value_string pdu_type_vals[] = {
{ 0x00, "ADV_IND" },
{ 0x01, "ADV_DIRECT_IND" },
{ 0x02, "ADV_NONCONN_IND" },
{ 0x03, "SCAN_REQ" },
{ 0x04, "SCAN_RSP" },
Bluetooth: Rename packet names that has changed from REQ to IND in the spec Rename packets names that has changed in the bluetooth core specification. Requests have responses, indications have no response. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345310 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36775 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-03-29 20:23:08 +00:00
{ 0x05, "CONNECT_IND" },
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ 0x06, "ADV_SCAN_IND" },
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
{ 0x07, "ADV_EXT_IND" },
{ 0x08, "AUX_CONNECT_RSP" },
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ 0, NULL }
};
static value_string_ext pdu_type_vals_ext = VALUE_STRING_EXT_INIT(pdu_type_vals);
bluetooth: Provide auxiliary PDU types name from capture context Provide a mechanism for the capture context to provide the auxiliary PDU type name since this value cannot be inferred from the bytestream and must be taken from context instead. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345319 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36783 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-11 12:55:39 +00:00
static const value_string aux_pdu_type_vals[] = {
{ 0x03, "AUX_SCAN_REQ" },
{ 0x05, "AUX_CONNECT_REQ" },
{ 0x07, "AUX_COMMON" },
{ 0x08, "AUX_CONNECT_RSP" },
{ 0, NULL}
};
static value_string_ext aux_pdu_type_vals_ext = VALUE_STRING_EXT_INIT(aux_pdu_type_vals);
static const value_string aux_pdu_common_vals[] = {
{ 0, "AUX_ADV_IND" },
{ 1, "AUX_CHAIN_IND" },
{ 2, "AUX_SYNC_IND" },
{ 3, "AUX_SCAN_RSP" },
{ 0, NULL}
};
static value_string_ext aux_pdu_common_vals_ext = VALUE_STRING_EXT_INIT(aux_pdu_common_vals);
Bluetooth: Add support for dissecting packet format on LE Coded PHY Add support for dissecting packet format on LE Coded PHY. This only includes one additional field, the Coding Indicator (CI) which provides information about the symbol rate of the FEC Block 2 of the pdu. The TERM1 and TERM2 bytes are like the preamble assumed not included in the PDU, these blocks are just bit-sequences for the radio and contains no important information. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531d Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36787 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-11 14:02:03 +00:00
static const value_string le_coding_indicators[] =
{
{ 0, "FEC Block 2 coded using S=8" },
{ 1, "FEC Block 2 coded using S=2" },
{ 2, "Reserved" },
{ 3, "Reserved" },
{ 0, NULL }
};
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static const value_string sleep_clock_accuracy_vals[] = {
{ 0x00, "251 ppm to 500 ppm" },
{ 0x01, "151 ppm to 250 ppm" },
{ 0x02, "101 ppm to 150 ppm" },
{ 0x03, "76 ppm to 100 ppm" },
{ 0x04, "51 ppm to 75 ppm" },
{ 0x05, "31 ppm to 50 ppm" },
{ 0x06, "21 ppm to 30 ppm" },
{ 0x07, "0 ppm to 20 ppm" },
{ 0, NULL }
};
static value_string_ext sleep_clock_accuracy_vals_ext = VALUE_STRING_EXT_INIT(sleep_clock_accuracy_vals);
static const value_string llid_codes_vals[] = {
{ 0x01, "Continuation fragment of an L2CAP message, or an Empty PDU" },
{ 0x02, "Start of an L2CAP message or a complete L2CAP message with no fragmentation" },
{ 0x03, "Control PDU" },
{ 0, NULL }
};
static value_string_ext llid_codes_vals_ext = VALUE_STRING_EXT_INIT(llid_codes_vals);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static const value_string llid_connectediso_codes_vals[] = {
{ 0x00, "Unframed CIS Data PDU; end fragment of an SDU or a complete SDU" },
{ 0x01, "Unframed CIS Data PDU; start or continuation fragment of an SDU" },
{ 0x02, "Framed CIS Data PDU; one or more segments of an SDU" },
{ 0, NULL }
};
static value_string_ext llid_connectediso_codes_vals_ext = VALUE_STRING_EXT_INIT(llid_connectediso_codes_vals);
static const value_string llid_broadcastiso_codes_vals[] = {
{ 0x00, "Unframed BIS Data PDU; end fragment of an SDU or a complete SDU" },
{ 0x01, "Unframed BIS Data PDU; start or continuation fragment of an SDU" },
{ 0x02, "Framed BIS Data PDU; one or more segments of an SDU" },
{ 0x03, "BIG Control PDU" },
{ 0, NULL }
};
static value_string_ext llid_broadcastiso_codes_vals_ext = VALUE_STRING_EXT_INIT(llid_broadcastiso_codes_vals);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static const value_string control_opcode_vals[] = {
Bluetooth: Rename packet names that has changed from REQ to IND in the spec Rename packets names that has changed in the bluetooth core specification. Requests have responses, indications have no response. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345310 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36775 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-03-29 20:23:08 +00:00
{ 0x00, "LL_CONNECTION_UPDATE_IND" },
{ 0x01, "LL_CHANNEL_MAP_IND" },
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ 0x02, "LL_TERMINATE_IND" },
{ 0x03, "LL_ENC_REQ" },
{ 0x04, "LL_ENC_RSP" },
{ 0x05, "LL_START_ENC_REQ" },
{ 0x06, "LL_START_ENC_RSP" },
{ 0x07, "LL_UNKNOWN_RSP" },
{ 0x08, "LL_FEATURE_REQ" },
{ 0x09, "LL_FEATURE_RSP" },
{ 0x0A, "LL_PAUSE_ENC_REQ" },
{ 0x0B, "LL_PAUSE_ENC_RSP" },
{ 0x0C, "LL_VERSION_IND" },
{ 0x0D, "LL_REJECT_IND" },
{ 0x0E, "LL_SLAVE_FEATURE_REQ" },
{ 0x0F, "LL_CONNECTION_PARAM_REQ" },
{ 0x10, "LL_CONNECTION_PARAM_RSP" },
btle: LL_REJECT_IND_EXT -> LL_REJECT_EXT_IND Use the name defined by the Bluetooth Specification. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-10 19:50:25 +00:00
{ 0x11, "LL_REJECT_EXT_IND" },
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ 0x12, "LL_PING_REQ" },
{ 0x13, "LL_PING_RSP" },
btle: Add LL_LENGTH_REQ/RSP control data Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e Reviewed-on: https://code.wireshark.org/review/17932 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 18:17:29 +00:00
{ 0x14, "LL_LENGTH_REQ" },
{ 0x15, "LL_LENGTH_RSP" },
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
{ 0x16, "LL_PHY_REQ" },
{ 0x17, "LL_PHY_RSP" },
{ 0x18, "LL_PHY_UPDATE_IND" },
{ 0x19, "LL_MIN_USED_CHANNELS_IND" },
btle: Add Version 5.2 to ll_version_number_vals Add control opcode values from 5.2 spec. Change-Id: I64e91c09fc9fd2f28fa046efce349deb96de1678 Reviewed-on: https://code.wireshark.org/review/35991 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-01-31 11:17:38 +00:00
{ 0x1A, "LL_CTE_REQ" },
{ 0x1B, "LL_CTE_RSP" },
{ 0x1C, "LL_PERIODIC_SYNC_IND" },
{ 0x1D, "LL_CLOCK_ACCURACY_REQ" },
{ 0x1E, "LL_CLOCK_ACCURACY_RSP" },
{ 0x1F, "LL_CIS_REQ" },
{ 0x20, "LL_CIS_RSP" },
{ 0x21, "LL_CIS_IND" },
{ 0x22, "LL_CIS_TERMINATE_IND" },
{ 0x23, "LL_POWER_CONTROL_REQ" },
{ 0x24, "LL_POWER_CONTROL_RSP" },
{ 0x25, "LL_POWER_CHANGE_IND" },
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ 0, NULL }
};
static value_string_ext control_opcode_vals_ext = VALUE_STRING_EXT_INIT(control_opcode_vals);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static const value_string big_control_opcode_vals[] = {
{ 0x00, "BIG_CHANNEL_MAP_IND" },
{ 0x01, "BIG_TERMINATE_IND" },
{ 0, NULL }
};
static value_string_ext big_control_opcode_vals_ext = VALUE_STRING_EXT_INIT(big_control_opcode_vals);
btle: Add Version 5.2 to ll_version_number_vals Add control opcode values from 5.2 spec. Change-Id: I64e91c09fc9fd2f28fa046efce349deb96de1678 Reviewed-on: https://code.wireshark.org/review/35991 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-01-31 11:17:38 +00:00
/* Taken from https://www.bluetooth.com/specifications/assigned-numbers/link-layer/ */
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
static const value_string ll_version_number_vals[] = {
[BTLE] Add Version 4.2 to ll_version_number_vals Change-Id: I88e988e11e1cae6f2f6f6d190890b62f2beb1e92 Reviewed-on: https://code.wireshark.org/review/16745 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-28 09:13:15 +00:00
{ 0x06, "4.0"},
{ 0x07, "4.1" },
{ 0x08, "4.2" },
btle: Add Version 5.0 to ll_version_number_vals Change-Id: I427da1f56a69785b70e965e08696fa24b114bb9c Reviewed-on: https://code.wireshark.org/review/23323 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-31 11:36:22 +00:00
{ 0x09, "5.0" },
btle: Add Version 5.1 to ll_version_number_vals Change-Id: I777dcaa6bd7f161ecbdc7411c3f816480c76834d Reviewed-on: https://code.wireshark.org/review/31827 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-01-31 08:15:39 +00:00
{ 0x0A, "5.1" },
btle: Add Version 5.2 to ll_version_number_vals Add control opcode values from 5.2 spec. Change-Id: I64e91c09fc9fd2f28fa046efce349deb96de1678 Reviewed-on: https://code.wireshark.org/review/35991 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-01-31 11:17:38 +00:00
{ 0x0B, "5.2" },
btle: Add Version 5.0 to ll_version_number_vals Change-Id: I427da1f56a69785b70e965e08696fa24b114bb9c Reviewed-on: https://code.wireshark.org/review/23323 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-31 11:36:22 +00:00
{ 0, NULL }
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
};
static value_string_ext ll_version_number_vals_ext = VALUE_STRING_EXT_INIT(ll_version_number_vals);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
static const value_string advertising_mode_vals[] = {
{ 0x00, "Non-connectable Non-scannable" },
{ 0x01, "Connectable Non-scannable" },
{ 0x02, "Non-connectable Scannable"},
{ 0x03, "Reserved for future use"},
{ 0, NULL},
};
static value_string_ext advertising_mode_vals_ext = VALUE_STRING_EXT_INIT(advertising_mode_vals);
static const value_string le_phys[] =
{
{ 0, "LE 1M" },
{ 1, "LE 2M" },
{ 2, "LE Coded" },
{ 3, "Reserved" },
{ 4, "Reserved" },
{ 5, "Reserved" },
{ 6, "Reserved" },
{ 7, "Reserved" },
{ 0, NULL }
};
static const value_string le_cte_type_vals[] = {
{ 0, "AoA Constant Tone Extension" },
{ 1, "AoD Constant Tone Extension with 1 usec slots" },
{ 2, "AoD Constant Tone Extension with 2 usec slots" },
{ 3, "Reserved for future use" },
{ 0, NULL }
};
static const true_false_string tfs_ca = {
"0 ppm to 50 ppm",
"51 ppm to 500 ppm"
};
static const true_false_string tfs_offset_units = {
"300 usec",
"30 usec"
};
static const true_false_string tfs_offset_adjust = {
"Adjusted 2.4576 seconds",
"No adjust"
};
btle: Add Channel Selection Algorithm Change-Id: I4d215bfb991ecf057ee9f6dda346b2fe6cee0bad Reviewed-on: https://code.wireshark.org/review/23324 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-31 11:37:31 +00:00
static const true_false_string tfs_ch_sel = {
"#2",
"#1"
};
btle: Improved packet header display Show elements in correct order. Show TxAdd and RxAdd values as "Random" or "Public". Change-Id: Ie75716d05d2aadf3d573a9dc078f32e6f981a691 Reviewed-on: https://code.wireshark.org/review/17012 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-11 15:57:25 +00:00
static const true_false_string tfs_random_public = {
"Random",
"Public"
};
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
void proto_register_btle(void);
void proto_reg_handoff_btle(void);
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
static gboolean btle_detect_retransmit = TRUE;
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
static void
btle_init(void)
{
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
l2cap_index = 0;
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
}
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
/*
* Implements Bluetooth Vol 6, Part B, Section 3.1.1 (ref Figure 3.2)
*
* At entry: tvb is entire BTLE packet without preamble
* payload_len is the Length field from the BTLE PDU header
* crc_init as defined in the specifications
*
* This implementation operates on nibbles and is therefore
* endian-neutral.
*/
static guint32
btle_crc(tvbuff_t *tvb, const guint8 payload_len, const guint32 crc_init)
{
static const guint16 btle_crc_next_state_flips[256] = {
0x0000, 0x32d8, 0x196c, 0x2bb4, 0x0cb6, 0x3e6e, 0x15da, 0x2702,
0x065b, 0x3483, 0x1f37, 0x2def, 0x0aed, 0x3835, 0x1381, 0x2159,
0x065b, 0x3483, 0x1f37, 0x2def, 0x0aed, 0x3835, 0x1381, 0x2159,
0x0000, 0x32d8, 0x196c, 0x2bb4, 0x0cb6, 0x3e6e, 0x15da, 0x2702,
0x0cb6, 0x3e6e, 0x15da, 0x2702, 0x0000, 0x32d8, 0x196c, 0x2bb4,
0x0aed, 0x3835, 0x1381, 0x2159, 0x065b, 0x3483, 0x1f37, 0x2def,
0x0aed, 0x3835, 0x1381, 0x2159, 0x065b, 0x3483, 0x1f37, 0x2def,
0x0cb6, 0x3e6e, 0x15da, 0x2702, 0x0000, 0x32d8, 0x196c, 0x2bb4,
0x196c, 0x2bb4, 0x0000, 0x32d8, 0x15da, 0x2702, 0x0cb6, 0x3e6e,
0x1f37, 0x2def, 0x065b, 0x3483, 0x1381, 0x2159, 0x0aed, 0x3835,
0x1f37, 0x2def, 0x065b, 0x3483, 0x1381, 0x2159, 0x0aed, 0x3835,
0x196c, 0x2bb4, 0x0000, 0x32d8, 0x15da, 0x2702, 0x0cb6, 0x3e6e,
0x15da, 0x2702, 0x0cb6, 0x3e6e, 0x196c, 0x2bb4, 0x0000, 0x32d8,
0x1381, 0x2159, 0x0aed, 0x3835, 0x1f37, 0x2def, 0x065b, 0x3483,
0x1381, 0x2159, 0x0aed, 0x3835, 0x1f37, 0x2def, 0x065b, 0x3483,
0x15da, 0x2702, 0x0cb6, 0x3e6e, 0x196c, 0x2bb4, 0x0000, 0x32d8,
0x32d8, 0x0000, 0x2bb4, 0x196c, 0x3e6e, 0x0cb6, 0x2702, 0x15da,
0x3483, 0x065b, 0x2def, 0x1f37, 0x3835, 0x0aed, 0x2159, 0x1381,
0x3483, 0x065b, 0x2def, 0x1f37, 0x3835, 0x0aed, 0x2159, 0x1381,
0x32d8, 0x0000, 0x2bb4, 0x196c, 0x3e6e, 0x0cb6, 0x2702, 0x15da,
0x3e6e, 0x0cb6, 0x2702, 0x15da, 0x32d8, 0x0000, 0x2bb4, 0x196c,
0x3835, 0x0aed, 0x2159, 0x1381, 0x3483, 0x065b, 0x2def, 0x1f37,
0x3835, 0x0aed, 0x2159, 0x1381, 0x3483, 0x065b, 0x2def, 0x1f37,
0x3e6e, 0x0cb6, 0x2702, 0x15da, 0x32d8, 0x0000, 0x2bb4, 0x196c,
0x2bb4, 0x196c, 0x32d8, 0x0000, 0x2702, 0x15da, 0x3e6e, 0x0cb6,
0x2def, 0x1f37, 0x3483, 0x065b, 0x2159, 0x1381, 0x3835, 0x0aed,
0x2def, 0x1f37, 0x3483, 0x065b, 0x2159, 0x1381, 0x3835, 0x0aed,
0x2bb4, 0x196c, 0x32d8, 0x0000, 0x2702, 0x15da, 0x3e6e, 0x0cb6,
0x2702, 0x15da, 0x3e6e, 0x0cb6, 0x2bb4, 0x196c, 0x32d8, 0x0000,
0x2159, 0x1381, 0x3835, 0x0aed, 0x2def, 0x1f37, 0x3483, 0x065b,
0x2159, 0x1381, 0x3835, 0x0aed, 0x2def, 0x1f37, 0x3483, 0x065b,
0x2702, 0x15da, 0x3e6e, 0x0cb6, 0x2bb4, 0x196c, 0x32d8, 0x0000
};
gint offset = 4; /* skip AA, CRC applies over PDU */
guint32 state = crc_init;
guint8 bytes_to_go = 2+payload_len; /* PDU includes header and payload */
while( bytes_to_go-- ) {
guint8 byte = tvb_get_guint8(tvb, offset++);
guint8 nibble = (byte & 0xf);
Make buildbot happy : packet-btle.c:275:16: error: declaration of 'index' shadows a global declaration [-Werror=shadow] Change-Id: I94e1da9f12c257fa4e2c597f29a200d35e2d5d0d Reviewed-on: https://code.wireshark.org/review/546 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-07 07:18:32 +00:00
guint8 byte_index = ((state >> 16) & 0xf0) | nibble;
state = ((state << 4) ^ btle_crc_next_state_flips[byte_index]) & 0xffffff;
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
nibble = ((byte >> 4) & 0xf);
Make buildbot happy : packet-btle.c:275:16: error: declaration of 'index' shadows a global declaration [-Werror=shadow] Change-Id: I94e1da9f12c257fa4e2c597f29a200d35e2d5d0d Reviewed-on: https://code.wireshark.org/review/546 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-07 07:18:32 +00:00
byte_index = ((state >> 16) & 0xf0) | nibble;
state = ((state << 4) ^ btle_crc_next_state_flips[byte_index]) & 0xffffff;
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
}
return state;
}
bluetooth: Provide auxiliary PDU types name from capture context Provide a mechanism for the capture context to provide the auxiliary PDU type name since this value cannot be inferred from the bytestream and must be taken from context instead. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345319 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36783 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-11 12:55:39 +00:00
static const gchar * adv_pdu_type_str_get(const btle_context_t *btle_context, guint32 pdu_type)
{
if (!btle_context || !(btle_context->channel < 37)) {
return val_to_str_ext_const(pdu_type, &pdu_type_vals_ext, "Unknown");
} else if (pdu_type == 0x07 && btle_context->aux_pdu_type_valid) {
return val_to_str_ext_const(btle_context->aux_pdu_type, &aux_pdu_common_vals_ext, "Unknown");
} else {
return val_to_str_ext_const(pdu_type, &aux_pdu_type_vals_ext, "Unknown");
}
}
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
/*
* Reverses the bits in each byte of a 32-bit word.
*
* Needed because CRCs are transmitted in bit-reversed order compared
* to the rest of the BTLE packet. See BT spec, Vol 6, Part B,
* Section 1.2.
*/
static guint32
reverse_bits_per_byte(const guint32 val)
{
const guint8 nibble_rev[16] = {
0x0, 0x8, 0x4, 0xc, 0x2, 0xa, 0x6, 0xe,
0x1, 0x9, 0x5, 0xd, 0x3, 0xb, 0x7, 0xf
};
guint32 retval = 0;
unsigned byte_index;
for (byte_index=0; byte_index<4; byte_index++) {
guint shiftA = byte_index*8;
guint shiftB = shiftA+4;
retval |= (nibble_rev[((val >> shiftA) & 0xf)] << shiftB);
retval |= (nibble_rev[((val >> shiftB) & 0xf)] << shiftA);
}
return retval;
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
static gint
dissect_feature_set(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_item *sub_item;
proto_tree *sub_tree;
sub_item = proto_tree_add_item(btle_tree, hf_control_feature_set, tvb, offset, 8, ENC_LITTLE_ENDIAN);
sub_tree = proto_item_add_subtree(sub_item, ett_features);
proto_tree_add_bitmask_list(sub_tree, tvb, offset, 1, hfx_control_feature_set_1, ENC_NA);
offset += 1;
proto_tree_add_bitmask_list(sub_tree, tvb, offset, 1, hfx_control_feature_set_2, ENC_NA);
offset += 1;
proto_tree_add_bitmask_list(sub_tree, tvb, offset, 1, hfx_control_feature_set_3, ENC_NA);
offset += 1;
proto_tree_add_item(sub_tree, hf_control_feature_set_reserved, tvb, offset, 5, ENC_NA);
offset += 5;
return offset;
}
static gint
dissect_conn_param_req_rsp(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_tree_add_item(btle_tree, hf_control_interval_min, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_interval_max, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_latency, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_timeout, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_preferred_periodicity, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_reference_connection_event_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_offset_0, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_offset_1, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_offset_2, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_offset_3, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_offset_4, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_offset_5, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
return offset;
}
static gint
dissect_length_req_rsp(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_tree_add_item(btle_tree, hf_control_max_rx_octets, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_max_rx_time, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_max_tx_octets, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_max_tx_time, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
return offset;
}
static gint
dissect_phy_req_rsp(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_tx_phys, ett_tx_phys, hfx_control_phys_sender, ENC_NA);
offset += 1;
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_rx_phys, ett_rx_phys, hfx_control_phys_sender, ENC_NA);
offset += 1;
return offset;
}
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static gint
dissect_periodic_sync_ind(tvbuff_t *tvb, proto_tree *btle_tree, gint offset, packet_info *pinfo, guint32 interface_id, guint32 adapter_id)
{
guint32 sync_offset, interval;
gint reserved_offset;
guint16 sf;
guint8 bd_addr[6];
proto_item *item;
proto_item *sub_item;
proto_tree *sub_tree;
/* ID */
proto_tree_add_item(btle_tree, hf_control_sync_id, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
/* Sync Info */
sf = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN);
item = proto_tree_add_item_ret_uint(btle_tree, hf_control_sync_info_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN, &sync_offset);
proto_tree_add_item(btle_tree, hf_control_sync_info_offset_units, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(btle_tree, hf_control_sync_info_offset_adjust, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(btle_tree, hf_control_sync_info_reserved, tvb, offset, 2, ENC_LITTLE_ENDIAN);
if (sync_offset > 0) {
proto_item_append_text(item, " (%u usec)", sync_offset * ((sf & 0x2000) != 0 ? 300 : 30) + ((sf & 0x4000) != 0 ? 2457600 : 0));
} else {
proto_item_append_text(item, " Cannot be represented");
}
offset += 2;
item = proto_tree_add_item_ret_uint(btle_tree, hf_control_sync_info_interval, tvb, offset, 2, ENC_LITTLE_ENDIAN, &interval);
proto_item_append_text(item, " (%g msec)", interval * 1.25);
offset += 2;
sub_item = proto_tree_add_item(btle_tree, hf_control_sync_info_channel_map, tvb, offset, 5, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_channel_map);
call_dissector_with_data(btcommon_le_channel_map_handle, tvb_new_subset_length(tvb, offset, 5), pinfo, sub_tree, &reserved_offset);
proto_tree_add_item(btle_tree, hf_control_sync_info_sleep_clock_accuracy, tvb, reserved_offset, 1, ENC_LITTLE_ENDIAN);
offset += 5;
proto_tree_add_item(btle_tree, hf_control_sync_info_access_address, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
proto_tree_add_item(btle_tree, hf_control_sync_info_crc_init, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_sync_info_event_counter, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
/* connEv */
proto_tree_add_item(btle_tree, hf_control_sync_conn_event_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_sync_last_pa_event_counter, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_bitmask_list(btle_tree, tvb, offset, 1, hfx_control_periodicsyncflags, ENC_NA);
offset += 1;
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_phys, ett_phys, hfx_control_phys, ENC_NA);
offset += 1;
offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, bd_addr);
proto_tree_add_item(btle_tree, hf_control_sync_sync_conn_event_counter, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
return offset;
}
static gint
dissect_cis_req(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
guint32 interval;
proto_item *item;
proto_tree_add_item(btle_tree, hf_control_cig_id, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_cis_id, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_m_to_s_phy, ett_m_to_s_phy, hfx_control_m_to_s_phy, ENC_NA);
offset += 1;
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_s_to_m_phy, ett_s_to_m_phy, hfx_control_s_to_m_phy, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_max_sdu_m_to_s, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(btle_tree, hf_control_rfu_1, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(btle_tree, hf_control_framed, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_max_sdu_s_to_m, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(btle_tree, hf_control_rfu_2, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_sdu_interval_m_to_s, tvb, offset, 3, ENC_LITTLE_ENDIAN);
proto_tree_add_item(btle_tree, hf_control_rfu_3, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_sdu_interval_s_to_m, tvb, offset, 3, ENC_LITTLE_ENDIAN);
proto_tree_add_item(btle_tree, hf_control_rfu_4, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_max_pdu_m_to_s, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_max_pdu_s_to_m, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_num_sub_events, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_sub_interval, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_bn_m_to_s, tvb, offset, 1, ENC_NA);
proto_tree_add_item(btle_tree, hf_control_bn_s_to_m, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_ft_m_to_s, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_ft_s_to_m, tvb, offset, 1, ENC_NA);
offset += 1;
item = proto_tree_add_item_ret_uint(btle_tree, hf_control_iso_interval, tvb, offset, 2, ENC_LITTLE_ENDIAN, &interval);
proto_item_append_text(item, " (%g msec)", interval * 1.25);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_cis_offset_min, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_cis_offset_max, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_conn_event_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
return offset;
}
static gint
dissect_cis_rsp(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_tree_add_item(btle_tree, hf_control_cis_offset_min, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_cis_offset_max, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_conn_event_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
return offset;
}
static gint
dissect_cis_ind(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_tree_add_item(btle_tree, hf_control_access_address, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
proto_tree_add_item(btle_tree, hf_control_cis_offset, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_cig_sync_delay, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_cis_sync_delay, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(btle_tree, hf_control_conn_event_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
return offset;
}
static gint
dissect_cis_terminate_ind(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_tree_add_item(btle_tree, hf_control_cig_id, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_cis_id, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_error_code, tvb, offset, 1, ENC_NA);
offset += 1;
return offset;
}
static gint
dissect_power_control_req(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_pwr_phy, ett_pwr_phy, hfx_control_pwr_phy, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_delta, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_txpwr, tvb, offset, 1, ENC_NA);
offset += 1;
return offset;
}
static gint
dissect_power_control_rsp(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_pwrflags, ett_pwrflags, hfx_control_pwrflags, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_delta, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_txpwr, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_acceptable_power_reduction, tvb, offset, 1, ENC_NA);
offset += 1;
return offset;
}
static gint
dissect_power_control_ind(tvbuff_t *tvb, proto_tree *btle_tree, gint offset)
{
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_pwr_phy, ett_pwr_phy, hfx_control_pwr_phy, ENC_NA);
offset += 1;
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_pwrflags, ett_pwrflags, hfx_control_pwrflags, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_delta, tvb, offset, 1, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_txpwr, tvb, offset, 1, ENC_NA);
offset += 1;
return offset;
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
static gint
dissect_ctrl_pdu_without_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *btle_tree, gint offset)
{
if (tvb_reported_length_remaining(tvb, offset) > 3) {
proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3);
offset += tvb_reported_length_remaining(tvb, offset) - 3;
}
return offset;
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* Mark the start of a new control procedure.
* At first visit it will create a new control procedure context.
* Otherwise it will update the existing context.
*
* If there is already an ongoing control procedure context, control procedure
* contexts will not be created or modified.
*
* It returns the procedure context in case it exists, otherwise NULL.
*/
Set a few more dissector vars/funs to static. These are the last of the easy ones to fix/set.
2021-02-14 22:41:46 +00:00
static control_proc_info_t *
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvbuff_t *tvb,
packet_info *pinfo,
proto_tree *btle_tree,
proto_item *control_proc_item,
wmem_tree_t *control_proc_tree,
guint8 opcode)
{
control_proc_info_t *proc_info;
if (!pinfo->fd->visited) {
/* Check the if there is an existing ongoing procedure. */
proc_info = (control_proc_info_t *)wmem_tree_lookup32_le(control_proc_tree, pinfo->num);
if (proc_info && proc_info->last_frame == 0) {
/* Control procedure violation - initiating new procedure before previous was complete */
return NULL;
} else {
/* Create a new control procedure context. */
proc_info = wmem_new0(wmem_file_scope(), control_proc_info_t);
memset(proc_info, 0, sizeof(control_proc_info_t));
proc_info->frames[0] = pinfo->num;
proc_info->proc_opcode = opcode;
wmem_tree_insert32(control_proc_tree, pinfo->num, proc_info);
}
} else {
/* Match the responses with this request. */
proc_info = (control_proc_info_t *)wmem_tree_lookup32(control_proc_tree, pinfo->num);
if (proc_info && proc_info->proc_opcode == opcode) {
proto_item *sub_item;
for (guint i = 1; i < sizeof(proc_info->frames)/sizeof(proc_info->frames[0]); i++) {
if (proc_info->frames[i]) {
sub_item = proto_tree_add_uint(btle_tree, hf_response_in_frame, tvb, 0, 0, proc_info->frames[i]);
proto_item_set_generated(sub_item);
}
}
} else {
/* The found control procedure does not match the last one.
* This indicates a protocol violation. */
expert_add_info(pinfo, control_proc_item, &ei_control_proc_overlapping);
return NULL;
}
}
return proc_info;
}
/* Checks if it is possible to add the frame at the given index
* to the given control procedure context.
*
* It does not care if the procedure is already marked as completed.
* Therefore this function can be used to add an LL_UNKNOWN_RSP to
* a completed connection parameter update procedure.
*/
static gboolean
control_proc_can_add_frame_even_if_complete(packet_info *pinfo,
control_proc_info_t *last_control_proc_info,
guint8 proc_opcode,
guint frame_num)
{
if (frame_num == 0)
return FALSE; /* This function must be used to add a frame to an ongoing procedure */
/* We need to check if the control procedure has been initiated. */
if (!last_control_proc_info)
return FALSE;
/* And that the new frame belongs to this control procedure */
if (last_control_proc_info->proc_opcode != proc_opcode)
return FALSE;
/* Previous frame has not yet been added. */
if (last_control_proc_info->frames[frame_num - 1] == 0)
return FALSE;
/* We need to check if we can add this frame at this index
* in the control procedure sequence. */
/* The first time we visit the frame, we just need to check that the
* spot is empty. */
if (!pinfo->fd->visited && last_control_proc_info->frames[frame_num])
return FALSE; /* Another opcode has already been added to the procedure at this index */
/* At later visits, we need to check that we are not replacing the frame with
* another frame. */
if (pinfo->fd->visited && (last_control_proc_info->frames[frame_num] != pinfo->num))
return FALSE;
return TRUE;
}
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
static gboolean
control_proc_is_complete(guint32 frame_num, control_proc_info_t const *last_control_proc_info)
{
if (last_control_proc_info->last_frame != 0 &&
frame_num > last_control_proc_info->last_frame)
return TRUE;
return FALSE;
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
static gboolean
control_proc_can_add_frame(packet_info *pinfo,
control_proc_info_t *last_control_proc_info,
guint8 proc_opcode,
guint frame_num)
{
if (!control_proc_can_add_frame_even_if_complete(pinfo,
last_control_proc_info,
proc_opcode,
frame_num))
return FALSE;
/* We check that we are not adding a frame to a completed procedure. */
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_is_complete(pinfo->num, last_control_proc_info))
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
return FALSE;
return TRUE;
}
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
static void
control_proc_complete_if_instant_reached(guint frame_num,
guint16 event_counter,
control_proc_info_t *last_control_proc_info)
{
/* We need to check if the control procedure has been initiated. */
if (!last_control_proc_info)
return;
if (control_proc_is_complete(frame_num, last_control_proc_info))
return;
/* The instant can only be reached if the current frame is after
* the one containing the instant value. */
if ((last_control_proc_info->frame_with_instant_value == 0)||
(frame_num < last_control_proc_info->frame_with_instant_value))
return;
if (last_control_proc_info->instant == event_counter) {
/* Frame matches event counter, mark procedure as complete. */
last_control_proc_info->last_frame = frame_num;
}
}
static gboolean
control_proc_contains_instant(guint8 proc_opcode)
{
switch (proc_opcode)
{
case 0x00: /* LL_CONNECTION_UPDATE_IND */
case 0x01: /* LL_CHANNEL_MAP_UPDATE_IND */
case 0x0F: /* LL_CONNECTION_PARAM_REQ */
case 0x16: /* LL_PHY_REQ */
return TRUE;
default:
return FALSE;
}
}
/* Returns true if this frame contains an collision violating the specification.
*
* See Core_v5.2, Vol 6, Part B, Section 5.3 */
static gboolean
control_proc_invalid_collision(packet_info const *pinfo,
control_proc_info_t const *control_proc_other,
guint8 proc_opcode)
{
if (!control_proc_other)
return FALSE;
if (control_proc_is_complete(pinfo->num, control_proc_other))
return FALSE;
/* Both procedures must contain an instant to be marked as incompatible. */
if (!control_proc_contains_instant(control_proc_other->proc_opcode) ||
!control_proc_contains_instant(proc_opcode))
return FALSE;
/* From the Core Spec:
*
* If the peer has already sent at least one PDU as part of procedure A, the
* device should immediately exit the Connection State and transition to the
* Standby State.
*
* That is, if there exists are response in the other procedure at this point in
* time, there is a procedure violation.
*/
if (control_proc_other->frames[1] < pinfo->num)
return TRUE;
else
return FALSE;
}
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
static void
dissect_ad_eir(tvbuff_t *tvb, guint32 interface_id, guint32 adapter_id, guint32 frame_number, guint8 *src_bd_addr, packet_info *pinfo, proto_tree *tree)
{
bluetooth_eir_ad_data_t *ad_data = wmem_new0(wmem_packet_scope(), bluetooth_eir_ad_data_t);
ad_data->interface_id = interface_id;
ad_data->adapter_id = adapter_id;
call_dissector_with_data(btcommon_ad_handle, tvb, pinfo, tree, ad_data);
if (pinfo->fd->visited)
return;
for (gint offset = 0;; ) {
guint remain = tvb_reported_length_remaining(tvb, offset);
guint length;
guint8 opcode;
if (remain < 1)
break;
length = tvb_get_guint8(tvb, offset);
++offset;
if (length <= 0)
continue;
--remain;
if (remain < length)
break;
opcode = tvb_get_guint8(tvb, offset);
if (opcode == 0x2c && length >= 34) {
guint seed_access_address = tvb_get_guint32(tvb, offset + 14, ENC_LITTLE_ENDIAN);
guint32 trunc_seed_access_address = seed_access_address & 0x0041ffff;
broadcastiso_connection_info_t *nconnection_info;
wmem_tree_key_t key[5];
key[0].length = 1;
key[0].key = &interface_id;
key[1].length = 1;
key[1].key = &adapter_id;
key[2].length = 1;
key[2].key = &trunc_seed_access_address;
key[3].length = 1;
key[3].key = &frame_number;
key[4].length = 0;
key[4].key = NULL;
nconnection_info = wmem_new0(wmem_file_scope(), broadcastiso_connection_info_t);
nconnection_info->interface_id = interface_id;
nconnection_info->adapter_id = adapter_id;
nconnection_info->access_address = seed_access_address;
if (src_bd_addr)
memcpy(nconnection_info->master_bd_addr, src_bd_addr, 6);
wmem_tree_insert32_array(broadcastiso_connection_info_tree, key, nconnection_info);
}
offset += length;
}
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
static gint
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{
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>
2014-12-12 10:24:44 +00:00
proto_item *btle_item;
proto_tree *btle_tree;
proto_item *sub_item;
proto_tree *sub_tree;
gint offset = 0;
Use proto_tree_add_item instead of proto_tree_add_xxx. It's a little more efficient to use proto_tree_add_item, than proto_tree_add_xxx, passing it the returned tvb_get_xxx value. Change-Id: I22ddd7ab36e1ee5aae78fc693d7dbac4b4f802f2 Reviewed-on: https://code.wireshark.org/review/21691 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-16 18:48:34 +00:00
guint32 access_address, length;
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>
2014-12-12 10:24:44 +00:00
tvbuff_t *next_tvb;
guint8 *dst_bd_addr;
guint8 *src_bd_addr;
BT LE LL: fix invalid memory access reported by valgrind - broadcast_addr shoudl be static and not on call stack - set the AT_STRINGZ address length with the string length and not the buffer length Bug: 13381 Change-Id: I86e15ccaa9b5d7779c266ab24b637476e983664c Reviewed-on: https://code.wireshark.org/review/20103 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-14 17:04:02 +00:00
static const guint8 broadcast_addr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
connection_info_t *connection_info = NULL;
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>
2014-12-12 10:24:44 +00:00
wmem_tree_t *wmem_tree;
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
wmem_tree_key_t key[5], ae_had_key[4];
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>
2014-12-12 10:24:44 +00:00
guint32 interface_id;
guint32 adapter_id;
guint32 connection_access_address;
guint32 frame_number;
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
enum {CRC_INDETERMINATE,
CRC_CAN_BE_CALCULATED,
CRC_INCORRECT,
CRC_CORRECT} crc_status = CRC_INDETERMINATE;
guint32 crc_init = 0x555555; /* default to advertising channel's value */
guint32 packet_crc;
Bluetooth: BTLE: Fix data handling from previous dissector Check previous dissector before cast data parameter. That also causes Head overflow too. Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e Reviewed-on: https://code.wireshark.org/review/8512 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-08 07:10:35 +00:00
const btle_context_t *btle_context = NULL;
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>
2014-12-12 10:24:44 +00:00
bluetooth_data_t *bluetooth_data = NULL;
ubertooth_data_t *ubertooth_data = NULL;
Bluetooth: BTLE: Fix data handling from previous dissector Check previous dissector before cast data parameter. That also causes Head overflow too. Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e Reviewed-on: https://code.wireshark.org/review/8512 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-08 07:10:35 +00:00
gint previous_proto;
wmem_list_frame_t *list_data;
Show millisecond values as both raw and "(N msec)". Do as we do with other Bluetooth fields that, when multiplied by 1.25, give time amounts in milliseconds. Change-Id: I89c599e68f91c134b216c495dabdbf77db10def3 Reviewed-on: https://code.wireshark.org/review/17099 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-17 06:59:03 +00:00
proto_item *item;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
guint item_value;
Bluetooth: Provide BTLE physical channel pdu type from capture context. Add BTLE physical channel pdu type from capture context. The dissector uses the access address to determine if the packet is either an Advertising physical channel PDU or a Data physical channel PDU. This assupmtion is not valid for Periodic Advertising where the AUX_SYNC_IND advertising packet will be sent with a non-advertising access address. There is also the new Isochronous physical channel PDU which can be both broadcasted or connection-oriented. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345318 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36782 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-04-01 13:52:08 +00:00
guint8 btle_pdu_type = BTLE_PDU_TYPE_UNKNOWN;
Bluetooth: BTLE: Fix data handling from previous dissector Check previous dissector before cast data parameter. That also causes Head overflow too. Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e Reviewed-on: https://code.wireshark.org/review/8512 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-08 07:10:35 +00:00
list_data = wmem_list_frame_prev(wmem_list_tail(pinfo->layers));
if (list_data) {
previous_proto = GPOINTER_TO_INT(wmem_list_frame_data(list_data));
[BLE] Make the Nordic BLE dissector fill in the btle_context_t struct. Change-Id: I14e62126d022dde10dcce2d7e974def0dc664b20 Reviewed-on: https://code.wireshark.org/review/16840 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 11:54:46 +00:00
if ((previous_proto == proto_btle_rf)||(previous_proto == proto_nordic_ble)) {
Bluetooth: BTLE: Fix data handling from previous dissector Check previous dissector before cast data parameter. That also causes Head overflow too. Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e Reviewed-on: https://code.wireshark.org/review/8512 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-08 07:10:35 +00:00
btle_context = (const btle_context_t *) data;
bluetooth_data = btle_context->previous_protocol_data.bluetooth_data;
} else if (previous_proto == proto_bluetooth) {
bluetooth_data = (bluetooth_data_t *) data;
}
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>
2014-12-12 10:24:44 +00:00
Clean up handling of metadata in Bluetooth dissectors. Make the "previous protocol data" union in bluetooth_data_t a discriminated union, and use the discriminator to decide whether to use a given member of the union or not (or to check whether the member you plan to use is valid). Have separate top-level dissectors depending on what the data type pointed to by the "data" argument is. Use that member to point to pseudo-header metadata, and, for now, set it to point to the appropriate pinfo->pseudo_header value; eventually, we plan to pass the pseudo-header pointer in as the "data" argument from the "frame" dissector. Don't overwrite the pseudo-header in the packetlogger dissector - construct a new one and pass it in. Change-Id: Ia1ef71e7082a964c5d92d47221f8c00e32f3f087 Reviewed-on: https://code.wireshark.org/review/8943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16 03:23:24 +00:00
if (bluetooth_data && bluetooth_data->previous_protocol_data_type == BT_PD_UBERTOOTH_DATA) {
Bluetooth: BTLE: Fix data handling from previous dissector Check previous dissector before cast data parameter. That also causes Head overflow too. Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e Reviewed-on: https://code.wireshark.org/review/8512 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-08 07:10:35 +00:00
ubertooth_data = bluetooth_data->previous_protocol_data.ubertooth_data;
}
}
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
Fix Wpointer-sign warnings. Change-Id: Ia51998293b967f363856d2b9ac92f498a9f54d76 Reviewed-on: https://code.wireshark.org/review/37769 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-07 12:36:50 +00:00
src_bd_addr = (guint8 *) wmem_alloc(pinfo->pool, 6);
dst_bd_addr = (guint8 *) wmem_alloc(pinfo->pool, 6);
Bluetooth: BTLE: Add src/dst addresses when they are known Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-12 10:11:00 +00:00
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
if (btle_context && btle_context->crc_checked_at_capture) {
crc_status = btle_context->crc_valid_at_capture ? CRC_CORRECT : CRC_INCORRECT;
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LE LL");
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
btle_item = proto_tree_add_item(tree, proto_btle, tvb, offset, -1, ENC_NA);
btle_tree = proto_item_add_subtree(btle_item, ett_btle);
sub_item = proto_tree_add_item(btle_tree, hf_access_address, tvb, offset, 4, ENC_LITTLE_ENDIAN);
access_address = tvb_get_letohl(tvb, offset);
if (btle_context) {
switch(btle_context->aa_category) {
case E_AA_MATCHED:
expert_add_info(pinfo, sub_item, &ei_access_address_matched);
break;
case E_AA_ILLEGAL:
expert_add_info(pinfo, sub_item, &ei_access_address_illegal);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
break;
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
case E_AA_BIT_ERRORS:
expert_add_info(pinfo, sub_item, &ei_access_address_bit_errors);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
break;
default:
break;
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
}
offset += 4;
Bluetooth: Add support for dissecting packet format on LE Coded PHY Add support for dissecting packet format on LE Coded PHY. This only includes one additional field, the Coding Indicator (CI) which provides information about the symbol rate of the FEC Block 2 of the pdu. The TERM1 and TERM2 bytes are like the preamble assumed not included in the PDU, these blocks are just bit-sequences for the radio and contains no important information. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531d Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36787 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-11 14:02:03 +00:00
if (btle_context && btle_context->phy == LE_CODED_PHY) {
proto_tree_add_item(btle_tree, hf_coding_indicator, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
}
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>
2014-12-12 10:24:44 +00:00
if (bluetooth_data)
interface_id = bluetooth_data->interface_id;
Generalize wtap_pkthdr into a structure for packet and non-packet records. Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09 00:19:12 +00:00
else if (pinfo->rec->presence_flags & WTAP_HAS_INTERFACE_ID)
interface_id = pinfo->rec->rec_header.packet_header.interface_id;
Bluetooth: Fix interface_id Interface ID should correspond to the Wireshark Interface Id to avoid mixing data from various interfaces in dissectors. Change-Id: Ibaa3ddab7f0ebd0985efea74439b94a5881145a7 Reviewed-on: https://code.wireshark.org/review/472 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-03 07:51:04 +00:00
else
interface_id = HCI_INTERFACE_DEFAULT;
Fix some Coverity issue >>> CID 1349726: Incorrect expression (COPY_PASTE_ERROR) >>> "tvb_reported_length_remaining" in "tvb_reported_length_remaining(tvb, offset)" looks like a copy-paste error. >>> CID 1349727: Incorrect expression (COPY_PASTE_ERROR) >>> "tree" in "dissector_try_uint_new(bluetooth_eir_ad_manufacturer_company_id, company_id, new_tvb, pinfo, >>> CID 1349728: (DEADCODE) >>> Execution cannot reach this expression "0" inside statement "(0 && ((__s1_len = __builti...". >>> CID 1306904: Logically dead code (DEADCODE) >>> Execution cannot reach this statement "tap_hci_summary->interface_...". Change-Id: I5f99e37e6d5fac39da7082649caa8373d06bb808 Reviewed-on: https://code.wireshark.org/review/13739 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-21 08:23:42 +00:00
if (ubertooth_data)
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>
2014-12-12 10:24:44 +00:00
adapter_id = ubertooth_data->bus_id << 8 | ubertooth_data->device_address;
Fix some Coverity issue >>> CID 1349726: Incorrect expression (COPY_PASTE_ERROR) >>> "tvb_reported_length_remaining" in "tvb_reported_length_remaining(tvb, offset)" looks like a copy-paste error. >>> CID 1349727: Incorrect expression (COPY_PASTE_ERROR) >>> "tree" in "dissector_try_uint_new(bluetooth_eir_ad_manufacturer_company_id, company_id, new_tvb, pinfo, >>> CID 1349728: (DEADCODE) >>> Execution cannot reach this expression "0" inside statement "(0 && ((__s1_len = __builti...". >>> CID 1306904: Logically dead code (DEADCODE) >>> Execution cannot reach this statement "tap_hci_summary->interface_...". Change-Id: I5f99e37e6d5fac39da7082649caa8373d06bb808 Reviewed-on: https://code.wireshark.org/review/13739 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-21 08:23:42 +00:00
else if (bluetooth_data)
adapter_id = bluetooth_data->adapter_id;
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>
2014-12-12 10:24:44 +00:00
else
adapter_id = HCI_ADAPTER_DEFAULT;
Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:40:51 +00:00
frame_number = pinfo->num;
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>
2014-12-12 10:24:44 +00:00
Bluetooth: Provide BTLE physical channel pdu type from capture context. Add BTLE physical channel pdu type from capture context. The dissector uses the access address to determine if the packet is either an Advertising physical channel PDU or a Data physical channel PDU. This assupmtion is not valid for Periodic Advertising where the AUX_SYNC_IND advertising packet will be sent with a non-advertising access address. There is also the new Isochronous physical channel PDU which can be both broadcasted or connection-oriented. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345318 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36782 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-04-01 13:52:08 +00:00
if (btle_context) {
btle_pdu_type = btle_context->pdu_type;
}
if (btle_pdu_type == BTLE_PDU_TYPE_UNKNOWN) {
/* No context to provide us with physical channel pdu type, make an assumption from the access address */
btle_pdu_type = access_address == ACCESS_ADDRESS_ADVERTISING ? BTLE_PDU_TYPE_ADVERTISING : BTLE_PDU_TYPE_DATA;
}
if (btle_pdu_type == BTLE_PDU_TYPE_ADVERTISING) {
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
proto_item *advertising_header_item;
proto_tree *advertising_header_tree;
proto_item *link_layer_data_item;
proto_tree *link_layer_data_tree;
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
guint8 header, pdu_type;
gboolean ch_sel_valid = FALSE, tx_add_valid = FALSE, rx_add_valid = FALSE;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
if (crc_status == CRC_INDETERMINATE) {
/* Advertising channel CRCs can aways be calculated, because CRCInit is always known. */
crc_status = CRC_CAN_BE_CALCULATED;
}
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
key[0].length = 1;
key[0].key = &interface_id;
key[1].length = 1;
key[1].key = &adapter_id;
key[2].length = 1;
key[2].key = &access_address;
key[3].length = 0;
key[3].key = NULL;
wmem_tree = (wmem_tree_t *) wmem_tree_lookup32_array(connection_info_tree, key);
if (wmem_tree) {
connection_info = (connection_info_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->num);
if (connection_info) {
set_address(&pinfo->net_src, AT_ETHER, 6, connection_info->master_bd_addr);
copy_address_shallow(&pinfo->dl_src, &pinfo->net_src);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
memcpy(src_bd_addr, connection_info->master_bd_addr, 6);
}
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
advertising_header_item = proto_tree_add_item(btle_tree, hf_advertising_header, tvb, offset, 2, ENC_LITTLE_ENDIAN);
advertising_header_tree = proto_item_add_subtree(advertising_header_item, ett_advertising_header);
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
header = tvb_get_guint8(tvb, offset);
pdu_type = header & 0x0F;
Bluetooth: btle: Make RxAdd field reserved in some cases Specification: "If the TxAdd or RxAdd fields are not defined as used in a given PDU then they shall be considered Reserved for Future Use." Change-Id: I767c0df0366afe789624046cda2d49c9875ffe60 Reviewed-on: https://code.wireshark.org/review/103 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-30 07:44:35 +00:00
switch (pdu_type) {
case 0x00: /* ADV_IND */
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
ch_sel_valid = TRUE;
/* Fallthrough */
Bluetooth: btle: Make RxAdd field reserved in some cases Specification: "If the TxAdd or RxAdd fields are not defined as used in a given PDU then they shall be considered Reserved for Future Use." Change-Id: I767c0df0366afe789624046cda2d49c9875ffe60 Reviewed-on: https://code.wireshark.org/review/103 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-30 07:44:35 +00:00
case 0x02: /* ADV_NONCONN_IND */
case 0x06: /* ADV_SCAN_IND */
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
case 0x04: /* SCAN_RSP */
tx_add_valid = TRUE;
Bluetooth: btle: Make RxAdd field reserved in some cases Specification: "If the TxAdd or RxAdd fields are not defined as used in a given PDU then they shall be considered Reserved for Future Use." Change-Id: I767c0df0366afe789624046cda2d49c9875ffe60 Reviewed-on: https://code.wireshark.org/review/103 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-30 07:44:35 +00:00
break;
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
case 0x07: /* ADV_EXT_IND / AUX_ADV_IND / AUX_SYNC_IND / AUX_CHAIN_IND / AUX_SCAN_RSP */
case 0x08: /* AUX_CONNECT_RSP */
{
/* 0 + header, 1 = len, 2 = ext_len/adv-mode, 3 = flags */
guint8 ext_header_flags = tvb_get_guint8(tvb, offset + 3);
ch_sel_valid = FALSE;
tx_add_valid = (ext_header_flags & 0x01) != 0;
rx_add_valid = (ext_header_flags & 0x02) != 0;
break;
}
case 0x01: /* ADV_DIRECT_IND */
case 0x05: /* CONNECT_IND or AUX_CONNECT_REQ */
BTLE: check for btle_context Check for btle_context before accessing it. Bug: 16612 Change-Id: I8ad0237a6f742f4091e886b0151917542d2eea82 Reviewed-on: https://code.wireshark.org/review/37387 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-06 10:46:12 +00:00
if (btle_context && btle_context->channel >= 37) {
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
/* CONNECT_IND */
ch_sel_valid = TRUE;
}
/* Fallthrough */
case 0x03: /* SCAN_REQ or AUX_SCAN_REQ */
tx_add_valid = TRUE;
rx_add_valid = TRUE;
break;
}
bluetooth: Provide auxiliary PDU types name from capture context Provide a mechanism for the capture context to provide the auxiliary PDU type name since this value cannot be inferred from the bytestream and must be taken from context instead. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345319 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36783 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-11 12:55:39 +00:00
proto_item_append_text(advertising_header_item, " (PDU Type: %s", adv_pdu_type_str_get(btle_context, pdu_type));
item = proto_tree_add_item(advertising_header_tree, hf_advertising_header_pdu_type, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_item_append_text(item, " %s", adv_pdu_type_str_get(btle_context, pdu_type));
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
proto_tree_add_item(advertising_header_tree, hf_advertising_header_rfu_1, tvb, offset, 1, ENC_LITTLE_ENDIAN);
if (ch_sel_valid) {
proto_item_append_text(advertising_header_item, ", ChSel: %s",
Introduce tfs_get_string helper true_false_strings have no helper function to properly retrieve the string representing the true or false value, much like unit_strings, even though this is not uncommon in dissectors. This change introduces the helper function and modifies the dissectors, so that they use this helper i.s.o. their own expressions. Change-Id: I477ed2d90a9a529fc5dcfef7e3ea42ec180d27ae Reviewed-on: https://code.wireshark.org/review/36920 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-24 12:21:51 +00:00
tfs_get_string(header & 0x20, &tfs_ch_sel));
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
proto_tree_add_item(advertising_header_tree, hf_advertising_header_ch_sel, tvb, offset, 1, ENC_LITTLE_ENDIAN);
} else {
proto_tree_add_item(advertising_header_tree, hf_advertising_header_rfu_2, tvb, offset, 1, ENC_LITTLE_ENDIAN);
}
if (tx_add_valid) {
proto_item_append_text(advertising_header_item, ", TxAdd: %s",
Introduce tfs_get_string helper true_false_strings have no helper function to properly retrieve the string representing the true or false value, much like unit_strings, even though this is not uncommon in dissectors. This change introduces the helper function and modifies the dissectors, so that they use this helper i.s.o. their own expressions. Change-Id: I477ed2d90a9a529fc5dcfef7e3ea42ec180d27ae Reviewed-on: https://code.wireshark.org/review/36920 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-24 12:21:51 +00:00
tfs_get_string(header & 0x40, &tfs_random_public));
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
proto_tree_add_item(advertising_header_tree, hf_advertising_header_randomized_tx, tvb, offset, 1, ENC_LITTLE_ENDIAN);
} else {
proto_tree_add_item(advertising_header_tree, hf_advertising_header_rfu_3, tvb, offset, 1, ENC_LITTLE_ENDIAN);
}
if (rx_add_valid) {
btle: Improved packet header display Show elements in correct order. Show TxAdd and RxAdd values as "Random" or "Public". Change-Id: Ie75716d05d2aadf3d573a9dc078f32e6f981a691 Reviewed-on: https://code.wireshark.org/review/17012 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-11 15:57:25 +00:00
proto_item_append_text(advertising_header_item, ", RxAdd: %s",
Introduce tfs_get_string helper true_false_strings have no helper function to properly retrieve the string representing the true or false value, much like unit_strings, even though this is not uncommon in dissectors. This change introduces the helper function and modifies the dissectors, so that they use this helper i.s.o. their own expressions. Change-Id: I477ed2d90a9a529fc5dcfef7e3ea42ec180d27ae Reviewed-on: https://code.wireshark.org/review/36920 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-24 12:21:51 +00:00
tfs_get_string(header & 0x80, &tfs_random_public));
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
proto_tree_add_item(advertising_header_tree, hf_advertising_header_randomized_rx, tvb, offset, 1, ENC_LITTLE_ENDIAN);
} else {
proto_tree_add_item(advertising_header_tree, hf_advertising_header_rfu_4, tvb, offset, 1, ENC_LITTLE_ENDIAN);
Bluetooth: btle: Make RxAdd field reserved in some cases Specification: "If the TxAdd or RxAdd fields are not defined as used in a given PDU then they shall be considered Reserved for Future Use." Change-Id: I767c0df0366afe789624046cda2d49c9875ffe60 Reviewed-on: https://code.wireshark.org/review/103 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-30 07:44:35 +00:00
}
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
btle: Improved packet header display Show elements in correct order. Show TxAdd and RxAdd values as "Random" or "Public". Change-Id: Ie75716d05d2aadf3d573a9dc078f32e6f981a691 Reviewed-on: https://code.wireshark.org/review/17012 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-11 15:57:25 +00:00
proto_item_append_text(advertising_header_item, ")");
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
bluetooth: Provide auxiliary PDU types name from capture context Provide a mechanism for the capture context to provide the auxiliary PDU type name since this value cannot be inferred from the bytestream and must be taken from context instead. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345319 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36783 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-11 12:55:39 +00:00
col_set_str(pinfo->cinfo, COL_INFO, adv_pdu_type_str_get(btle_context, pdu_type));
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
offset += 1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
proto_tree_add_item(advertising_header_tree, hf_advertising_header_length, tvb, offset, 1, ENC_LITTLE_ENDIAN);
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
item = proto_tree_add_item_ret_uint(btle_tree, hf_length, tvb, offset, 1, ENC_LITTLE_ENDIAN, &length);
epan: Convert our PROTO_ITEM_ macros to inline functions. Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-03 21:32:30 +00:00
proto_item_set_hidden(item);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 1;
switch (pdu_type) {
case 0x00: /* ADV_IND */
case 0x02: /* ADV_NONCONN_IND */
case 0x06: /* ADV_SCAN_IND */
Qt/Bluetooth: Add Devices dialogue Please found it under Bluetooth menu. It shows all devices found in logs, not only connected, all that its address can be found in logs. Show if device is local (in most cases: capturing on it side) and manufacturer and LMP version what should answer the question what version of Bluetooth is used by Bluetooth device chip. Also firmware version. Change-Id: I32e3b7100cdebcaa850b6541de0ab89dff41c0e1 Reviewed-on: https://code.wireshark.org/review/8901 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-13 15:33:28 +00:00
offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, src_bd_addr);
Bluetooth: BTLE: Add src/dst addresses when they are known Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-12 10:11:00 +00:00
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr);
copy_address_shallow(&pinfo->dl_src, &pinfo->net_src);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
Bluetooth: BTLE: Add src/dst addresses when they are known Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-12 10:11:00 +00:00
Bluetooth: Fix conflicting address fields For Broadcast address use FT_ETHER with FF:FF:FF:FF:FF:FF address instead of string address "Broadcast". Change-Id: I638d3d6a1baa9c965dd0a9f548cedbd81af3ec5b Reviewed-on: https://code.wireshark.org/review/14767 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-03-27 11:50:55 +00:00
set_address(&pinfo->net_dst, AT_ETHER, 6, broadcast_addr);
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst);
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
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>
2014-12-12 10:24:44 +00:00
address *addr;
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_src.data, pinfo->dl_src.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_SRC, addr);
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_dst, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_dst.data, pinfo->dl_dst.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_DST, addr);
}
Bluetooth: Fix tools/checkAPI issues Change-Id: I8ffbd4a0da800594d9888f6a30612d4fc5273119 Reviewed-on: https://code.wireshark.org/review/7474 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-26 13:38:57 +00:00
if (tvb_reported_length_remaining(tvb, offset) > 3) {
next_tvb = tvb_new_subset_length(tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
dissect_ad_eir(next_tvb, interface_id, adapter_id, frame_number, src_bd_addr, pinfo, btle_tree);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedski 1. add support for new btsnoop "format" introduced by BlueZ team in "btmon" tool 2. Bluetooth: Make EIR, AD and COD more generic 3. Bluetooth: HCI/LL: Update Error Codes to Core 4.1 Specification 4. Ubertooth: Fix response command handling 5. Ubertooth: Update to support firmware version 6. Ubertooth: Dissect by Vendor Id/Product Id svn path=/trunk/; revision=54699
2014-01-12 00:50:41 +00:00
Bluetooth: Fix tools/checkAPI issues Change-Id: I8ffbd4a0da800594d9888f6a30612d4fc5273119 Reviewed-on: https://code.wireshark.org/review/7474 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-26 13:38:57 +00:00
offset += tvb_reported_length_remaining(tvb, offset) - 3;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
break;
case 0x01: /* ADV_DIRECT_IND */
Qt/Bluetooth: Add Devices dialogue Please found it under Bluetooth menu. It shows all devices found in logs, not only connected, all that its address can be found in logs. Show if device is local (in most cases: capturing on it side) and manufacturer and LMP version what should answer the question what version of Bluetooth is used by Bluetooth device chip. Also firmware version. Change-Id: I32e3b7100cdebcaa850b6541de0ab89dff41c0e1 Reviewed-on: https://code.wireshark.org/review/8901 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-13 15:33:28 +00:00
offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, src_bd_addr);
Bluetooth: Set correct name of target address in ADV_DIRECT_IND PDU The initiator address field of the directed advertising PDU has been renamed to target address in newer versions of the Bluetooth specification. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345313 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36778 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-01 14:13:01 +00:00
offset = dissect_bd_addr(hf_target_addresss, pinfo, btle_tree, tvb, offset, FALSE, interface_id, adapter_id, dst_bd_addr);
Bluetooth: BTLE: Add src/dst addresses when they are known Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-12 10:11:00 +00:00
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr);
copy_address_shallow(&pinfo->dl_src, &pinfo->net_src);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
Bluetooth: BTLE: Add src/dst addresses when they are known Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-12 10:11:00 +00:00
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
set_address(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr);
copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst);
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
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>
2014-12-12 10:24:44 +00:00
address *addr;
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_src.data, pinfo->dl_src.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_SRC, addr);
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_dst, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_dst.data, pinfo->dl_dst.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_DST, addr);
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
break;
case 0x03: /* SCAN_REQ */
Qt/Bluetooth: Add Devices dialogue Please found it under Bluetooth menu. It shows all devices found in logs, not only connected, all that its address can be found in logs. Show if device is local (in most cases: capturing on it side) and manufacturer and LMP version what should answer the question what version of Bluetooth is used by Bluetooth device chip. Also firmware version. Change-Id: I32e3b7100cdebcaa850b6541de0ab89dff41c0e1 Reviewed-on: https://code.wireshark.org/review/8901 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-13 15:33:28 +00:00
offset = dissect_bd_addr(hf_scanning_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, src_bd_addr);
offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, FALSE, interface_id, adapter_id, dst_bd_addr);
Bluetooth: BTLE: Add src/dst addresses when they are known Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-12 10:11:00 +00:00
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr);
copy_address_shallow(&pinfo->dl_src, &pinfo->net_src);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
Bluetooth: BTLE: Add src/dst addresses when they are known Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-12 10:11:00 +00:00
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
set_address(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr);
copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst);
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
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>
2014-12-12 10:24:44 +00:00
address *addr;
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_src.data, pinfo->dl_src.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_SRC, addr);
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_dst, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_dst.data, pinfo->dl_dst.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_DST, addr);
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
break;
case 0x04: /* SCAN_RSP */
Qt/Bluetooth: Add Devices dialogue Please found it under Bluetooth menu. It shows all devices found in logs, not only connected, all that its address can be found in logs. Show if device is local (in most cases: capturing on it side) and manufacturer and LMP version what should answer the question what version of Bluetooth is used by Bluetooth device chip. Also firmware version. Change-Id: I32e3b7100cdebcaa850b6541de0ab89dff41c0e1 Reviewed-on: https://code.wireshark.org/review/8901 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-13 15:33:28 +00:00
offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, src_bd_addr);
Bluetooth: BTLE: Add src/dst addresses when they are known Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-12 10:11:00 +00:00
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr);
copy_address_shallow(&pinfo->dl_src, &pinfo->net_src);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
Bluetooth: BTLE: Add src/dst addresses when they are known Generally where it is not connection then on LinkLayer protocol level addresses for Source and Destination device are known. Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 Reviewed-on: https://code.wireshark.org/review/5776 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-12 10:11:00 +00:00
Bluetooth: Fix conflicting address fields For Broadcast address use FT_ETHER with FF:FF:FF:FF:FF:FF address instead of string address "Broadcast". Change-Id: I638d3d6a1baa9c965dd0a9f548cedbd81af3ec5b Reviewed-on: https://code.wireshark.org/review/14767 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-03-27 11:50:55 +00:00
set_address(&pinfo->net_dst, AT_ETHER, 6, broadcast_addr);
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst);
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
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>
2014-12-12 10:24:44 +00:00
address *addr;
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_src.data, pinfo->dl_src.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_SRC, addr);
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_dst, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_dst.data, pinfo->dl_dst.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_DST, addr);
}
Bluetooth: Fix tools/checkAPI issues Change-Id: I8ffbd4a0da800594d9888f6a30612d4fc5273119 Reviewed-on: https://code.wireshark.org/review/7474 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-26 13:38:57 +00:00
sub_item = proto_tree_add_item(btle_tree, hf_scan_response_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3, ENC_NA);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
sub_tree = proto_item_add_subtree(sub_item, ett_scan_response_data);
Bluetooth: Fix tools/checkAPI issues Change-Id: I8ffbd4a0da800594d9888f6a30612d4fc5273119 Reviewed-on: https://code.wireshark.org/review/7474 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-26 13:38:57 +00:00
if (tvb_reported_length_remaining(tvb, offset) > 3) {
next_tvb = tvb_new_subset_length(tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
dissect_ad_eir(next_tvb, interface_id, adapter_id, frame_number, src_bd_addr, pinfo, sub_tree);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
}
Bluetooth: Fix tools/checkAPI issues Change-Id: I8ffbd4a0da800594d9888f6a30612d4fc5273119 Reviewed-on: https://code.wireshark.org/review/7474 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-26 13:38:57 +00:00
offset += tvb_reported_length_remaining(tvb, offset) - 3;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
break;
Bluetooth: Rename packet names that has changed from REQ to IND in the spec Rename packets names that has changed in the bluetooth core specification. Requests have responses, indications have no response. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345310 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36775 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-03-29 20:23:08 +00:00
case 0x05: /* CONNECT_IND */
Qt/Bluetooth: Add Devices dialogue Please found it under Bluetooth menu. It shows all devices found in logs, not only connected, all that its address can be found in logs. Show if device is local (in most cases: capturing on it side) and manufacturer and LMP version what should answer the question what version of Bluetooth is used by Bluetooth device chip. Also firmware version. Change-Id: I32e3b7100cdebcaa850b6541de0ab89dff41c0e1 Reviewed-on: https://code.wireshark.org/review/8901 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-13 15:33:28 +00:00
offset = dissect_bd_addr(hf_initiator_addresss, pinfo, btle_tree, tvb, offset, FALSE, interface_id, adapter_id, src_bd_addr);
offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, dst_bd_addr);
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>
2014-12-12 10:24:44 +00:00
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr);
copy_address_shallow(&pinfo->dl_src, &pinfo->net_src);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
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>
2014-12-12 10:24:44 +00:00
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
set_address(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr);
copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst);
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
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>
2014-12-12 10:24:44 +00:00
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
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>
2014-12-12 10:24:44 +00:00
address *addr;
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_src.data, pinfo->dl_src.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_SRC, addr);
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_dst, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_dst.data, pinfo->dl_dst.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_DST, addr);
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
link_layer_data_item = proto_tree_add_item(btle_tree, hf_link_layer_data, tvb, offset, 22, ENC_NA);
link_layer_data_tree = proto_item_add_subtree(link_layer_data_item, ett_link_layer_data);
proto_tree_add_item(link_layer_data_tree, hf_link_layer_data_access_address, tvb, offset, 4, ENC_LITTLE_ENDIAN);
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>
2014-12-12 10:24:44 +00:00
connection_access_address = tvb_get_letohl(tvb, offset);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 4;
proto_tree_add_item(link_layer_data_tree, hf_link_layer_data_crc_init, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
item = proto_tree_add_item_ret_uint(link_layer_data_tree, hf_link_layer_data_window_size, tvb, offset, 1, ENC_LITTLE_ENDIAN, &item_value);
proto_item_append_text(item, " (%g msec)", item_value*1.25);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 1;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
item = proto_tree_add_item_ret_uint(link_layer_data_tree, hf_link_layer_data_window_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
proto_item_append_text(item, " (%g msec)", item_value*1.25);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 2;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
item = proto_tree_add_item_ret_uint(link_layer_data_tree, hf_link_layer_data_interval, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
proto_item_append_text(item, " (%g msec)", item_value*1.25);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 2;
btle: Fix Dead Store found by Clang Analyzer packet-btle.c:1417:13: warning: Value stored to 'item' is never read [deadcode.DeadStores]
2021-02-09 20:28:14 +00:00
proto_tree_add_item(link_layer_data_tree, hf_link_layer_data_latency, tvb, offset, 2, ENC_LITTLE_ENDIAN);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 2;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
item = proto_tree_add_item_ret_uint(link_layer_data_tree, hf_link_layer_data_timeout, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
proto_item_append_text(item, " (%u msec)", item_value*10);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 2;
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
sub_item = proto_tree_add_item(link_layer_data_tree, hf_link_layer_data_channel_map, tvb, offset, 5, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_channel_map);
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
call_dissector(btcommon_le_channel_map_handle, tvb_new_subset_length(tvb, offset, 5), pinfo, sub_tree);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 5;
btle: Reorder elements in Packet Header and Data Header This shows the elements in a little-endian fashion and aligns with other element trees using bitmask. Change-Id: I8e16eaee9944c2b56bc9fe18f31a983047aca121 Reviewed-on: https://code.wireshark.org/review/22453 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-28 21:13:44 +00:00
proto_tree_add_item(link_layer_data_tree, hf_link_layer_data_hop, tvb, offset, 1, ENC_LITTLE_ENDIAN);
BTLE: fix bitmap for link data Hop / Sleep Clock Accuracy Bug: 13990 Change-Id: I4d5acaf580adbe2c5bff1aac3d2837a8842cd519 Reviewed-on: https://code.wireshark.org/review/23172 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-23 06:08:55 +00:00
proto_tree_add_item(link_layer_data_tree, hf_link_layer_data_sleep_clock_accuracy, tvb, offset, 1, ENC_LITTLE_ENDIAN);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 1;
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
connection_parameter_info_t *connection_parameter_info;
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>
2014-12-12 10:24:44 +00:00
key[0].length = 1;
key[0].key = &interface_id;
key[1].length = 1;
key[1].key = &adapter_id;
key[2].length = 1;
key[2].key = &connection_access_address;
key[3].length = 1;
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
key[3].key = &frame_number;
key[4].length = 0;
key[4].key = NULL;
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>
2014-12-12 10:24:44 +00:00
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
connection_info = wmem_new0(wmem_file_scope(), connection_info_t);
connection_info->interface_id = interface_id;
connection_info->adapter_id = adapter_id;
connection_info->access_address = connection_access_address;
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>
2014-12-12 10:24:44 +00:00
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
memcpy(connection_info->master_bd_addr, src_bd_addr, 6);
memcpy(connection_info->slave_bd_addr, dst_bd_addr, 6);
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>
2014-12-12 10:24:44 +00:00
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* We don't create control procedure context trees for BTLE_DIR_UNKNOWN,
* as the direction must be known for request/response matching. */
connection_info->direction_info[BTLE_DIR_MASTER_SLAVE].control_procs =
wmem_tree_new(wmem_file_scope());
connection_info->direction_info[BTLE_DIR_SLAVE_MASTER].control_procs =
wmem_tree_new(wmem_file_scope());
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
wmem_tree_insert32_array(connection_info_tree, key, connection_info);
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
connection_parameter_info = wmem_new0(wmem_file_scope(), connection_parameter_info_t);
connection_parameter_info->parameters_frame = pinfo->num;
key[3].length = 1;
key[3].key = &pinfo->num;
wmem_tree_insert32_array(connection_parameter_info_tree, key, connection_parameter_info);
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>
2014-12-12 10:24:44 +00:00
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
break;
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
case 0x07: /* ADV_EXT_IND / AUX_ADV_IND / AUX_SYNC_IND / AUX_CHAIN_IND / AUX_SCAN_RSP */
case 0x08: /* AUX_CONNNECT_RSP */
{
guint8 tmp, ext_header_len, flags, acad_len;
proto_item *ext_header_item, *ext_flags_item;
proto_tree *ext_header_tree, *ext_flags_tree;
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
guint32 adi;
gboolean adi_present = FALSE;
gboolean aux_pointer_present = FALSE;
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
tmp = tvb_get_guint8(tvb, offset);
ext_header_len = acad_len = tmp & 0x3F;
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
ext_header_item = proto_tree_add_item(btle_tree, hf_extended_advertising_header, tvb, offset, ext_header_len + 1, ENC_NA);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
ext_header_tree = proto_item_add_subtree(ext_header_item, ett_extended_advertising_header);
proto_tree_add_item(ext_header_tree, hf_extended_advertising_header_length, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ext_header_tree, hf_extended_advertising_mode, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
btle: Fix parsing of empty extendend advertising header Fix parsing of extended advertising when the extended advertising header is empty. The flag field is excluded when none of the fields are present and the extended header length field is 0. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-06-25 09:40:28 +00:00
if (ext_header_len > 0) {
ext_flags_item = proto_tree_add_item(ext_header_tree, hf_extended_advertising_flags, tvb, offset, 1, ENC_NA);
ext_flags_tree = proto_item_add_subtree(ext_flags_item, ett_extended_advertising_flags);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
btle: Fix parsing of empty extendend advertising header Fix parsing of extended advertising when the extended advertising header is empty. The flag field is excluded when none of the fields are present and the extended header length field is 0. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-06-25 09:40:28 +00:00
proto_tree_add_bitmask_list(ext_flags_tree, tvb, offset, 1, hfx_extended_advertising_flags, ENC_NA);
flags = tvb_get_guint8(tvb, offset);
offset += 1;
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
btle: Fix parsing of empty extendend advertising header Fix parsing of extended advertising when the extended advertising header is empty. The flag field is excluded when none of the fields are present and the extended header length field is 0. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-06-25 09:40:28 +00:00
acad_len -= 1;
} else {
flags = 0;
}
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
if (flags & 0x01) {
/* Advertiser Address */
offset = dissect_bd_addr(hf_advertising_address, pinfo, ext_header_tree, tvb, offset, TRUE, interface_id, adapter_id, src_bd_addr);
set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr);
copy_address_shallow(&pinfo->dl_src, &pinfo->net_src);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
acad_len -= 6;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
} else if (!connection_info) {
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
const char * anon_str = "Anonymous";
clear_address(&pinfo->dl_src);
set_address(&pinfo->net_src, AT_STRINGZ, sizeof(*anon_str), anon_str);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
}
if (flags & 0x02) {
/* Target Address */
offset = dissect_bd_addr(hf_target_addresss, pinfo, ext_header_tree, tvb, offset, FALSE, interface_id, adapter_id, dst_bd_addr);
set_address(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr);
copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst);
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
acad_len -= 6;
} else {
set_address(&pinfo->net_dst, AT_ETHER, 6, broadcast_addr);
copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst);
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
}
if (flags & 0x04) {
guint32 cte_time;
/* CTE Info */
sub_item = proto_tree_add_item(ext_header_tree, hf_extended_advertising_cte_info, tvb, offset, 1, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_extended_advertising_cte_info);
item = proto_tree_add_item_ret_uint(sub_tree, hf_extended_advertising_cte_info_time, tvb, offset, 1, ENC_LITTLE_ENDIAN, &cte_time);
proto_item_append_text(item, " (%u usec)", cte_time * 8);
btle: Fix parsing of CTE Info field in extended advertising header Fix parsing of the CTE Info field in the extended advertising header. The bit-mask of the different fields was wrongly placed. The text of the different fields all said "CTE Info". The CTE Time field was added twice. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-06-25 09:42:07 +00:00
proto_tree_add_item(sub_tree, hf_extended_advertising_cte_info_rfu, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sub_tree, hf_extended_advertising_cte_info_type, tvb, offset, 1, ENC_LITTLE_ENDIAN);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
offset += 1;
acad_len -= 1;
}
if (flags & 0x08) {
/* AdvDataInfo */
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
sub_item = proto_tree_add_item_ret_uint(ext_header_tree, hf_extended_advertising_data_info, tvb, offset, 2, ENC_LITTLE_ENDIAN, &adi);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
sub_tree = proto_item_add_subtree(sub_item, ett_extended_advertising_data_info);
proto_tree_add_item(sub_tree, hf_extended_advertising_data_info_did, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sub_tree, hf_extended_advertising_data_info_sid, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
adi_present = TRUE;
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
acad_len -= 2;
}
if (flags & 0x10) {
guint32 aux_offset;
/* Aux Pointer */
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
sub_item = proto_tree_add_item(ext_header_tree, hf_extended_advertising_aux_ptr, tvb, offset, 3, ENC_NA);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
sub_tree = proto_item_add_subtree(sub_item, ett_extended_advertising_aux_pointer);
proto_tree_add_item(sub_tree, hf_extended_advertising_aux_ptr_channel, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sub_tree, hf_extended_advertising_aux_ptr_ca, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sub_tree, hf_extended_advertising_aux_ptr_offset_units, tvb, offset, 1, ENC_LITTLE_ENDIAN);
tmp = tvb_get_guint8(tvb, offset);
offset += 1;
item = proto_tree_add_item_ret_uint(sub_tree, hf_extended_advertising_aux_ptr_aux_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN, &aux_offset);
proto_tree_add_item(sub_tree, hf_extended_advertising_aux_ptr_aux_phy, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_item_append_text(item, " (%u usec)", aux_offset * ((tmp & 0x80) != 0 ? 300 : 30));
offset += 2;
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
aux_pointer_present = TRUE;
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
acad_len -= 3;
}
Bluetooth: Complete Additional Controller Advertising Data dissecting Complete Additional Controller Advertising Data dissecting, this was just reported as advertising data in the extended header. Put it under a new tree for ACAD info in the extended header. Also fix the wrong length field used for the length of the ACAD field. In addition put the scan response data under it's own scan response, similar to SCAN_RSP handling. We can only do this if the context has given us the information that this is the aux scan response data. Remove an accidental addition used for debugging, and an empty if-statement for a reserved flag. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531e Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36835 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13 20:27:05 +00:00
if (flags & 0x20) {
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
guint32 sync_offset, interval;
proto_item *sync_info_item;
proto_tree *sync_info_tree;
gint reserved_offset;
guint16 sf;
/* Sync Info */
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
sync_info_item = proto_tree_add_item(ext_header_tree, hf_extended_advertising_sync_info, tvb, offset, 18, ENC_NA);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
sync_info_tree = proto_item_add_subtree(sync_info_item, ett_extended_advertising_sync_info);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
if (!pinfo->fd->visited) {
connection_parameter_info_t *connection_parameter_info;
connection_access_address = tvb_get_guint32(tvb, offset + 9, ENC_LITTLE_ENDIAN);
key[0].length = 1;
key[0].key = &interface_id;
key[1].length = 1;
key[1].key = &adapter_id;
key[2].length = 1;
key[2].key = &connection_access_address;
key[3].length = 1;
key[3].key = &frame_number;
key[4].length = 0;
key[4].key = NULL;
connection_info = wmem_new0(wmem_file_scope(), connection_info_t);
connection_info->interface_id = interface_id;
connection_info->adapter_id = adapter_id;
connection_info->access_address = connection_access_address;
if (flags & 0x01)
memcpy(connection_info->master_bd_addr, src_bd_addr, 6);
/* We don't create control procedure context trees for BTLE_DIR_UNKNOWN,
* as the direction must be known for request/response matching. */
connection_info->direction_info[BTLE_DIR_MASTER_SLAVE].control_procs =
wmem_tree_new(wmem_file_scope());
connection_info->direction_info[BTLE_DIR_SLAVE_MASTER].control_procs =
wmem_tree_new(wmem_file_scope());
wmem_tree_insert32_array(connection_info_tree, key, connection_info);
connection_parameter_info = wmem_new0(wmem_file_scope(), connection_parameter_info_t);
connection_parameter_info->parameters_frame = pinfo->num;
key[3].length = 1;
key[3].key = &pinfo->num;
wmem_tree_insert32_array(connection_parameter_info_tree, key, connection_parameter_info);
}
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
sf = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN);
item = proto_tree_add_item_ret_uint(sync_info_tree, hf_extended_advertising_sync_info_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN, &sync_offset);
proto_tree_add_item(sync_info_tree, hf_extended_advertising_sync_info_offset_units, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sync_info_tree, hf_extended_advertising_sync_info_offset_adjust, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(sync_info_tree, hf_extended_advertising_sync_info_reserved, tvb, offset, 2, ENC_LITTLE_ENDIAN);
if (sync_offset > 0) {
proto_item_append_text(item, " (%u usec)", sync_offset * ((sf & 0x2000) != 0 ? 300 : 30) + ((sf & 0x4000) != 0 ? 2457600 : 0));
} else {
proto_item_append_text(item, " Cannot be represented");
}
offset += 2;
item = proto_tree_add_item_ret_uint(sync_info_tree, hf_extended_advertising_sync_info_interval, tvb, offset, 2, ENC_LITTLE_ENDIAN, &interval);
proto_item_append_text(item, " (%g msec)", interval * 1.25);
offset += 2;
sub_item = proto_tree_add_item(sync_info_tree, hf_extended_advertising_sync_info_channel_map, tvb, offset, 5, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_channel_map);
call_dissector_with_data(btcommon_le_channel_map_handle, tvb_new_subset_length(tvb, offset, 5), pinfo, sub_tree, &reserved_offset);
proto_tree_add_item(sync_info_tree, hf_extended_advertising_sync_info_sleep_clock_accuracy, tvb, reserved_offset, 1, ENC_LITTLE_ENDIAN);
offset += 5;
proto_tree_add_item(sync_info_tree, hf_extended_advertising_sync_info_access_address, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
proto_tree_add_item(sync_info_tree, hf_extended_advertising_sync_info_crc_init, tvb, offset, 3, ENC_LITTLE_ENDIAN);
offset += 3;
proto_tree_add_item(sync_info_tree, hf_extended_advertising_sync_info_event_counter, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
acad_len -= 18;
}
if (flags & 0x40) {
/* Tx Power */
btle: Fix Dead Store Fix dead store (Dead assignement/Dead increment) Warning found by Clang Change-Id: I9ad5252af93642a52db0e1d9df67fa5553103d7f Reviewed-on: https://code.wireshark.org/review/37372 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-03 14:19:20 +00:00
proto_tree_add_item(ext_header_tree, hf_extended_advertising_tx_power, tvb, offset, 1, ENC_LITTLE_ENDIAN);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
offset += 1;
acad_len -= 1;
}
Bluetooth: Complete Additional Controller Advertising Data dissecting Complete Additional Controller Advertising Data dissecting, this was just reported as advertising data in the extended header. Put it under a new tree for ACAD info in the extended header. Also fix the wrong length field used for the length of the ACAD field. In addition put the scan response data under it's own scan response, similar to SCAN_RSP handling. We can only do this if the context has given us the information that this is the aux scan response data. Remove an accidental addition used for debugging, and an empty if-statement for a reserved flag. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531e Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36835 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13 20:27:05 +00:00
if (acad_len > 0) {
sub_item = proto_tree_add_item(ext_header_tree, hf_extended_advertising_header_acad, tvb, offset, acad_len, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_extended_advertising_acad);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
Bluetooth: Complete Additional Controller Advertising Data dissecting Complete Additional Controller Advertising Data dissecting, this was just reported as advertising data in the extended header. Put it under a new tree for ACAD info in the extended header. Also fix the wrong length field used for the length of the ACAD field. In addition put the scan response data under it's own scan response, similar to SCAN_RSP handling. We can only do this if the context has given us the information that this is the aux scan response data. Remove an accidental addition used for debugging, and an empty if-statement for a reserved flag. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531e Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36835 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13 20:27:05 +00:00
/* Additional Controller Advertising Data */
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
next_tvb = tvb_new_subset_length(tvb, offset, acad_len);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
dissect_ad_eir(next_tvb, interface_id, adapter_id, frame_number, src_bd_addr, pinfo, sub_tree);
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
offset += acad_len;
}
if (tvb_reported_length_remaining(tvb, offset) > 3) {
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
gboolean ad_processed = FALSE;
if (btle_context && pdu_type == 0x07 && btle_context->aux_pdu_type_valid) {
gboolean ad_reassembled = FALSE;
ae_had_info_t *ae_had_info = NULL;
switch (btle_context->aux_pdu_type) {
case 0x00: /* AUX_ADV_IND */
case 0x02: /* AUX_SYNC_IND */
case 0x03: /* AUX_SCAN_RSP */
if (aux_pointer_present) {
/* Begining of new sequence of fragments */
if (!pinfo->fd->visited && adi_present) {
ae_had_info = wmem_new0(wmem_file_scope(), ae_had_info_t);
ae_had_info->first_frame_num=pinfo->num;
ae_had_key[0].length = 1;
ae_had_key[0].key = &interface_id;
ae_had_key[1].length = 1;
ae_had_key[1].key = &adapter_id;
ae_had_key[2].length = 1;
ae_had_key[2].key = &adi;
ae_had_key[3].length = 0;
ae_had_key[3].key = NULL;
wmem_tree_insert32_array(adi_to_first_frame_tree, ae_had_key, ae_had_info);
fragment_add_seq(&btle_ea_host_advertising_data_reassembly_table,
tvb, offset, pinfo,
ae_had_info->first_frame_num, NULL,
ae_had_info->fragment_counter,
tvb_captured_length_remaining(tvb, offset) - 3,
!ad_reassembled, 0);
ae_had_info->fragment_counter++;
}
ad_processed = TRUE;
}
break;
case 0x01: /* AUX_CHAIN_IND */
if (!aux_pointer_present) {
/* Final fragment */
ad_reassembled = TRUE;
}
if (!pinfo->fd->visited && adi_present) {
ae_had_key[0].length = 1;
ae_had_key[0].key = &interface_id;
ae_had_key[1].length = 1;
ae_had_key[1].key = &adapter_id;
ae_had_key[2].length = 1;
ae_had_key[2].key = &adi;
ae_had_key[3].length = 0;
ae_had_key[3].key = NULL;
ae_had_info = (ae_had_info_t *) wmem_tree_lookup32_array(adi_to_first_frame_tree, ae_had_key);
if (ae_had_info != NULL) {
fragment_add_seq(&btle_ea_host_advertising_data_reassembly_table,
tvb, offset, pinfo,
ae_had_info->first_frame_num, NULL,
ae_had_info->fragment_counter,
tvb_captured_length_remaining(tvb, offset) - 3,
!ad_reassembled, 0);
ae_had_info->fragment_counter++;
if (ad_reassembled == TRUE) {
p_add_proto_data(wmem_file_scope(), pinfo, proto_btle, (guint32)(pinfo->curr_layer_num) << 8, ae_had_info);
}
}
}
ad_processed = TRUE;
break;
default:
/* This field is 2 bits long, no special action needed */
break;
}
if (ad_processed) {
if (pinfo->fd->visited) {
/* Host Advertising Data fragment */
proto_tree_add_item(btle_tree, hf_extended_advertising_had_fragment, tvb, offset, tvb_captured_length_remaining(tvb, offset) - 3, ENC_NA);
if (ad_reassembled) {
fragment_head *fd_head = NULL;
tvbuff_t *assembled_tvb = NULL;
ae_had_info = (ae_had_info_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_btle, (guint32)(pinfo->curr_layer_num) << 8);
if (ae_had_info != NULL) {
col_append_str(pinfo->cinfo, COL_INFO, " (EA HAD Reassembled)");
fd_head = fragment_get(&btle_ea_host_advertising_data_reassembly_table, pinfo, ae_had_info->first_frame_num, NULL);
assembled_tvb = process_reassembled_data(
tvb, offset, pinfo,
"Reassembled Host Advertising Data", fd_head,
&btle_ea_host_advertising_data_frag_items,
NULL, btle_tree);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
dissect_ad_eir(assembled_tvb, interface_id, adapter_id, frame_number, src_bd_addr, pinfo, btle_tree);
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
}
}
else {
col_append_str(pinfo->cinfo, COL_INFO, " (EA HAD Fragment)");
}
offset += tvb_captured_length_remaining(tvb, offset) - 3;
}
}
}
Bluetooth: Complete Additional Controller Advertising Data dissecting Complete Additional Controller Advertising Data dissecting, this was just reported as advertising data in the extended header. Put it under a new tree for ACAD info in the extended header. Also fix the wrong length field used for the length of the ACAD field. In addition put the scan response data under it's own scan response, similar to SCAN_RSP handling. We can only do this if the context has given us the information that this is the aux scan response data. Remove an accidental addition used for debugging, and an empty if-statement for a reserved flag. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531e Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36835 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13 20:27:05 +00:00
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
if (tvb_reported_length_remaining(tvb, offset) > 3) {
/* Host Advertising Data */
next_tvb = tvb_new_subset_length(tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3);
if (btle_context && btle_context->aux_pdu_type_valid && btle_context->aux_pdu_type == 3) {
/* AUX_SCAN_RSP */
sub_item = proto_tree_add_item(btle_tree, hf_scan_response_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_scan_response_data);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
dissect_ad_eir(next_tvb, interface_id, adapter_id, frame_number, src_bd_addr, pinfo, sub_tree);
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
}
else {
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
dissect_ad_eir(next_tvb, interface_id, adapter_id, frame_number, src_bd_addr, pinfo, btle_tree);
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
}
Bluetooth: Complete Additional Controller Advertising Data dissecting Complete Additional Controller Advertising Data dissecting, this was just reported as advertising data in the extended header. Put it under a new tree for ACAD info in the extended header. Also fix the wrong length field used for the length of the ACAD field. In addition put the scan response data under it's own scan response, similar to SCAN_RSP handling. We can only do this if the context has given us the information that this is the aux scan response data. Remove an accidental addition used for debugging, and an empty if-statement for a reserved flag. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531e Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36835 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13 20:27:05 +00:00
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
offset += tvb_reported_length_remaining(tvb, offset) - 3;
Bluetooth: Complete Additional Controller Advertising Data dissecting Complete Additional Controller Advertising Data dissecting, this was just reported as advertising data in the extended header. Put it under a new tree for ACAD info in the extended header. Also fix the wrong length field used for the length of the ACAD field. In addition put the scan response data under it's own scan response, similar to SCAN_RSP handling. We can only do this if the context has given us the information that this is the aux scan response data. Remove an accidental addition used for debugging, and an empty if-statement for a reserved flag. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531e Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36835 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13 20:27:05 +00:00
}
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
}
break;
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
default:
Bluetooth: Fix tools/checkAPI issues Change-Id: I8ffbd4a0da800594d9888f6a30612d4fc5273119 Reviewed-on: https://code.wireshark.org/review/7474 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-26 13:38:57 +00:00
if (tvb_reported_length_remaining(tvb, offset) > 3) {
proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3);
offset += tvb_reported_length_remaining(tvb, offset) - 3;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
}
}
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
} else if (btle_pdu_type == BTLE_PDU_TYPE_DATA || btle_pdu_type == BTLE_PDU_TYPE_CONNECTEDISO) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
proto_item *data_header_item, *seq_item, *control_proc_item;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
proto_tree *data_header_tree;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
guint8 oct;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
guint8 llid;
guint8 control_opcode;
btle: Support reassembly in both directions Create one connection_info_tree for each direction to support reassembly in both directions simultaneously. Change-Id: If83e8705412062b07f3fa47a73f42db8c7895e78 Reviewed-on: https://code.wireshark.org/review/22476 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-30 11:54:39 +00:00
guint32 direction = BTLE_DIR_UNKNOWN;
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
guint8 other_direction = BTLE_DIR_UNKNOWN;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
gboolean add_l2cap_index = FALSE;
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
gboolean retransmit = FALSE;
btle: Support reassembly in both directions Create one connection_info_tree for each direction to support reassembly in both directions simultaneously. Change-Id: If83e8705412062b07f3fa47a73f42db8c7895e78 Reviewed-on: https://code.wireshark.org/review/22476 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-30 11:54:39 +00:00
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* Holds the last initiated control procedures for a given direction. */
control_proc_info_t *last_control_proc[3] = {0};
btle: Support reassembly in both directions Create one connection_info_tree for each direction to support reassembly in both directions simultaneously. Change-Id: If83e8705412062b07f3fa47a73f42db8c7895e78 Reviewed-on: https://code.wireshark.org/review/22476 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-30 11:54:39 +00:00
if (btle_context) {
direction = btle_context->direction;
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
other_direction = (direction == BTLE_DIR_SLAVE_MASTER) ? BTLE_DIR_MASTER_SLAVE : BTLE_DIR_SLAVE_MASTER;
btle: Support reassembly in both directions Create one connection_info_tree for each direction to support reassembly in both directions simultaneously. Change-Id: If83e8705412062b07f3fa47a73f42db8c7895e78 Reviewed-on: https://code.wireshark.org/review/22476 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-30 11:54:39 +00:00
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
btle_frame_info_t *btle_frame_info = NULL;
fragment_head *frag_btl2cap_msg = NULL;
bluetooth: Add context information for next expected sequence number Add context information for next expected sequence number so that analysing for acknowledgedment or request for retransmit can be done without comparing packets manually. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:56:45 +00:00
btle_frame_info_t empty_btle_frame_info = {0, 0, 0, 0, 0};
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
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>
2014-12-12 10:24:44 +00:00
key[0].length = 1;
key[0].key = &interface_id;
key[1].length = 1;
key[1].key = &adapter_id;
key[2].length = 1;
key[2].key = &access_address;
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
key[3].length = 0;
key[3].key = NULL;
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>
2014-12-12 10:24:44 +00:00
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
oct = tvb_get_guint8(tvb, offset);
wmem_tree = (wmem_tree_t *) wmem_tree_lookup32_array(connection_info_tree, key);
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>
2014-12-12 10:24:44 +00:00
if (wmem_tree) {
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
connection_info = (connection_info_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->num);
btle: Don't ignore frames with incorrect CRC when detecting retransmission. The retrans detection using SN must use all available frames to make a best effort. The probability for having error in the SN bit is little compared to reassembly errors occuring when discarding frames with incorrect CRC. Change-Id: I40f89e69b19600939b6e0a85a2e655b6681ea5b2 Reviewed-on: https://code.wireshark.org/review/23783 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-09-29 12:46:20 +00:00
if (connection_info) {
[BTLE] Change address from unknown_0x... to master or slave. Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad Reviewed-on: https://code.wireshark.org/review/16844 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 15:07:14 +00:00
gchar *str_addr_src, *str_addr_dst;
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
/* Holds "unknown" + access_address + NULL, which is the longest string */
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>
2014-12-12 10:24:44 +00:00
int str_addr_len = 18 + 1;
[BTLE] Change address from unknown_0x... to master or slave. Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad Reviewed-on: https://code.wireshark.org/review/16844 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 15:07:14 +00:00
str_addr_src = (gchar *) wmem_alloc(pinfo->pool, str_addr_len);
str_addr_dst = (gchar *) wmem_alloc(pinfo->pool, str_addr_len);
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>
2014-12-12 10:24:44 +00:00
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
sub_item = proto_tree_add_ether(btle_tree, hf_master_bd_addr, tvb, 0, 0, connection_info->master_bd_addr);
epan: Convert our PROTO_ITEM_ macros to inline functions. Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-03 21:32:30 +00:00
proto_item_set_generated(sub_item);
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>
2014-12-12 10:24:44 +00:00
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
sub_item = proto_tree_add_ether(btle_tree, hf_slave_bd_addr, tvb, 0, 0, connection_info->slave_bd_addr);
epan: Convert our PROTO_ITEM_ macros to inline functions. Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-03 21:32:30 +00:00
proto_item_set_generated(sub_item);
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>
2014-12-12 10:24:44 +00:00
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
switch (direction) {
[BTLE] Change address from unknown_0x... to master or slave. Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad Reviewed-on: https://code.wireshark.org/review/16844 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 15:07:14 +00:00
case BTLE_DIR_MASTER_SLAVE:
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
g_snprintf(str_addr_src, str_addr_len, "Master_0x%08x", connection_info->access_address);
g_snprintf(str_addr_dst, str_addr_len, "Slave_0x%08x", connection_info->access_address);
btle: Use bd_addr as link-layer address in data PDU This can be used in a higher layer 6LoWPAN to recreate the source and destination addresses. Change-Id: I967c3ac7c3a50526a10bec067521419d0aed8b4f Reviewed-on: https://code.wireshark.org/review/23616 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-19 13:49:06 +00:00
set_address(&pinfo->dl_src, AT_ETHER, sizeof(connection_info->master_bd_addr), connection_info->master_bd_addr);
set_address(&pinfo->dl_dst, AT_ETHER, sizeof(connection_info->slave_bd_addr), connection_info->slave_bd_addr);
[BTLE] Change address from unknown_0x... to master or slave. Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad Reviewed-on: https://code.wireshark.org/review/16844 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 15:07:14 +00:00
break;
case BTLE_DIR_SLAVE_MASTER:
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
g_snprintf(str_addr_src, str_addr_len, "Slave_0x%08x", connection_info->access_address);
g_snprintf(str_addr_dst, str_addr_len, "Master_0x%08x", connection_info->access_address);
btle: Use bd_addr as link-layer address in data PDU This can be used in a higher layer 6LoWPAN to recreate the source and destination addresses. Change-Id: I967c3ac7c3a50526a10bec067521419d0aed8b4f Reviewed-on: https://code.wireshark.org/review/23616 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-19 13:49:06 +00:00
set_address(&pinfo->dl_src, AT_ETHER, sizeof(connection_info->slave_bd_addr), connection_info->slave_bd_addr);
set_address(&pinfo->dl_dst, AT_ETHER, sizeof(connection_info->master_bd_addr), connection_info->master_bd_addr);
[BTLE] Change address from unknown_0x... to master or slave. Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad Reviewed-on: https://code.wireshark.org/review/16844 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 15:07:14 +00:00
break;
default:
/* BTLE_DIR_UNKNOWN */
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
g_snprintf(str_addr_src, str_addr_len, "Unknown_0x%08x", connection_info->access_address);
g_snprintf(str_addr_dst, str_addr_len, "Unknown_0x%08x", connection_info->access_address);
btle: Use bd_addr as link-layer address in data PDU This can be used in a higher layer 6LoWPAN to recreate the source and destination addresses. Change-Id: I967c3ac7c3a50526a10bec067521419d0aed8b4f Reviewed-on: https://code.wireshark.org/review/23616 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-19 13:49:06 +00:00
clear_address(&pinfo->dl_src);
clear_address(&pinfo->dl_dst);
[BTLE] Change address from unknown_0x... to master or slave. Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad Reviewed-on: https://code.wireshark.org/review/16844 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 15:07:14 +00:00
break;
}
BT LE LL: fix invalid memory access reported by valgrind - broadcast_addr shoudl be static and not on call stack - set the AT_STRINGZ address length with the string length and not the buffer length Bug: 13381 Change-Id: I86e15ccaa9b5d7779c266ab24b637476e983664c Reviewed-on: https://code.wireshark.org/review/20103 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-14 17:04:02 +00:00
set_address(&pinfo->net_src, AT_STRINGZ, (int)strlen(str_addr_src)+1, str_addr_src);
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
copy_address_shallow(&pinfo->src, &pinfo->net_src);
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>
2014-12-12 10:24:44 +00:00
BT LE LL: fix invalid memory access reported by valgrind - broadcast_addr shoudl be static and not on call stack - set the AT_STRINGZ address length with the string length and not the buffer length Bug: 13381 Change-Id: I86e15ccaa9b5d7779c266ab24b637476e983664c Reviewed-on: https://code.wireshark.org/review/20103 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-02-14 17:04:02 +00:00
set_address(&pinfo->net_dst, AT_STRINGZ, (int)strlen(str_addr_dst)+1, str_addr_dst);
Use address functions instead of ADDRESS macros in asn1 and epan Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-21 19:04:16 +00:00
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
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>
2014-12-12 10:24:44 +00:00
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* Retrieve the last initiated control procedures. */
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
if (btle_pdu_type == BTLE_PDU_TYPE_DATA) {
last_control_proc[BTLE_DIR_MASTER_SLAVE] =
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
(control_proc_info_t *)wmem_tree_lookup32_le(connection_info->direction_info[BTLE_DIR_MASTER_SLAVE].control_procs, pinfo->num);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
last_control_proc[BTLE_DIR_SLAVE_MASTER] =
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
(control_proc_info_t *)wmem_tree_lookup32_le(connection_info->direction_info[BTLE_DIR_SLAVE_MASTER].control_procs, pinfo->num);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
if (!pinfo->fd->visited && btle_context && btle_context->event_counter_valid) {
control_proc_complete_if_instant_reached(pinfo->num,
btle_context->event_counter,
last_control_proc[BTLE_DIR_MASTER_SLAVE]);
control_proc_complete_if_instant_reached(pinfo->num,
btle_context->event_counter,
last_control_proc[BTLE_DIR_SLAVE_MASTER]);
}
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
}
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
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>
2014-12-12 10:24:44 +00:00
address *addr;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
btle_frame_info = wmem_new0(wmem_file_scope(), btle_frame_info_t);
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
btle_frame_info->l2cap_index = connection_info->direction_info[direction].l2cap_index;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
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>
2014-12-12 10:24:44 +00:00
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_src.data, pinfo->dl_src.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_SRC, addr);
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_dst, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_dst.data, pinfo->dl_dst.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_DST, addr);
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
if (!connection_info->first_data_frame_seen) {
connection_info->first_data_frame_seen = 1;
btle_frame_info->retransmit = 0;
bluetooth: Add context information for next expected sequence number Add context information for next expected sequence number so that analysing for acknowledgedment or request for retransmit can be done without comparing packets manually. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:56:45 +00:00
btle_frame_info->ack = 1;
btle: Improve retransmit detection Only use SN to detect retransmission. Lower retransmit expert info severity to Note. Change-Id: I4604903cce9cc58a6fcffff6597e7e99d228aa80 Reviewed-on: https://code.wireshark.org/review/23780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-09-29 08:58:56 +00:00
connection_info->direction_info[BTLE_DIR_MASTER_SLAVE].prev_seq_num = 0;
connection_info->direction_info[BTLE_DIR_SLAVE_MASTER].prev_seq_num = 1;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
}
else {
bluetooth: Add context information for next expected sequence number Add context information for next expected sequence number so that analysing for acknowledgedment or request for retransmit can be done without comparing packets manually. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:56:45 +00:00
guint8 seq_num = !!(oct & 0x8), next_expected_seq_num = !!(oct & 0x4);
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
btle: Improve retransmit detection Only use SN to detect retransmission. Lower retransmit expert info severity to Note. Change-Id: I4604903cce9cc58a6fcffff6597e7e99d228aa80 Reviewed-on: https://code.wireshark.org/review/23780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-09-29 08:58:56 +00:00
if (seq_num != connection_info->direction_info[direction].prev_seq_num) {
/* SN is not equal to previous packet (in same direction) SN */
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
btle_frame_info->retransmit = 0;
bluetooth: Add context information for next expected sequence number Add context information for next expected sequence number so that analysing for acknowledgedment or request for retransmit can be done without comparing packets manually. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:56:45 +00:00
} else {
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
btle_frame_info->retransmit = 1;
}
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
connection_info->direction_info[direction].prev_seq_num = seq_num;
bluetooth: Add context information for next expected sequence number Add context information for next expected sequence number so that analysing for acknowledgedment or request for retransmit can be done without comparing packets manually. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:56:45 +00:00
if (next_expected_seq_num != connection_info->direction_info[other_direction].prev_seq_num) {
/* NESN is not equal to previous packet (in other direction) SN */
btle_frame_info->ack = 1;
} else {
btle_frame_info->ack = 0;
}
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
}
p_add_proto_data(wmem_file_scope(), pinfo, proto_btle, pinfo->curr_layer_num, btle_frame_info);
}
else {
/* Not the first pass */
btle_frame_info = (btle_frame_info_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_btle, pinfo->curr_layer_num);
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>
2014-12-12 10:24:44 +00:00
}
}
}
packet-btle.c: If frame information is missing, provide a default. "default" frame information sets no retransmission or more fragments. Bug: 13015 Change-Id: I1c8a29fe06d0b38abc789c8e454dc484490186f9 Reviewed-on: https://code.wireshark.org/review/19891 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-01 04:48:27 +00:00
if (btle_frame_info == NULL) {
btle_frame_info = &empty_btle_frame_info;
}
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
data_header_item = proto_tree_add_item(btle_tree, hf_data_header, tvb, offset, 2, ENC_LITTLE_ENDIAN);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
data_header_tree = proto_item_add_subtree(data_header_item, ett_data_header);
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
proto_tree_add_item(data_header_tree, (btle_pdu_type == BTLE_PDU_TYPE_CONNECTEDISO) ? hf_data_header_llid_connectediso :hf_data_header_llid, tvb, offset, 1, ENC_LITTLE_ENDIAN);
bluetooth: Add context information for next expected sequence number Add context information for next expected sequence number so that analysing for acknowledgedment or request for retransmit can be done without comparing packets manually. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:56:45 +00:00
seq_item = proto_tree_add_item(data_header_tree, hf_data_header_next_expected_sequence_number, tvb, offset, 1, ENC_LITTLE_ENDIAN);
if (direction != BTLE_DIR_UNKNOWN) {
/* Unable to check valid NESN without direction */
if (btle_frame_info->ack == 1) {
proto_item_append_text(seq_item, " [ACK]");
} else {
proto_item_append_text(seq_item, " [Request retransmit]");
expert_add_info(pinfo, seq_item, &ei_nack);
}
}
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
seq_item = proto_tree_add_item(data_header_tree, hf_data_header_sequence_number, tvb, offset, 1, ENC_LITTLE_ENDIAN);
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
if (direction != BTLE_DIR_UNKNOWN) {
/* Unable to check valid SN or retransmission without direction */
if (btle_frame_info->retransmit == 0) {
proto_item_append_text(seq_item, " [OK]");
}
else {
bluetooth: Change wording of sequence number context information Change the wording of the sequence number context information from "Wrong" to the more accurate description that this is a retransmit. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:58:59 +00:00
proto_item_append_text(seq_item, " [Retransmit]");
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
if (btle_detect_retransmit) {
expert_add_info(pinfo, seq_item, &ei_retransmit);
retransmit = TRUE;
}
}
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
}
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
llid = tvb_get_guint8(tvb, offset) & 0x03;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
if (btle_pdu_type == BTLE_PDU_TYPE_CONNECTEDISO) {
proto_tree_add_item(data_header_tree, hf_data_header_close_isochronous_event, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(data_header_tree, hf_data_header_null_pdu_indicator, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(data_header_tree, hf_data_header_rfu_57, tvb, offset, 1, ENC_LITTLE_ENDIAN);
llid |= 0x04;
} else {
proto_tree_add_item(data_header_tree, hf_data_header_more_data, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(data_header_tree, hf_data_header_rfu, tvb, offset, 1, ENC_LITTLE_ENDIAN);
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 1;
proto_tree_add_item(data_header_tree, hf_data_header_length, tvb, offset, 1, ENC_LITTLE_ENDIAN);
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
item = proto_tree_add_item_ret_uint(btle_tree, hf_length, tvb, offset, 1, ENC_LITTLE_ENDIAN, &length);
epan: Convert our PROTO_ITEM_ macros to inline functions. Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-03 21:32:30 +00:00
proto_item_set_hidden(item);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 1;
switch (llid) {
case 0x01: /* Continuation fragment of an L2CAP message, or an Empty PDU */
if (length > 0) {
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
tvbuff_t *new_tvb = NULL;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
pinfo->fragmented = TRUE;
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
if (connection_info && !retransmit) {
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
if (connection_info->direction_info[direction].segmentation_started == 1) {
if (connection_info->direction_info[direction].segment_len_rem >= length) {
connection_info->direction_info[direction].segment_len_rem = connection_info->direction_info[direction].segment_len_rem - length;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
} else {
/*
* Missing fragment for previous L2CAP and fragment start for this.
Bluetooth: Fix l2cap reassembly resuming old reassembly Fix l2cap reassembly resuming reassembly on old fragment that has failed when a new packet arrives that matches the remaining segmentation length of the failed reassembly. Update the l2cap_index and set segmentation started to false so that this does not happen anymore. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-12-01 08:37:43 +00:00
* Set more_fragments and increase l2cap_index to avoid reassembly.
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
*/
Bluetooth: Fix l2cap reassembly resuming old reassembly Fix l2cap reassembly resuming reassembly on old fragment that has failed when a new packet arrives that matches the remaining segmentation length of the failed reassembly. Update the l2cap_index and set segmentation started to false so that this does not happen anymore. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-12-01 08:37:43 +00:00
btle_frame_info->more_fragments = 1;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
btle_frame_info->missing_start = 1;
btle_frame_info->l2cap_index = l2cap_index;
Bluetooth: Fix l2cap reassembly resuming old reassembly Fix l2cap reassembly resuming reassembly on old fragment that has failed when a new packet arrives that matches the remaining segmentation length of the failed reassembly. Update the l2cap_index and set segmentation started to false so that this does not happen anymore. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-12-01 08:37:43 +00:00
connection_info->direction_info[direction].l2cap_index = l2cap_index;
connection_info->direction_info[direction].segmentation_started = 0;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
l2cap_index++;
}
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
if (connection_info->direction_info[direction].segment_len_rem > 0) {
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
btle_frame_info->more_fragments = 1;
}
else {
btle_frame_info->more_fragments = 0;
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
connection_info->direction_info[direction].segmentation_started = 0;
connection_info->direction_info[direction].segment_len_rem = 0;
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
}
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
} else {
/*
* Missing fragment start.
* Set more_fragments and increase l2cap_index to avoid reassembly.
*/
btle_frame_info->more_fragments = 1;
btle_frame_info->missing_start = 1;
btle_frame_info->l2cap_index = l2cap_index;
Bluetooth: Fix l2cap reassembly resuming old reassembly Fix l2cap reassembly resuming reassembly on old fragment that has failed when a new packet arrives that matches the remaining segmentation length of the failed reassembly. Update the l2cap_index and set segmentation started to false so that this does not happen anymore. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-12-01 08:37:43 +00:00
connection_info->direction_info[direction].l2cap_index = l2cap_index;
connection_info->direction_info[direction].segmentation_started = 0;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
l2cap_index++;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
}
}
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
add_l2cap_index = TRUE;
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
frag_btl2cap_msg = fragment_add_seq_next(&btle_l2cap_msg_reassembly_table,
tvb, offset,
pinfo,
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
btle_frame_info->l2cap_index, /* guint32 ID for fragments belonging together */
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
NULL, /* data* */
length, /* Fragment length */
btle_frame_info->more_fragments); /* More fragments */
new_tvb = process_reassembled_data(tvb, offset, pinfo,
"Reassembled L2CAP",
frag_btl2cap_msg,
&btle_l2cap_msg_frag_items,
NULL,
btle_tree);
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
}
if (new_tvb) {
bthci_acl_data_t *acl_data;
col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Data");
acl_data = wmem_new(wmem_packet_scope(), bthci_acl_data_t);
acl_data->interface_id = interface_id;
acl_data->adapter_id = adapter_id;
acl_data->chandle = 0; /* No connection handle at this layer */
acl_data->remote_bd_addr_oui = 0;
acl_data->remote_bd_addr_id = 0;
[BTLE] Dissect LE Information frame. Change-Id: Id4411526eef895fc0130108457866892216d5b03 Reviewed-on: https://code.wireshark.org/review/16958 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-08 16:23:43 +00:00
acl_data->is_btle = TRUE;
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
acl_data->is_btle_retransmit = retransmit;
btle: Initialise acl_data to avoid wild pointer dereference Close oss-fuzz issue 25007.
2020-11-18 01:23:45 +00:00
acl_data->adapter_disconnect_in_frame = &max_disconnect_in_frame;
acl_data->disconnect_in_frame = &max_disconnect_in_frame;
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
next_tvb = tvb_new_subset_length(tvb, offset, length);
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
if (next_tvb) {
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
call_dissector_with_data(btl2cap_handle, new_tvb, pinfo, tree, acl_data);
}
offset += length;
}
else {
col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Fragment");
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
item = proto_tree_add_item(btle_tree, hf_l2cap_fragment, tvb, offset, length, ENC_NA);
if (btle_frame_info->missing_start) {
expert_add_info(pinfo, item, &ei_missing_fragment_start);
}
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
offset += length;
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
} else {
Bluetooth: btle: Clear info column before use it This fix "btle" over "ubertooth" dissector, so messeges from both will not be merged. Change-Id: I587b81a405f37d16e8ab417d94edfc633bfc14fc Reviewed-on: https://code.wireshark.org/review/3877 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26 11:13:57 +00:00
col_set_str(pinfo->cinfo, COL_INFO, "Empty PDU");
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
}
break;
case 0x02: /* Start of an L2CAP message or a complete L2CAP message with no fragmentation */
if (length > 0) {
btle: Correctly detect l2cap fragment start The first L2CAP PDU fragment starts with the 4 octet long L2CAP header consisting of the Length and the CID fields. The Length field doesn't include the header itself. Thus the Length field in the BLE Data header will be 4 octets larger than the L2CAP PDU header Length field if the packet wouldn't be fragmented. The current implementation doesn't correctly detect the start fragment causing reassembly to fail as it compares the BLE Data Length with the L2CAP Length without compensating for the header. By increasing the L2CAP PDU Length field with the header length the reassembly works. Rename the variable to better reflect what length it actually represents. Bug: 15807 Change-Id: Idcb6bdccc4daae756a63a9bae0839fe25ae99f23 Reviewed-on: https://code.wireshark.org/review/33428 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-05-30 19:18:19 +00:00
guint l2cap_len = tvb_get_letohs(tvb, offset);
if (l2cap_len + 4 > length) { /* L2CAP PDU Length excludes the 4 octets header */
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
pinfo->fragmented = TRUE;
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
if (connection_info && !retransmit) {
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
connection_info->direction_info[direction].segmentation_started = 1;
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
/* The first two octets in the L2CAP PDU contain the length of the entire
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
* L2CAP PDU in octets, excluding the Length and CID fields(4 octets).
*/
btle: Correctly detect l2cap fragment start The first L2CAP PDU fragment starts with the 4 octet long L2CAP header consisting of the Length and the CID fields. The Length field doesn't include the header itself. Thus the Length field in the BLE Data header will be 4 octets larger than the L2CAP PDU header Length field if the packet wouldn't be fragmented. The current implementation doesn't correctly detect the start fragment causing reassembly to fail as it compares the BLE Data Length with the L2CAP Length without compensating for the header. By increasing the L2CAP PDU Length field with the header length the reassembly works. Rename the variable to better reflect what length it actually represents. Bug: 15807 Change-Id: Idcb6bdccc4daae756a63a9bae0839fe25ae99f23 Reviewed-on: https://code.wireshark.org/review/33428 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-05-30 19:18:19 +00:00
connection_info->direction_info[direction].segment_len_rem = l2cap_len + 4 - length;
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
connection_info->direction_info[direction].l2cap_index = l2cap_index;
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
btle_frame_info->more_fragments = 1;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
btle_frame_info->l2cap_index = l2cap_index;
l2cap_index++;
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
}
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
add_l2cap_index = TRUE;
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
frag_btl2cap_msg = fragment_add_seq_next(&btle_l2cap_msg_reassembly_table,
tvb, offset,
pinfo,
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
btle_frame_info->l2cap_index, /* guint32 ID for fragments belonging together */
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
NULL, /* data* */
length, /* Fragment length */
btle_frame_info->more_fragments); /* More fragments */
BTLE: check connection_info presence before trying to perform reassembly Bug: 13379 Change-Id: Idafa780f24bf9f181c0913cbe16a0cfa9bce382e Reviewed-on: https://code.wireshark.org/review/19927 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-03 08:13:26 +00:00
process_reassembled_data(tvb, offset, pinfo,
"Reassembled L2CAP",
frag_btl2cap_msg,
&btle_l2cap_msg_frag_items,
NULL,
btle_tree);
}
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Fragment Start");
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
proto_tree_add_item(btle_tree, hf_l2cap_fragment, tvb, offset, length, ENC_NA);
offset += length;
} else {
bthci_acl_data_t *acl_data;
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
if (connection_info) {
/* Add a L2CAP index for completeness */
Try to squeeze some bytes out of the frame_data structure. Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-27 02:26:24 +00:00
if (!pinfo->fd->visited) {
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
btle_frame_info->l2cap_index = l2cap_index;
l2cap_index++;
}
add_l2cap_index = TRUE;
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Bluetooth: btle: Clear info column before use it This fix "btle" over "ubertooth" dissector, so messeges from both will not be merged. Change-Id: I587b81a405f37d16e8ab417d94edfc633bfc14fc Reviewed-on: https://code.wireshark.org/review/3877 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26 11:13:57 +00:00
col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Data");
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>
2014-12-12 10:24:44 +00:00
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
acl_data = wmem_new(wmem_packet_scope(), bthci_acl_data_t);
Bluetooth: Fix interface_id Interface ID should correspond to the Wireshark Interface Id to avoid mixing data from various interfaces in dissectors. Change-Id: Ibaa3ddab7f0ebd0985efea74439b94a5881145a7 Reviewed-on: https://code.wireshark.org/review/472 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-03 07:51:04 +00:00
acl_data->interface_id = interface_id;
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>
2014-12-12 10:24:44 +00:00
acl_data->adapter_id = adapter_id;
acl_data->chandle = 0; /* No connection handle at this layer */
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
acl_data->remote_bd_addr_oui = 0;
acl_data->remote_bd_addr_id = 0;
[BTLE] Dissect LE Information frame. Change-Id: Id4411526eef895fc0130108457866892216d5b03 Reviewed-on: https://code.wireshark.org/review/16958 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-08 16:23:43 +00:00
acl_data->is_btle = TRUE;
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
acl_data->is_btle_retransmit = retransmit;
btle: Initialise acl_data to avoid wild pointer dereference Close oss-fuzz issue 25007.
2020-11-18 01:23:45 +00:00
acl_data->adapter_disconnect_in_frame = &max_disconnect_in_frame;
acl_data->disconnect_in_frame = &max_disconnect_in_frame;
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>
2014-12-12 10:24:44 +00:00
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset, length);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
call_dissector_with_data(btl2cap_handle, next_tvb, pinfo, tree, acl_data);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += length;
}
}
break;
case 0x03: /* Control PDU */
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_item = proto_tree_add_item(btle_tree, hf_control_opcode, tvb, offset, 1, ENC_LITTLE_ENDIAN);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
control_opcode = tvb_get_guint8(tvb, offset);
offset += 1;
Bluetooth: btle: Clear info column before use it This fix "btle" over "ubertooth" dissector, so messeges from both will not be merged. Change-Id: I587b81a405f37d16e8ab417d94edfc633bfc14fc Reviewed-on: https://code.wireshark.org/review/3877 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26 11:13:57 +00:00
col_add_fstr(pinfo->cinfo, COL_INFO, "Control Opcode: %s",
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
val_to_str_ext_const(control_opcode, &control_opcode_vals_ext, "Unknown"));
switch (control_opcode) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
case 0x00: /* LL_CONNECTION_UPDATE_IND */
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
item = proto_tree_add_item_ret_uint(btle_tree, hf_control_window_size, tvb, offset, 1, ENC_LITTLE_ENDIAN, &item_value);
proto_item_append_text(item, " (%g msec)", item_value*1.25);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 1;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
item = proto_tree_add_item_ret_uint(btle_tree, hf_control_window_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
proto_item_append_text(item, " (%g msec)", item_value*1.25);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 2;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
item = proto_tree_add_item_ret_uint(btle_tree, hf_control_interval, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
proto_item_append_text(item, " (%g msec)", item_value*1.25);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 2;
proto_tree_add_item(btle_tree, hf_control_latency, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
item = proto_tree_add_item_ret_uint(btle_tree, hf_control_timeout, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
proto_item_append_text(item, " (%u msec)", item_value*10);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 2;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
proto_tree_add_item_ret_uint(btle_tree, hf_control_instant, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 2;
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
if (!pinfo->fd->visited) {
if (connection_info) {
connection_parameter_info_t *connection_parameter_info;
connection_parameter_info = wmem_new0(wmem_file_scope(), connection_parameter_info_t);
connection_parameter_info->parameters_frame = pinfo->num;
if (btle_context && btle_context->event_counter_valid) {
connection_info->connection_parameter_update_instant = item_value;
connection_info->connection_parameter_update_info = connection_parameter_info;
} else {
/* We don't have event counter information needed to determine the exact time the new
* connection parameters will be applied.
* Instead just set it as active immediately.
*/
key[0].length = 1;
key[0].key = &interface_id;
key[1].length = 1;
key[1].key = &adapter_id;
key[2].length = 1;
key[2].key = &access_address;
key[3].length = 1;
key[3].key = &pinfo->num;
key[4].length = 0;
key[4].key = NULL;
wmem_tree_insert32_array(connection_parameter_info_tree, key, connection_parameter_info);
}
}
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_CONNECTION_UPDATE_IND can only be sent from master to slave.
* It can either be sent as the first packet of the connection update procedure,
* or as the last packet in the connection parameter request procedure. */
if (direction == BTLE_DIR_MASTER_SLAVE) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x0F, 2)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[2] = pinfo->num;
last_control_proc[BTLE_DIR_MASTER_SLAVE]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_SLAVE_MASTER],
0x0F, 1)) {
last_control_proc[BTLE_DIR_SLAVE_MASTER]->frames[1] = pinfo->num;
last_control_proc[BTLE_DIR_SLAVE_MASTER]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_SLAVE_MASTER]->frames[0]);
proto_item_set_generated(sub_item);
} else {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_info_t *proc_info;
proc_info = control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
if (proc_info) {
if (btle_context && btle_context->event_counter_valid) {
proc_info->instant = item_value;
proc_info->frame_with_instant_value = pinfo->num;
} else {
/* Event counter is not available, assume the procedure completes now. */
proc_info->last_frame = pinfo->num;
}
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
}
} else if (direction == BTLE_DIR_SLAVE_MASTER) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
break;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
case 0x01: /* LL_CHANNEL_MAP_REQ */
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
sub_item = proto_tree_add_item(btle_tree, hf_control_channel_map, tvb, offset, 5, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_channel_map);
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 14:35:50 +00:00
call_dissector(btcommon_le_channel_map_handle, tvb_new_subset_length(tvb, offset, 5), pinfo, sub_tree);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 5;
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
proto_tree_add_item_ret_uint(btle_tree, hf_control_instant, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 2;
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_CHANNEL_MAP_REQ can only be sent from master to slave.
* It can either be sent as the first packet of the channel map update procedure,
* or as the last packet in the minimum number of used channels procedure. */
if (direction == BTLE_DIR_MASTER_SLAVE) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_SLAVE_MASTER],
0x19, 1)) {
last_control_proc[BTLE_DIR_SLAVE_MASTER]->frames[1] = pinfo->num;
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (btle_context && btle_context->event_counter_valid) {
last_control_proc[BTLE_DIR_SLAVE_MASTER]->instant = item_value;
last_control_proc[BTLE_DIR_SLAVE_MASTER]->frame_with_instant_value = pinfo->num;
} else {
/* Event counter is not available, assume the procedure completes now. */
last_control_proc[BTLE_DIR_SLAVE_MASTER]->last_frame = pinfo->num;
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_SLAVE_MASTER]->frames[0]);
proto_item_set_generated(sub_item);
} else {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_info_t *proc_info;
proc_info = control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
if (proc_info) {
if (btle_context && btle_context->event_counter_valid) {
proc_info->instant = item_value;
proc_info->frame_with_instant_value = pinfo->num;
} else {
/* Event counter is not available, assume the procedure completes now. */
proc_info->last_frame = pinfo->num;
}
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
}
} else if (direction == BTLE_DIR_SLAVE_MASTER) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
break;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
case 0x02: /* LL_TERMINATE_IND */
Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ... (for some dissectors which fetch all other integral fields using ENC_LITTLE_ENDIAN). Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd Reviewed-on: https://code.wireshark.org/review/5752 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 19:59:26 +00:00
proto_tree_add_item(btle_tree, hf_control_error_code, tvb, offset, 1, ENC_LITTLE_ENDIAN);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 1;
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* No need to mark procedure as started, as the procedure only consist
* of one packet which may be sent at any time, */
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
break;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
case 0x03: /* LL_ENC_REQ */
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
proto_tree_add_item(btle_tree, hf_control_random_number, tvb, offset, 8, ENC_LITTLE_ENDIAN);
offset += 8;
proto_tree_add_item(btle_tree, hf_control_encrypted_diversifier, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_master_session_key_diversifier, tvb, offset, 8, ENC_LITTLE_ENDIAN);
offset += 8;
proto_tree_add_item(btle_tree, hf_control_master_session_initialization_vector, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_ENC_REQ can only be sent from master to slave. */
if (direction == BTLE_DIR_MASTER_SLAVE) {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[BTLE_DIR_MASTER_SLAVE].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
} else if (direction == BTLE_DIR_SLAVE_MASTER) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
break;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
case 0x04: /* LL_ENC_RSP */
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
proto_tree_add_item(btle_tree, hf_control_slave_session_key_diversifier, tvb, offset, 8, ENC_LITTLE_ENDIAN);
offset += 8;
proto_tree_add_item(btle_tree, hf_control_slave_session_initialization_vector, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_ENC_REQ can only be sent from slave to master. */
if (direction == BTLE_DIR_SLAVE_MASTER) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x3, 1)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[1] = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
} else if (direction == BTLE_DIR_MASTER_SLAVE) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
break;
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
case 0x05: /* LL_START_ENC_REQ */
offset = dissect_ctrl_pdu_without_data(tvb, pinfo, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_START_ENC_REQ can only be sent from slave to master. */
if (direction == BTLE_DIR_SLAVE_MASTER) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x3, 2)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[2] = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
} else if (direction == BTLE_DIR_MASTER_SLAVE) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
case 0x06: /* LL_START_ENC_RSP */
offset = dissect_ctrl_pdu_without_data(tvb, pinfo, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* This is either frame 4 or 5 of the procedure */
if (direction == BTLE_DIR_MASTER_SLAVE &&
control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x3, 3)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[3] = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else if (direction == BTLE_DIR_SLAVE_MASTER &&
control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x3, 4)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[4] = pinfo->num;
last_control_proc[BTLE_DIR_MASTER_SLAVE]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
case 0x07: /* LL_UNKNOWN_RSP */
Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ... (for some dissectors which fetch all other integral fields using ENC_LITTLE_ENDIAN). Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd Reviewed-on: https://code.wireshark.org/review/5752 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 19:59:26 +00:00
proto_tree_add_item(btle_tree, hf_control_unknown_type, tvb, offset, 1, ENC_LITTLE_ENDIAN);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 1;
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* LL_UNKNOWN_RSP can only be sent as the second frame of a procedure. */
if (last_control_proc[other_direction] &&
control_proc_can_add_frame_even_if_complete(pinfo,
last_control_proc[other_direction],
last_control_proc[other_direction]->proc_opcode,
1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
break;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
case 0x08: /* LL_FEATURE_REQ */
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
offset = dissect_feature_set(tvb, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_FEATURE_REQ can only be sent from master to slave. */
if (direction == BTLE_DIR_MASTER_SLAVE) {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
connection_info->direction_info[direction].control_procs,
control_opcode);
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
} else if (direction == BTLE_DIR_SLAVE_MASTER) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
case 0x09: /* LL_FEATURE_RSP */
offset = dissect_feature_set(tvb, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x08, 1) ||
control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x0E, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
case 0x0A: /* LL_PAUSE_ENC_REQ */
if (tvb_reported_length_remaining(tvb, offset) > 3) {
proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3);
offset += tvb_reported_length_remaining(tvb, offset) - 3;
}
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_PAUSE_ENC_REQ can only be sent from master to slave. */
if (direction == BTLE_DIR_MASTER_SLAVE) {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[BTLE_DIR_MASTER_SLAVE].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
} else if (direction == BTLE_DIR_SLAVE_MASTER) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
case 0x0B: /* LL_PAUSE_ENC_RSP */
offset = dissect_ctrl_pdu_without_data(tvb, pinfo, btle_tree, offset);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
if (direction == BTLE_DIR_SLAVE_MASTER &&
control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x0A, 1)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[1] = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else if (direction == BTLE_DIR_MASTER_SLAVE &&
control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x0A, 2)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[2] = pinfo->num;
last_control_proc[BTLE_DIR_MASTER_SLAVE]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
break;
case 0x0C: /* LL_VERSION_IND */
Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ... (for some dissectors which fetch all other integral fields using ENC_LITTLE_ENDIAN). Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd Reviewed-on: https://code.wireshark.org/review/5752 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 19:59:26 +00:00
proto_tree_add_item(btle_tree, hf_control_version_number, tvb, offset, 1, ENC_LITTLE_ENDIAN);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 1;
proto_tree_add_item(btle_tree, hf_control_company_id, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
proto_tree_add_item(btle_tree, hf_control_subversion_number, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_VERSION_IND can be sent as a request or response.
* We first check if it is a response. */
if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x0C, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
break;
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
case 0x0D: /* LL_REJECT_IND */
proto_tree_add_item(btle_tree, hf_control_error_code, tvb, offset, 1, ENC_LITTLE_ENDIAN);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 1;
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* LL_REJECT_IND my be sent as:
* - A response to the LL_ENQ_REQ from the master
* - After the LL_ENC_RSP from the slave */
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
if (direction == BTLE_DIR_SLAVE_MASTER) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x03, 1)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[1] = pinfo->num;
last_control_proc[BTLE_DIR_MASTER_SLAVE]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x03, 2)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[2] = pinfo->num;
last_control_proc[BTLE_DIR_MASTER_SLAVE]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
} else if (direction == BTLE_DIR_MASTER_SLAVE) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
case 0x0E: /* LL_SLAVE_FEATURE_REQ */
offset = dissect_feature_set(tvb, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_SLAVE_FEATURE_REQ can only be sent from slave to master. */
if (direction == BTLE_DIR_SLAVE_MASTER) {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
} else if (direction == BTLE_DIR_MASTER_SLAVE) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
case 0x0F: /* LL_CONNECTION_PARAM_REQ */
offset = dissect_conn_param_req_rsp(tvb, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
if (direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
case 0x10: /* LL_CONNECTION_PARAM_RSP */
offset = dissect_conn_param_req_rsp(tvb, btle_tree, offset);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_CONNECTION_PARAM_RSP can only be sent from slave to master
* as a response to a master initiated procedure */
if (direction == BTLE_DIR_SLAVE_MASTER) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x0F, 1)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[1] = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
} else if (direction == BTLE_DIR_MASTER_SLAVE) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
break;
btle: LL_REJECT_IND_EXT -> LL_REJECT_EXT_IND Use the name defined by the Bluetooth Specification. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-10 19:50:25 +00:00
case 0x11: /* LL_REJECT_EXT_IND */
Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ... (for some dissectors which fetch all other integral fields using ENC_LITTLE_ENDIAN). Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd Reviewed-on: https://code.wireshark.org/review/5752 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 19:59:26 +00:00
proto_tree_add_item(btle_tree, hf_control_reject_opcode, tvb, offset, 1, ENC_LITTLE_ENDIAN);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 1;
Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ... (for some dissectors which fetch all other integral fields using ENC_LITTLE_ENDIAN). Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd Reviewed-on: https://code.wireshark.org/review/5752 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 19:59:26 +00:00
proto_tree_add_item(btle_tree, hf_control_error_code, tvb, offset, 1, ENC_LITTLE_ENDIAN);
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
offset += 1;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* LL_REJECT_EXT_IND my be sent as:
* - A response to the LL_ENQ_REQ from the master
* - After the LL_ENC_RSP from the slave
* - As a response to LL_CONNECTION_PARAM_REQ
* - As a response to LL_CONNECTION_PARAM_RSP
* - As a response during the phy update procedure.
*/
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
if (direction == BTLE_DIR_SLAVE_MASTER &&
control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x03, 1)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[1] = pinfo->num;
last_control_proc[BTLE_DIR_MASTER_SLAVE]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else if (direction == BTLE_DIR_SLAVE_MASTER &&
control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x03, 2)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[2] = pinfo->num;
last_control_proc[BTLE_DIR_MASTER_SLAVE]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x0F, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x16, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
btle: Add LL_LENGTH_REQ/RSP control data Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e Reviewed-on: https://code.wireshark.org/review/17932 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 18:17:29 +00:00
break;
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
case 0x12: /* LL_PING_REQ */
offset = dissect_ctrl_pdu_without_data(tvb, pinfo, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
case 0x13: /* LL_PING_RSP */
offset = dissect_ctrl_pdu_without_data(tvb, pinfo, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x12, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
btle: Add LL_LENGTH_REQ/RSP control data Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e Reviewed-on: https://code.wireshark.org/review/17932 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 18:17:29 +00:00
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
case 0x14: /* LL_LENGTH_REQ */
dissect_length_req_rsp(tvb, btle_tree, offset);
One more check for connection_info being non-null is needed. This fixes issue #17182.
2021-01-27 08:15:24 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
case 0x15: /* LL_LENGTH_RSP */
dissect_length_req_rsp(tvb, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x14, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
break;
case 0x16: /* LL_PHY_REQ */
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
dissect_phy_req_rsp(tvb, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
}
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
case 0x17: /* LL_PHY_RSP */
dissect_phy_req_rsp(tvb, btle_tree, offset);
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_PHY_RSP can only be sent from slave to master. */
if (direction == BTLE_DIR_SLAVE_MASTER) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x16, 1)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[1] = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
} else if (direction == BTLE_DIR_MASTER_SLAVE) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
break;
case 0x18: /* LL_PHY_UPDATE_IND */
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_m_to_s_phy, ett_m_to_s_phy, hfx_control_phys_update, ENC_NA);
offset += 1;
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_s_to_m_phy, ett_s_to_m_phy, hfx_control_phys_update, ENC_NA);
offset += 1;
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
proto_tree_add_item_ret_uint(btle_tree, hf_control_instant, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
offset += 2;
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_PHY_UPDATE_IND can only be sent from master to slave. */
if (direction == BTLE_DIR_MASTER_SLAVE) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_MASTER_SLAVE],
0x16, 2)) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[2] = pinfo->num;
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (btle_context && btle_context->event_counter_valid) {
last_control_proc[BTLE_DIR_MASTER_SLAVE]->instant = item_value;
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frame_with_instant_value = pinfo->num;
} else {
/* Event counter is not available, assume the procedure completes now. */
last_control_proc[BTLE_DIR_MASTER_SLAVE]->last_frame = pinfo->num;
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_MASTER_SLAVE]->frames[0]);
proto_item_set_generated(sub_item);
} else if (control_proc_can_add_frame(pinfo,
last_control_proc[BTLE_DIR_SLAVE_MASTER],
0x16, 1)){
last_control_proc[BTLE_DIR_SLAVE_MASTER]->frames[1] = pinfo->num;
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (btle_context && btle_context->event_counter_valid) {
last_control_proc[BTLE_DIR_SLAVE_MASTER]->instant = item_value;
last_control_proc[BTLE_DIR_SLAVE_MASTER]->frame_with_instant_value = pinfo->num;
} else {
/* Event counter is not available, assume the procedure completes now. */
last_control_proc[BTLE_DIR_SLAVE_MASTER]->last_frame = pinfo->num;
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[BTLE_DIR_SLAVE_MASTER]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
} else if (direction == BTLE_DIR_SLAVE_MASTER) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
break;
case 0x19: /* LL_MIN_USED_CHANNELS_IND */
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_phys, ett_phys, hfx_control_phys, ENC_NA);
offset += 1;
proto_tree_add_item(btle_tree, hf_control_min_used_channels, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && !btle_frame_info->retransmit) {
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* The LL_MIN_USED_CHANNELS_IND can only be sent from slave to master. */
if (direction == BTLE_DIR_SLAVE_MASTER) {
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
control_proc_info_t *proc_info;
proc_info = control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
control_opcode);
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
/* Procedure completes in the same frame. */
if (proc_info)
proc_info->last_frame = pinfo->num;
} else if (direction == BTLE_DIR_MASTER_SLAVE) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
break;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
case 0x1A: /* LL_CTE_REQ */
proto_tree_add_bitmask(btle_tree, tvb, offset, hf_control_phys, ett_cte, hfx_control_cte, ENC_NA);
offset += 1;
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
control_opcode);
}
Bluetooth: Refactor dissection of control proc packets Now they appear in the correct order. Some common code snippets are extracted out to separate functions. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2020-12-19 09:36:12 +00:00
break;
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
case 0x1B: /* LL_CTE_RSP */
offset = dissect_ctrl_pdu_without_data(tvb, pinfo, btle_tree, offset);
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x1A, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
break;
case 0x1C: /* LL_PERIODIC_SYNC_IND */
offset = dissect_periodic_sync_ind(tvb, btle_tree, offset, pinfo, interface_id, adapter_id);
break;
case 0x1D: /* LL_CLOCK_ACCURACY_REQ */
proto_tree_add_item(btle_tree, hf_control_sleep_clock_accuracy, tvb, offset, 1, ENC_NA);
offset += 1;
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
control_opcode);
}
break;
case 0x1E: /* LL_CLOCK_ACCURACY_RSP */
proto_tree_add_item(btle_tree, hf_control_sleep_clock_accuracy, tvb, offset, 1, ENC_NA);
offset += 1;
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x1D, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
break;
case 0x1F: /* LL_CIS_REQ */
offset = dissect_cis_req(tvb, btle_tree, offset);
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
control_opcode);
}
break;
case 0x20: /* LL_CIS_RSP */
offset = dissect_cis_rsp(tvb, btle_tree, offset);
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x1F, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
break;
case 0x21: /* LL_CIS_IND */
if (!pinfo->fd->visited) {
connection_info_t *nconnection_info;
connection_parameter_info_t *connection_parameter_info;
connection_access_address = tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN);
key[0].length = 1;
key[0].key = &interface_id;
key[1].length = 1;
key[1].key = &adapter_id;
key[2].length = 1;
key[2].key = &connection_access_address;
key[3].length = 1;
key[3].key = &frame_number;
key[4].length = 0;
key[4].key = NULL;
nconnection_info = wmem_new0(wmem_file_scope(), connection_info_t);
nconnection_info->interface_id = interface_id;
nconnection_info->adapter_id = adapter_id;
nconnection_info->access_address = connection_access_address;
if (connection_info) {
memcpy(nconnection_info->master_bd_addr, connection_info->master_bd_addr, 6);
memcpy(nconnection_info->slave_bd_addr, connection_info->slave_bd_addr, 6);
}
/* We don't create control procedure context trees for BTLE_DIR_UNKNOWN,
* as the direction must be known for request/response matching. */
nconnection_info->direction_info[BTLE_DIR_MASTER_SLAVE].control_procs =
wmem_tree_new(wmem_file_scope());
nconnection_info->direction_info[BTLE_DIR_SLAVE_MASTER].control_procs =
wmem_tree_new(wmem_file_scope());
wmem_tree_insert32_array(connection_info_tree, key, nconnection_info);
connection_parameter_info = wmem_new0(wmem_file_scope(), connection_parameter_info_t);
connection_parameter_info->parameters_frame = pinfo->num;
key[3].length = 1;
key[3].key = &pinfo->num;
wmem_tree_insert32_array(connection_parameter_info_tree, key, connection_parameter_info);
}
offset = dissect_cis_ind(tvb, btle_tree, offset);
break;
case 0x22: /* LL_CIS_TERMINATE_IND */
offset = dissect_cis_terminate_ind(tvb, btle_tree, offset);
break;
case 0x23: /* LL_POWER_CONTROL_REQ */
offset = dissect_power_control_req(tvb, btle_tree, offset);
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
if (control_proc_invalid_collision(pinfo,
last_control_proc[other_direction],
control_opcode)) {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_invalid_collision);
}
control_proc_start(tvb, pinfo, btle_tree, control_proc_item,
connection_info->direction_info[direction].control_procs,
control_opcode);
}
break;
case 0x24: /* LL_POWER_CONTROL_RSP */
offset = dissect_power_control_rsp(tvb, btle_tree, offset);
if (connection_info && !btle_frame_info->retransmit && direction != BTLE_DIR_UNKNOWN) {
if (control_proc_can_add_frame(pinfo,
last_control_proc[other_direction],
0x23, 1)) {
last_control_proc[other_direction]->frames[1] = pinfo->num;
last_control_proc[other_direction]->last_frame = pinfo->num;
sub_item = proto_tree_add_uint(btle_tree, hf_request_in_frame, tvb, 0, 0,
last_control_proc[other_direction]->frames[0]);
proto_item_set_generated(sub_item);
} else {
expert_add_info(pinfo, control_proc_item, &ei_control_proc_wrong_seq);
}
}
break;
case 0x25: /* LL_POWER_CHANGE_IND */
offset = dissect_power_control_ind(tvb, btle_tree, offset);
break;
default:
offset = dissect_ctrl_pdu_without_data(tvb, pinfo, btle_tree, offset);
break;
}
break;
case 0x04: /* Unframed CIS Data PDU; end fragment of an SDU or a complete SDU */
case 0x05: /* Unframed CIS Data PDU; start or continuation fragment of an SDU */
case 0x06: /* Framed CIS Data PDU; one or more segments of an SDU */
proto_tree_add_item(btle_tree, hf_isochronous_data, tvb, offset, length, ENC_NA);
offset += length;
break;
default:
if (tvb_reported_length_remaining(tvb, offset) > 3) {
proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3);
offset += tvb_reported_length_remaining(tvb, offset) - 3;
}
}
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
if (add_l2cap_index) {
item = proto_tree_add_uint(btle_tree, hf_l2cap_index, tvb, 0, 0, btle_frame_info->l2cap_index);
epan: Convert our PROTO_ITEM_ macros to inline functions. Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-03 21:32:30 +00:00
proto_item_set_generated(item);
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
}
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
key[0].length = 1;
key[0].key = &interface_id;
key[1].length = 1;
key[1].key = &adapter_id;
key[2].length = 1;
key[2].key = &access_address;
key[3].length = 0;
key[3].key = NULL;
wmem_tree = (wmem_tree_t *) wmem_tree_lookup32_array(connection_parameter_info_tree, key);
if (wmem_tree) {
connection_parameter_info_t *connection_parameter_info;
Bluetooth: Fix NULL pointer dereference crash Occured when a control procedure packet was logged without connection context. The bug was introduced in 0dab2494ca5e20c5ab90ea7fbe11ada1316e41ee Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-26 07:42:02 +00:00
if (connection_info && connection_info->connection_parameter_update_info != NULL &&
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
btle_context && btle_context->event_counter_valid) {
if ( ((gint16)btle_context->event_counter - connection_info->connection_parameter_update_instant) >= 0) {
wmem_tree_insert32(wmem_tree, pinfo->num, connection_info->connection_parameter_update_info);
connection_info->connection_parameter_update_info = NULL;
}
}
connection_parameter_info = (connection_parameter_info_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->num);
item = proto_tree_add_uint(btle_tree, hf_connection_parameters_in, tvb, 0, 0, connection_parameter_info->parameters_frame);
proto_item_set_generated(item);
}
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
if ((crc_status == CRC_INDETERMINATE) &&
btle_context && btle_context->connection_info_valid) {
/* the surrounding context has provided CRCInit */
crc_init = btle_context->connection_info.CRCInit;
crc_status = CRC_CAN_BE_CALCULATED;
}
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
} else if (btle_pdu_type == BTLE_PDU_TYPE_BROADCASTISO) {
broadcastiso_connection_info_t *broadcastiso_connection_info = NULL;
guint32 seed_access_address = access_address & 0x0041ffff;
proto_item *data_header_item;
proto_tree *data_header_tree;
guint8 llid;
guint8 control_opcode;
key[0].length = 1;
key[0].key = &interface_id;
key[1].length = 1;
key[1].key = &adapter_id;
key[2].length = 1;
key[2].key = &seed_access_address;
key[3].length = 0;
key[3].key = NULL;
wmem_tree = (wmem_tree_t *) wmem_tree_lookup32_array(broadcastiso_connection_info_tree, key);
if (wmem_tree) {
broadcastiso_connection_info = (broadcastiso_connection_info_t *) wmem_tree_lookup32_le(wmem_tree, pinfo->num);
if (broadcastiso_connection_info) {
gchar *str_addr_src;
/* Holds "Master" + access_address + NULL, which is the longest string */
int str_addr_len = 17 + 1;
str_addr_src = (gchar *) wmem_alloc(pinfo->pool, str_addr_len);
sub_item = proto_tree_add_ether(btle_tree, hf_master_bd_addr, tvb, 0, 0, broadcastiso_connection_info->master_bd_addr);
proto_item_set_generated(sub_item);
g_snprintf(str_addr_src, str_addr_len, "Master_0x%08x", broadcastiso_connection_info->access_address);
set_address(&pinfo->dl_src, AT_ETHER, sizeof(broadcastiso_connection_info->master_bd_addr), broadcastiso_connection_info->master_bd_addr);
clear_address(&pinfo->dl_dst);
set_address(&pinfo->net_src, AT_STRINGZ, (int)strlen(str_addr_src)+1, str_addr_src);
copy_address_shallow(&pinfo->src, &pinfo->net_src);
if (!pinfo->fd->visited) {
address *addr;
addr = (address *) wmem_memdup(wmem_file_scope(), &pinfo->dl_src, sizeof(address));
addr->data = wmem_memdup(wmem_file_scope(), pinfo->dl_src.data, pinfo->dl_src.len);
p_add_proto_data(wmem_file_scope(), pinfo, proto_bluetooth, BLUETOOTH_DATA_SRC, addr);
}
}
}
set_address(&pinfo->net_dst, AT_ETHER, 6, broadcast_addr);
copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst);
copy_address_shallow(&pinfo->dst, &pinfo->net_dst);
data_header_item = proto_tree_add_item(btle_tree, hf_data_header, tvb, offset, 2, ENC_LITTLE_ENDIAN);
data_header_tree = proto_item_add_subtree(data_header_item, ett_data_header);
proto_tree_add_item(data_header_tree, hf_data_header_llid_broadcastiso, tvb, offset, 1, ENC_LITTLE_ENDIAN);
llid = tvb_get_guint8(tvb, offset) & 0x03;
proto_tree_add_item(data_header_tree, hf_data_header_control_subevent_sequence_number, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(data_header_tree, hf_data_header_control_subevent_transmission_flag, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(data_header_tree, hf_data_header_rfu_67, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
proto_tree_add_item(data_header_tree, hf_data_header_length, tvb, offset, 1, ENC_LITTLE_ENDIAN);
item = proto_tree_add_item_ret_uint(btle_tree, hf_length, tvb, offset, 1, ENC_LITTLE_ENDIAN, &length);
proto_item_set_hidden(item);
offset += 1;
switch (llid) {
case 0x00: /* Unframed BIS Data PDU; end fragment of an SDU or a complete SDU */
case 0x01: /* Unframed BIS Data PDU; start or continuation fragment of an SDU */
case 0x02: /* Framed BIS Data PDU; one or more segments of an SDU */
proto_tree_add_item(btle_tree, hf_isochronous_data, tvb, offset, length, ENC_NA);
offset += length;
break;
case 0x03: /* BIG Control PDU */
proto_tree_add_item(btle_tree, hf_big_control_opcode, tvb, offset, 1, ENC_LITTLE_ENDIAN);
control_opcode = tvb_get_guint8(tvb, offset);
offset += 1;
col_add_fstr(pinfo->cinfo, COL_INFO, "BIG Control Opcode: %s",
val_to_str_ext_const(control_opcode, &big_control_opcode_vals_ext, "Unknown"));
switch (control_opcode) {
case 0x00: /* BIG_CHANNEL_MAP_IND */
sub_item = proto_tree_add_item(btle_tree, hf_control_channel_map, tvb, offset, 5, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_channel_map);
call_dissector(btcommon_le_channel_map_handle, tvb_new_subset_length(tvb, offset, 5), pinfo, sub_tree);
offset += 5;
proto_tree_add_item_ret_uint(btle_tree, hf_control_instant, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
offset += 2;
break;
case 0x01: /* BIG_TERMINATE_IND */
proto_tree_add_item(btle_tree, hf_control_error_code, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
proto_tree_add_item_ret_uint(btle_tree, hf_control_instant, tvb, offset, 2, ENC_LITTLE_ENDIAN, &item_value);
offset += 2;
break;
default:
offset = dissect_ctrl_pdu_without_data(tvb, pinfo, btle_tree, offset);
break;
}
break;
default:
if (tvb_reported_length_remaining(tvb, offset) > 3) {
proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3);
offset += tvb_reported_length_remaining(tvb, offset) - 3;
}
}
Bluetooth: Provide BTLE physical channel pdu type from capture context. Add BTLE physical channel pdu type from capture context. The dissector uses the access address to determine if the packet is either an Advertising physical channel PDU or a Data physical channel PDU. This assupmtion is not valid for Periodic Advertising where the AUX_SYNC_IND advertising packet will be sent with a non-advertising access address. There is also the new Isochronous physical channel PDU which can be both broadcasted or connection-oriented. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345318 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36782 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-04-01 13:52:08 +00:00
} else {
/* Unknown physical channel PDU type */
if (tvb_reported_length_remaining(tvb, offset) > 3) {
proto_tree_add_expert(btle_tree, pinfo, &ei_unknown_data, tvb, offset, tvb_reported_length_remaining(tvb, offset) - 3);
offset += tvb_reported_length_remaining(tvb, offset) - 3;
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
}
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
/* BT spec Vol 6, Part B, Section 1.2: CRC is big endian and bits in byte are flipped */
packet_crc = reverse_bits_per_byte(tvb_get_ntoh24(tvb, offset));
sub_item = proto_tree_add_uint(btle_tree, hf_crc, tvb, offset, 3, packet_crc);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
offset += 3;
Introduces two new Bluetooth DLTs for RF-based captures. Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-22 07:39:45 +00:00
if (crc_status == CRC_CAN_BE_CALCULATED) {
guint32 crc = btle_crc(tvb, length, crc_init);
crc_status = (packet_crc == crc) ? CRC_CORRECT : CRC_INCORRECT;
}
switch(crc_status) {
case CRC_INDETERMINATE:
expert_add_info(pinfo, sub_item, &ei_crc_cannot_be_determined);
break;
case CRC_INCORRECT:
expert_add_info(pinfo, sub_item, &ei_crc_incorrect);
break;
case CRC_CORRECT:
default:
break;
}
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
return offset;
}
void
proto_register_btle(void)
{
module_t *module;
expert_module_t *expert_module;
static hf_register_info hf[] = {
{ &hf_access_address,
{ "Access Address", "btle.access_address",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
Bluetooth: Add support for dissecting packet format on LE Coded PHY Add support for dissecting packet format on LE Coded PHY. This only includes one additional field, the Coding Indicator (CI) which provides information about the symbol rate of the FEC Block 2 of the pdu. The TERM1 and TERM2 bytes are like the preamble assumed not included in the PDU, these blocks are just bit-sequences for the radio and contains no important information. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531d Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36787 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-11 14:02:03 +00:00
{ &hf_coding_indicator,
{ "Coding Indicator", "btle.coding_indicator",
FT_UINT8, BASE_DEC, VALS(le_coding_indicators), 0x3,
NULL, HFILL }
},
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>
2014-12-12 10:24:44 +00:00
{ &hf_master_bd_addr,
{ "Master Address", "btle.master_bd_addr",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_slave_bd_addr,
{ "Slave Address", "btle.slave_bd_addr",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
{ &hf_length,
btle: Add a convenience btle.length field Add a convenience btle.length field for easier filtering of BTLE packets without data and with specific length ranges. Change-Id: If56eac9c86ccf40741a6ceb50d13a1733132f448 Reviewed-on: https://code.wireshark.org/review/19348 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-12-19 14:40:59 +00:00
{ "Length", "btle.length",
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
FT_UINT8, BASE_DEC, NULL, 0x0,
btle: Add a convenience btle.length field Add a convenience btle.length field for easier filtering of BTLE packets without data and with specific length ranges. Change-Id: If56eac9c86ccf40741a6ceb50d13a1733132f448 Reviewed-on: https://code.wireshark.org/review/19348 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-12-19 14:40:59 +00:00
NULL, HFILL }
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ &hf_advertising_header,
{ "Packet Header", "btle.advertising_header",
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_advertising_header_pdu_type,
{ "PDU Type", "btle.advertising_header.pdu_type",
bluetooth: Provide auxiliary PDU types name from capture context Provide a mechanism for the capture context to provide the auxiliary PDU type name since this value cannot be inferred from the bytestream and must be taken from context instead. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345319 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36783 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-11 12:55:39 +00:00
FT_UINT8, BASE_HEX, NULL, 0x0F,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
{ &hf_advertising_header_rfu_1,
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
{ "Reserved", "btle.advertising_header.rfu.1",
btle: Add Channel Selection Algorithm Change-Id: I4d215bfb991ecf057ee9f6dda346b2fe6cee0bad Reviewed-on: https://code.wireshark.org/review/23324 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-31 11:37:31 +00:00
FT_UINT8, BASE_DEC, NULL, 0x10,
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
"Reserved for Future Use", HFILL }
btle: Add Channel Selection Algorithm Change-Id: I4d215bfb991ecf057ee9f6dda346b2fe6cee0bad Reviewed-on: https://code.wireshark.org/review/23324 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-31 11:37:31 +00:00
},
{ &hf_advertising_header_ch_sel,
{ "Channel Selection Algorithm", "btle.advertising_header.ch_sel",
FT_BOOLEAN, 8, TFS(&tfs_ch_sel), 0x20,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
{ &hf_advertising_header_rfu_2,
{ "Reserved", "btle.advertising_header.rfu.2",
FT_UINT8, BASE_DEC, NULL, 0x20,
"Reserved for Future Use", HFILL }
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ &hf_advertising_header_randomized_tx,
btle: Improved packet header display Show elements in correct order. Show TxAdd and RxAdd values as "Random" or "Public". Change-Id: Ie75716d05d2aadf3d573a9dc078f32e6f981a691 Reviewed-on: https://code.wireshark.org/review/17012 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-11 15:57:25 +00:00
{ "Tx Address", "btle.advertising_header.randomized_tx",
FT_BOOLEAN, 8, TFS(&tfs_random_public), 0x40,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
{ &hf_advertising_header_rfu_3,
{ "Reserved", "btle.advertising_header.rfu.3",
FT_UINT8, BASE_DEC, NULL, 0x40,
"Reserved for Future Use", HFILL }
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ &hf_advertising_header_randomized_rx,
btle: Improved packet header display Show elements in correct order. Show TxAdd and RxAdd values as "Random" or "Public". Change-Id: Ie75716d05d2aadf3d573a9dc078f32e6f981a691 Reviewed-on: https://code.wireshark.org/review/17012 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-11 15:57:25 +00:00
{ "Rx Address", "btle.advertising_header.randomized_rx",
FT_BOOLEAN, 8, TFS(&tfs_random_public), 0x80,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
Bluetooth: Add handling of ADV_EXT_IND and setting valid adv header flags Add handling of ADV_EXT_IND and setting valid adv header flags. Advertising Extension assumes channel selection #2, and both TX and RX address type bits must be checked if present in the extended advertising header by reading the extended advertising header flags. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345315 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-30 17:47:43 +00:00
{ &hf_advertising_header_rfu_4,
{ "Reserved", "btle.advertising_header.rfu.4",
FT_UINT8, BASE_DEC, NULL, 0x80,
"Reserved for Future Use", HFILL }
Bluetooth: btle: Make RxAdd field reserved in some cases Specification: "If the TxAdd or RxAdd fields are not defined as used in a given PDU then they shall be considered Reserved for Future Use." Change-Id: I767c0df0366afe789624046cda2d49c9875ffe60 Reviewed-on: https://code.wireshark.org/review/103 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-30 07:44:35 +00:00
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ &hf_advertising_header_length,
{ "Length", "btle.advertising_header.length",
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
FT_UINT8, BASE_DEC, NULL, 0x0,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
{ &hf_advertising_address,
{ "Advertising Address", "btle.advertising_address",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_initiator_addresss,
More spelling fixes, start of second pass of dissectors. Now easier to find errors due to script improvements and more complete dictionary file.
2020-08-30 21:34:34 +00:00
{ "Initiator Address", "btle.initiator_address",
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
Bluetooth: Set correct name of target address in ADV_DIRECT_IND PDU The initiator address field of the directed advertising PDU has been renamed to target address in newer versions of the Bluetooth specification. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345313 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36778 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-01 14:13:01 +00:00
{ &hf_target_addresss,
{ "Target Address", "btle.target_address",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ &hf_scanning_address,
{ "Scanning Address", "btle.scanning_address",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_scan_response_data,
{ "Scan Response Data", "btle.scan_responce_data",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data,
{ "Link Layer Data", "btle.link_layer_data",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data_access_address,
{ "Access Address", "btle.link_layer_data.access_address",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data_crc_init,
{ "CRC Init", "btle.link_layer_data.crc_init",
FT_UINT24, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data_window_size,
{ "Window Size", "btle.link_layer_data.window_size",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data_window_offset,
{ "Window Offset", "btle.link_layer_data.window_offset",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data_interval,
{ "Interval", "btle.link_layer_data.interval",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data_latency,
{ "Latency", "btle.link_layer_data.latency",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data_timeout,
{ "Timeout", "btle.link_layer_data.timeout",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data_channel_map,
{ "Channel Map", "btle.link_layer_data.channel_map",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_link_layer_data_hop,
{ "Hop", "btle.link_layer_data.hop",
BTLE: fix bitmap for link data Hop / Sleep Clock Accuracy Bug: 13990 Change-Id: I4d5acaf580adbe2c5bff1aac3d2837a8842cd519 Reviewed-on: https://code.wireshark.org/review/23172 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-23 06:08:55 +00:00
FT_UINT8, BASE_DEC, NULL, 0x1f,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
{ &hf_link_layer_data_sleep_clock_accuracy,
{ "Sleep Clock Accuracy", "btle.link_layer_data.sleep_clock_accuracy",
BTLE: fix bitmap for link data Hop / Sleep Clock Accuracy Bug: 13990 Change-Id: I4d5acaf580adbe2c5bff1aac3d2837a8842cd519 Reviewed-on: https://code.wireshark.org/review/23172 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-23 06:08:55 +00:00
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &sleep_clock_accuracy_vals_ext, 0xe0,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
{ &hf_extended_advertising_header,
{ "Extended Advertising Header", "btle.extended_advertising_header",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_header_length,
{ "Extended Header Length", "btle.extended_advertising_header.length",
FT_UINT8, BASE_DEC, NULL, 0x3F,
NULL, HFILL }
},
{ &hf_extended_advertising_mode,
{ "Advertising Mode", "btle.extended_advertising_header.mode",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &advertising_mode_vals_ext, 0xC0,
NULL, HFILL }
},
{ &hf_extended_advertising_flags,
{ "Extended Header Flags", "btle.extended_advertising_header.flags",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_flags_adva,
{ "Advertiser Address", "btle.extended_advertising_header.flags.advertiser_address",
Find and fix dissectors that should be using a default tfs. Found using tools/check_tfs.py, included in this commit. Here are the reports that were fixed here: Examining: All dissector modules epan/dissectors/packet-assa_r3.c tfs_mortisepins_flags - could have used tfs_high_low from tfs.c instead: {High,Low} epan/dissectors/packet-btle.c tfs_present_bit - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-dhcp.c tfs_fqdn_s - could have used tfs_server_client from tfs.c instead: {Server,Client} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_en_dis - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-docsis-macmgmt.c req_not_req_tfs - could have used tfs_requested_not_requested from tfs.c instead: {Requested,Not Requested} epan/dissectors/packet-docsis-tlv.c on_off_tfs - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-tlv.c activation_tfs - could have used tfs_active_inactive from tfs.c instead: {Active,Inactive} epan/dissectors/packet-docsis.c ena_dis_tfs - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-ecmp.c tfs_not_expected_expected - could have used tfs_odd_even from tfs.c instead: {Odd,Even} epan/dissectors/packet-erf.c erf_link_status_tfs - could have used tfs_up_down from tfs.c instead: {Up,Down} epan/dissectors/packet-h263.c on_off_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-h263.c cpm_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-interlink.c flags_set_notset - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-ip.c tos_set_low - could have used tfs_low_normal from tfs.c instead: {Low,Normal} epan/dissectors/packet-ip.c tos_set_high - could have used tfs_high_normal from tfs.c instead: {High,Normal} epan/dissectors/packet-isakmp.c flag_r - could have used tfs_response_request from tfs.c instead: {Response,Request} epan/dissectors/packet-isis-lsp.c tfs_metric_supported_not_supported - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-kerberos.c supported_tfs - could have used tfs_supported_not_supported from tfs.c instead: {Supported,Not supported} epan/dissectors/packet-kerberos.c set_tfs - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-mac-lte.c mac_lte_scell_status_vals - could have used tfs_activated_deactivated from tfs.c instead: {Activated,Deactivated} epan/dissectors/packet-p_mul.c no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-pgm.c opts_present - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-rsl.c rsl_ms_fpc_epc_mode_vals - could have used tfs_inuse_not_inuse from tfs.c instead: {In use,Not in use} epan/dissectors/packet-sita.c tfs_sita_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-vines.c tfs_vine_rtp_no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-vnc.c button_mask_tfs - could have used tfs_pressed_not_pressed from tfs.c instead: {Pressed,Not pressed} 27 issues found Change-Id: I7e53b491f20289955c9e9caa8357197d9010a5aa Reviewed-on: https://code.wireshark.org/review/38087 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-07 20:15:46 +00:00
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x01,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_flags_targeta,
{ "Target Address", "btle.extended_advertising_header.flags.target_address",
Find and fix dissectors that should be using a default tfs. Found using tools/check_tfs.py, included in this commit. Here are the reports that were fixed here: Examining: All dissector modules epan/dissectors/packet-assa_r3.c tfs_mortisepins_flags - could have used tfs_high_low from tfs.c instead: {High,Low} epan/dissectors/packet-btle.c tfs_present_bit - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-dhcp.c tfs_fqdn_s - could have used tfs_server_client from tfs.c instead: {Server,Client} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_en_dis - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-docsis-macmgmt.c req_not_req_tfs - could have used tfs_requested_not_requested from tfs.c instead: {Requested,Not Requested} epan/dissectors/packet-docsis-tlv.c on_off_tfs - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-tlv.c activation_tfs - could have used tfs_active_inactive from tfs.c instead: {Active,Inactive} epan/dissectors/packet-docsis.c ena_dis_tfs - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-ecmp.c tfs_not_expected_expected - could have used tfs_odd_even from tfs.c instead: {Odd,Even} epan/dissectors/packet-erf.c erf_link_status_tfs - could have used tfs_up_down from tfs.c instead: {Up,Down} epan/dissectors/packet-h263.c on_off_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-h263.c cpm_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-interlink.c flags_set_notset - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-ip.c tos_set_low - could have used tfs_low_normal from tfs.c instead: {Low,Normal} epan/dissectors/packet-ip.c tos_set_high - could have used tfs_high_normal from tfs.c instead: {High,Normal} epan/dissectors/packet-isakmp.c flag_r - could have used tfs_response_request from tfs.c instead: {Response,Request} epan/dissectors/packet-isis-lsp.c tfs_metric_supported_not_supported - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-kerberos.c supported_tfs - could have used tfs_supported_not_supported from tfs.c instead: {Supported,Not supported} epan/dissectors/packet-kerberos.c set_tfs - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-mac-lte.c mac_lte_scell_status_vals - could have used tfs_activated_deactivated from tfs.c instead: {Activated,Deactivated} epan/dissectors/packet-p_mul.c no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-pgm.c opts_present - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-rsl.c rsl_ms_fpc_epc_mode_vals - could have used tfs_inuse_not_inuse from tfs.c instead: {In use,Not in use} epan/dissectors/packet-sita.c tfs_sita_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-vines.c tfs_vine_rtp_no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-vnc.c button_mask_tfs - could have used tfs_pressed_not_pressed from tfs.c instead: {Pressed,Not pressed} 27 issues found Change-Id: I7e53b491f20289955c9e9caa8357197d9010a5aa Reviewed-on: https://code.wireshark.org/review/38087 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-07 20:15:46 +00:00
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x02,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_flags_cteinfo,
{ "CTE Info", "btle.extended_advertising_header.flags.cte_info",
Find and fix dissectors that should be using a default tfs. Found using tools/check_tfs.py, included in this commit. Here are the reports that were fixed here: Examining: All dissector modules epan/dissectors/packet-assa_r3.c tfs_mortisepins_flags - could have used tfs_high_low from tfs.c instead: {High,Low} epan/dissectors/packet-btle.c tfs_present_bit - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-dhcp.c tfs_fqdn_s - could have used tfs_server_client from tfs.c instead: {Server,Client} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_en_dis - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-docsis-macmgmt.c req_not_req_tfs - could have used tfs_requested_not_requested from tfs.c instead: {Requested,Not Requested} epan/dissectors/packet-docsis-tlv.c on_off_tfs - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-tlv.c activation_tfs - could have used tfs_active_inactive from tfs.c instead: {Active,Inactive} epan/dissectors/packet-docsis.c ena_dis_tfs - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-ecmp.c tfs_not_expected_expected - could have used tfs_odd_even from tfs.c instead: {Odd,Even} epan/dissectors/packet-erf.c erf_link_status_tfs - could have used tfs_up_down from tfs.c instead: {Up,Down} epan/dissectors/packet-h263.c on_off_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-h263.c cpm_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-interlink.c flags_set_notset - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-ip.c tos_set_low - could have used tfs_low_normal from tfs.c instead: {Low,Normal} epan/dissectors/packet-ip.c tos_set_high - could have used tfs_high_normal from tfs.c instead: {High,Normal} epan/dissectors/packet-isakmp.c flag_r - could have used tfs_response_request from tfs.c instead: {Response,Request} epan/dissectors/packet-isis-lsp.c tfs_metric_supported_not_supported - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-kerberos.c supported_tfs - could have used tfs_supported_not_supported from tfs.c instead: {Supported,Not supported} epan/dissectors/packet-kerberos.c set_tfs - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-mac-lte.c mac_lte_scell_status_vals - could have used tfs_activated_deactivated from tfs.c instead: {Activated,Deactivated} epan/dissectors/packet-p_mul.c no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-pgm.c opts_present - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-rsl.c rsl_ms_fpc_epc_mode_vals - could have used tfs_inuse_not_inuse from tfs.c instead: {In use,Not in use} epan/dissectors/packet-sita.c tfs_sita_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-vines.c tfs_vine_rtp_no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-vnc.c button_mask_tfs - could have used tfs_pressed_not_pressed from tfs.c instead: {Pressed,Not pressed} 27 issues found Change-Id: I7e53b491f20289955c9e9caa8357197d9010a5aa Reviewed-on: https://code.wireshark.org/review/38087 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-07 20:15:46 +00:00
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x04,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_flags_advdatainfo,
{ "Advertiser Data Info", "btle.extended_advertising_header.advertiser_data_info",
Find and fix dissectors that should be using a default tfs. Found using tools/check_tfs.py, included in this commit. Here are the reports that were fixed here: Examining: All dissector modules epan/dissectors/packet-assa_r3.c tfs_mortisepins_flags - could have used tfs_high_low from tfs.c instead: {High,Low} epan/dissectors/packet-btle.c tfs_present_bit - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-dhcp.c tfs_fqdn_s - could have used tfs_server_client from tfs.c instead: {Server,Client} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_en_dis - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-docsis-macmgmt.c req_not_req_tfs - could have used tfs_requested_not_requested from tfs.c instead: {Requested,Not Requested} epan/dissectors/packet-docsis-tlv.c on_off_tfs - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-tlv.c activation_tfs - could have used tfs_active_inactive from tfs.c instead: {Active,Inactive} epan/dissectors/packet-docsis.c ena_dis_tfs - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-ecmp.c tfs_not_expected_expected - could have used tfs_odd_even from tfs.c instead: {Odd,Even} epan/dissectors/packet-erf.c erf_link_status_tfs - could have used tfs_up_down from tfs.c instead: {Up,Down} epan/dissectors/packet-h263.c on_off_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-h263.c cpm_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-interlink.c flags_set_notset - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-ip.c tos_set_low - could have used tfs_low_normal from tfs.c instead: {Low,Normal} epan/dissectors/packet-ip.c tos_set_high - could have used tfs_high_normal from tfs.c instead: {High,Normal} epan/dissectors/packet-isakmp.c flag_r - could have used tfs_response_request from tfs.c instead: {Response,Request} epan/dissectors/packet-isis-lsp.c tfs_metric_supported_not_supported - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-kerberos.c supported_tfs - could have used tfs_supported_not_supported from tfs.c instead: {Supported,Not supported} epan/dissectors/packet-kerberos.c set_tfs - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-mac-lte.c mac_lte_scell_status_vals - could have used tfs_activated_deactivated from tfs.c instead: {Activated,Deactivated} epan/dissectors/packet-p_mul.c no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-pgm.c opts_present - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-rsl.c rsl_ms_fpc_epc_mode_vals - could have used tfs_inuse_not_inuse from tfs.c instead: {In use,Not in use} epan/dissectors/packet-sita.c tfs_sita_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-vines.c tfs_vine_rtp_no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-vnc.c button_mask_tfs - could have used tfs_pressed_not_pressed from tfs.c instead: {Pressed,Not pressed} 27 issues found Change-Id: I7e53b491f20289955c9e9caa8357197d9010a5aa Reviewed-on: https://code.wireshark.org/review/38087 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-07 20:15:46 +00:00
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x08,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_flags_aux_ptr,
{ "Aux pointer", "btle.extended_advertising_header.flags.aux_pointer",
Find and fix dissectors that should be using a default tfs. Found using tools/check_tfs.py, included in this commit. Here are the reports that were fixed here: Examining: All dissector modules epan/dissectors/packet-assa_r3.c tfs_mortisepins_flags - could have used tfs_high_low from tfs.c instead: {High,Low} epan/dissectors/packet-btle.c tfs_present_bit - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-dhcp.c tfs_fqdn_s - could have used tfs_server_client from tfs.c instead: {Server,Client} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_en_dis - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-docsis-macmgmt.c req_not_req_tfs - could have used tfs_requested_not_requested from tfs.c instead: {Requested,Not Requested} epan/dissectors/packet-docsis-tlv.c on_off_tfs - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-tlv.c activation_tfs - could have used tfs_active_inactive from tfs.c instead: {Active,Inactive} epan/dissectors/packet-docsis.c ena_dis_tfs - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-ecmp.c tfs_not_expected_expected - could have used tfs_odd_even from tfs.c instead: {Odd,Even} epan/dissectors/packet-erf.c erf_link_status_tfs - could have used tfs_up_down from tfs.c instead: {Up,Down} epan/dissectors/packet-h263.c on_off_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-h263.c cpm_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-interlink.c flags_set_notset - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-ip.c tos_set_low - could have used tfs_low_normal from tfs.c instead: {Low,Normal} epan/dissectors/packet-ip.c tos_set_high - could have used tfs_high_normal from tfs.c instead: {High,Normal} epan/dissectors/packet-isakmp.c flag_r - could have used tfs_response_request from tfs.c instead: {Response,Request} epan/dissectors/packet-isis-lsp.c tfs_metric_supported_not_supported - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-kerberos.c supported_tfs - could have used tfs_supported_not_supported from tfs.c instead: {Supported,Not supported} epan/dissectors/packet-kerberos.c set_tfs - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-mac-lte.c mac_lte_scell_status_vals - could have used tfs_activated_deactivated from tfs.c instead: {Activated,Deactivated} epan/dissectors/packet-p_mul.c no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-pgm.c opts_present - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-rsl.c rsl_ms_fpc_epc_mode_vals - could have used tfs_inuse_not_inuse from tfs.c instead: {In use,Not in use} epan/dissectors/packet-sita.c tfs_sita_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-vines.c tfs_vine_rtp_no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-vnc.c button_mask_tfs - could have used tfs_pressed_not_pressed from tfs.c instead: {Pressed,Not pressed} 27 issues found Change-Id: I7e53b491f20289955c9e9caa8357197d9010a5aa Reviewed-on: https://code.wireshark.org/review/38087 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-07 20:15:46 +00:00
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x10,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_flags_sync_info,
{ "Sync Info", "btle.extended_advertising_header.flags.sync_info",
Find and fix dissectors that should be using a default tfs. Found using tools/check_tfs.py, included in this commit. Here are the reports that were fixed here: Examining: All dissector modules epan/dissectors/packet-assa_r3.c tfs_mortisepins_flags - could have used tfs_high_low from tfs.c instead: {High,Low} epan/dissectors/packet-btle.c tfs_present_bit - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-dhcp.c tfs_fqdn_s - could have used tfs_server_client from tfs.c instead: {Server,Client} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_en_dis - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-docsis-macmgmt.c req_not_req_tfs - could have used tfs_requested_not_requested from tfs.c instead: {Requested,Not Requested} epan/dissectors/packet-docsis-tlv.c on_off_tfs - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-tlv.c activation_tfs - could have used tfs_active_inactive from tfs.c instead: {Active,Inactive} epan/dissectors/packet-docsis.c ena_dis_tfs - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-ecmp.c tfs_not_expected_expected - could have used tfs_odd_even from tfs.c instead: {Odd,Even} epan/dissectors/packet-erf.c erf_link_status_tfs - could have used tfs_up_down from tfs.c instead: {Up,Down} epan/dissectors/packet-h263.c on_off_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-h263.c cpm_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-interlink.c flags_set_notset - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-ip.c tos_set_low - could have used tfs_low_normal from tfs.c instead: {Low,Normal} epan/dissectors/packet-ip.c tos_set_high - could have used tfs_high_normal from tfs.c instead: {High,Normal} epan/dissectors/packet-isakmp.c flag_r - could have used tfs_response_request from tfs.c instead: {Response,Request} epan/dissectors/packet-isis-lsp.c tfs_metric_supported_not_supported - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-kerberos.c supported_tfs - could have used tfs_supported_not_supported from tfs.c instead: {Supported,Not supported} epan/dissectors/packet-kerberos.c set_tfs - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-mac-lte.c mac_lte_scell_status_vals - could have used tfs_activated_deactivated from tfs.c instead: {Activated,Deactivated} epan/dissectors/packet-p_mul.c no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-pgm.c opts_present - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-rsl.c rsl_ms_fpc_epc_mode_vals - could have used tfs_inuse_not_inuse from tfs.c instead: {In use,Not in use} epan/dissectors/packet-sita.c tfs_sita_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-vines.c tfs_vine_rtp_no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-vnc.c button_mask_tfs - could have used tfs_pressed_not_pressed from tfs.c instead: {Pressed,Not pressed} 27 issues found Change-Id: I7e53b491f20289955c9e9caa8357197d9010a5aa Reviewed-on: https://code.wireshark.org/review/38087 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-07 20:15:46 +00:00
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x20,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_flags_tx_power,
{ "TX Power", "btle.extended_advertising_header.flags.tx_power",
Find and fix dissectors that should be using a default tfs. Found using tools/check_tfs.py, included in this commit. Here are the reports that were fixed here: Examining: All dissector modules epan/dissectors/packet-assa_r3.c tfs_mortisepins_flags - could have used tfs_high_low from tfs.c instead: {High,Low} epan/dissectors/packet-btle.c tfs_present_bit - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-dhcp.c tfs_fqdn_s - could have used tfs_server_client from tfs.c instead: {Server,Client} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_en_dis - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-docsis-macmgmt.c req_not_req_tfs - could have used tfs_requested_not_requested from tfs.c instead: {Requested,Not Requested} epan/dissectors/packet-docsis-tlv.c on_off_tfs - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-tlv.c activation_tfs - could have used tfs_active_inactive from tfs.c instead: {Active,Inactive} epan/dissectors/packet-docsis.c ena_dis_tfs - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-ecmp.c tfs_not_expected_expected - could have used tfs_odd_even from tfs.c instead: {Odd,Even} epan/dissectors/packet-erf.c erf_link_status_tfs - could have used tfs_up_down from tfs.c instead: {Up,Down} epan/dissectors/packet-h263.c on_off_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-h263.c cpm_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-interlink.c flags_set_notset - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-ip.c tos_set_low - could have used tfs_low_normal from tfs.c instead: {Low,Normal} epan/dissectors/packet-ip.c tos_set_high - could have used tfs_high_normal from tfs.c instead: {High,Normal} epan/dissectors/packet-isakmp.c flag_r - could have used tfs_response_request from tfs.c instead: {Response,Request} epan/dissectors/packet-isis-lsp.c tfs_metric_supported_not_supported - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-kerberos.c supported_tfs - could have used tfs_supported_not_supported from tfs.c instead: {Supported,Not supported} epan/dissectors/packet-kerberos.c set_tfs - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-mac-lte.c mac_lte_scell_status_vals - could have used tfs_activated_deactivated from tfs.c instead: {Activated,Deactivated} epan/dissectors/packet-p_mul.c no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-pgm.c opts_present - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-rsl.c rsl_ms_fpc_epc_mode_vals - could have used tfs_inuse_not_inuse from tfs.c instead: {In use,Not in use} epan/dissectors/packet-sita.c tfs_sita_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-vines.c tfs_vine_rtp_no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-vnc.c button_mask_tfs - could have used tfs_pressed_not_pressed from tfs.c instead: {Pressed,Not pressed} 27 issues found Change-Id: I7e53b491f20289955c9e9caa8357197d9010a5aa Reviewed-on: https://code.wireshark.org/review/38087 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-07 20:15:46 +00:00
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x40,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_flags_reserved,
{ "Reserved", "btle.extended_advertising_header.flags.reserved",
Find and fix dissectors that should be using a default tfs. Found using tools/check_tfs.py, included in this commit. Here are the reports that were fixed here: Examining: All dissector modules epan/dissectors/packet-assa_r3.c tfs_mortisepins_flags - could have used tfs_high_low from tfs.c instead: {High,Low} epan/dissectors/packet-btle.c tfs_present_bit - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-dhcp.c tfs_fqdn_s - could have used tfs_server_client from tfs.c instead: {Server,Client} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-macmgmt.c mdd_tfs_en_dis - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-docsis-macmgmt.c req_not_req_tfs - could have used tfs_requested_not_requested from tfs.c instead: {Requested,Not Requested} epan/dissectors/packet-docsis-tlv.c on_off_tfs - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-docsis-tlv.c activation_tfs - could have used tfs_active_inactive from tfs.c instead: {Active,Inactive} epan/dissectors/packet-docsis.c ena_dis_tfs - could have used tfs_enabled_disabled from tfs.c instead: {Enabled,Disabled} epan/dissectors/packet-ecmp.c tfs_not_expected_expected - could have used tfs_odd_even from tfs.c instead: {Odd,Even} epan/dissectors/packet-erf.c erf_link_status_tfs - could have used tfs_up_down from tfs.c instead: {Up,Down} epan/dissectors/packet-h263.c on_off_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-h263.c cpm_flg - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-interlink.c flags_set_notset - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-ip.c tos_set_low - could have used tfs_low_normal from tfs.c instead: {Low,Normal} epan/dissectors/packet-ip.c tos_set_high - could have used tfs_high_normal from tfs.c instead: {High,Normal} epan/dissectors/packet-isakmp.c flag_r - could have used tfs_response_request from tfs.c instead: {Response,Request} epan/dissectors/packet-isis-lsp.c tfs_metric_supported_not_supported - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-kerberos.c supported_tfs - could have used tfs_supported_not_supported from tfs.c instead: {Supported,Not supported} epan/dissectors/packet-kerberos.c set_tfs - could have used tfs_set_notset from tfs.c instead: {Set,Not set} epan/dissectors/packet-mac-lte.c mac_lte_scell_status_vals - could have used tfs_activated_deactivated from tfs.c instead: {Activated,Deactivated} epan/dissectors/packet-p_mul.c no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-pgm.c opts_present - could have used tfs_present_not_present from tfs.c instead: {Present,Not Present} epan/dissectors/packet-rsl.c rsl_ms_fpc_epc_mode_vals - could have used tfs_inuse_not_inuse from tfs.c instead: {In use,Not in use} epan/dissectors/packet-sita.c tfs_sita_on_off - could have used tfs_on_off from tfs.c instead: {On,Off} epan/dissectors/packet-vines.c tfs_vine_rtp_no_yes - could have used tfs_no_yes from tfs.c instead: {No,Yes} epan/dissectors/packet-vnc.c button_mask_tfs - could have used tfs_pressed_not_pressed from tfs.c instead: {Pressed,Not pressed} 27 issues found Change-Id: I7e53b491f20289955c9e9caa8357197d9010a5aa Reviewed-on: https://code.wireshark.org/review/38087 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-07 20:15:46 +00:00
FT_BOOLEAN, 8, TFS(&tfs_present_not_present), 0x80,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_cte_info,
{ "CTE Info", "btle.extended_advertising_header.cte_info",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_cte_info_time,
btle: Fix parsing of CTE Info field in extended advertising header Fix parsing of the CTE Info field in the extended advertising header. The bit-mask of the different fields was wrongly placed. The text of the different fields all said "CTE Info". The CTE Time field was added twice. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-06-25 09:42:07 +00:00
{ "CTE Time", "btle.extended_advertising_header.cte_info.time",
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
FT_UINT8, BASE_HEX, NULL, 0x1F,
NULL, HFILL }
},
{ &hf_extended_advertising_cte_info_rfu,
btle: Fix parsing of CTE Info field in extended advertising header Fix parsing of the CTE Info field in the extended advertising header. The bit-mask of the different fields was wrongly placed. The text of the different fields all said "CTE Info". The CTE Time field was added twice. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-06-25 09:42:07 +00:00
{ "RFU", "btle.extended_advertising_header.cte_info.rfu",
FT_UINT8, BASE_HEX, NULL, 0x20,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_cte_info_type,
btle: Fix parsing of CTE Info field in extended advertising header Fix parsing of the CTE Info field in the extended advertising header. The bit-mask of the different fields was wrongly placed. The text of the different fields all said "CTE Info". The CTE Time field was added twice. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-06-25 09:42:07 +00:00
{ "CTE Type", "btle.extended_advertising_header.cte_info.type",
FT_UINT8, BASE_HEX, VALS(le_cte_type_vals), 0xC0,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
NULL, HFILL }
},
{ &hf_extended_advertising_data_info,
{ "Advertiser Data Info", "btle.extended_advertising.advertising_data_info",
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_data_info_did,
{ "Advertiser Data Identifier", "btle.extended_advertising.advertising_data_info.did",
FT_UINT16, BASE_HEX, NULL, 0x0FFF,
NULL, HFILL }
},
{ &hf_extended_advertising_data_info_sid,
{ "Advertiser Set Identifier", "btle.extended_advertising.advertising_data_info.sid",
FT_UINT16, BASE_HEX, NULL, 0xF000,
NULL, HFILL }
},
{ &hf_extended_advertising_aux_ptr,
{ "Advertiser Aux Pointer", "btle.extended_advertising.aux_pointer",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_aux_ptr_channel,
{ "Channel", "btle.extended_advertising_header.aux_pointer.channel",
FT_UINT8, BASE_DEC, NULL, 0x3F,
NULL, HFILL }
},
{ &hf_extended_advertising_aux_ptr_ca,
{ "Clock Accuracy", "btle.extended_advertising_header.aux_pointer.ca",
FT_BOOLEAN, 8, TFS(&tfs_ca), 0x40,
NULL, HFILL }
},
{ &hf_extended_advertising_aux_ptr_offset_units,
{ "Offset units", "btle.extended_advertising_header.aux_pointer.offset_units",
FT_BOOLEAN, 8, TFS(&tfs_offset_units), 0x80,
NULL, HFILL }
},
{ &hf_extended_advertising_aux_ptr_aux_offset,
{ "Aux Offset", "btle.extended_advertising_header.aux_pointer.aux_offset",
FT_UINT16, BASE_HEX, NULL, 0x1FFF,
NULL, HFILL }
},
{ &hf_extended_advertising_aux_ptr_aux_phy,
{ "Aux PHY", "btle.extended_advertising_header.aux_pointer.aux_phy",
FT_UINT16, BASE_DEC, VALS(le_phys), 0xE000,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info,
{ "Advertiser Sync Info", "btle.extended_advertising.sync_info",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
{ &hf_extended_advertising_had_fragment,
{ "Host Advertising Data Fragment", "btle.extended_advertising.had_fragment",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
{ &hf_extended_advertising_sync_info_offset,
{ "Sync Offset", "btle.extended_advertising_header.sync_info.sync_offset",
FT_UINT16, BASE_HEX, NULL, 0x1FFF,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info_offset_units,
{ "Offset Units", "btle.extended_advertising_header.sync_info.offset_units",
FT_BOOLEAN, 16, TFS(&tfs_offset_units), 0x2000,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info_offset_adjust,
{ "Offset Adjust", "btle.extended_advertising_header.sync_info.offset_adjust",
FT_BOOLEAN, 16, TFS(&tfs_offset_adjust), 0x4000,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info_reserved,
{ "Reserved", "btle.extended_advertising_header.sync_info.offset_units",
FT_BOOLEAN, 16, NULL, 0x8000,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info_interval,
{ "Interval", "btle.extended_advertising_header.sync_info.interval",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info_channel_map,
{ "Channel Map", "btle.extended_advertising_header.sync_info.channel_map",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info_sleep_clock_accuracy,
{ "Sleep Clock Accuracy", "btle.extended_advertising_header.sync_info.sleep_clock_accuracy",
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &sleep_clock_accuracy_vals_ext, 0xe0,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info_access_address,
{ "Access Address", "btle.extended_advertising_header.sync_info.access_address",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info_crc_init,
{ "CRC Init", "btle.extended_advertising_header.sync_info.crc_init",
FT_UINT24, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_sync_info_event_counter,
{ "Event counter", "btle.extended_advertising_header.sync_info.event_counter",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_tx_power,
{ "TX Power", "btle.extended_advertising_header.tx_power",
FT_INT8, BASE_DEC | BASE_UNIT_STRING, &units_dbm, 0x0,
NULL, HFILL }
},
{ &hf_extended_advertising_header_acad,
{ "Additional Controller Advertising Data", "btle.extended_advertising_header.acad",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ &hf_data_header,
{ "Data Header", "btle.data_header",
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_data_header_llid,
{ "LLID", "btle.data_header.llid",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &llid_codes_vals_ext, 0x03,
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
"Logical Link Identifier", HFILL }
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
},
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ &hf_data_header_llid_connectediso,
{ "LLID", "btle.data_header.llid",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &llid_connectediso_codes_vals_ext, 0x03,
"Logical Link Identifier", HFILL }
},
{ &hf_data_header_llid_broadcastiso,
{ "LLID", "btle.data_header.llid",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &llid_broadcastiso_codes_vals_ext, 0x03,
"Logical Link Identifier", HFILL }
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ &hf_data_header_next_expected_sequence_number,
{ "Next Expected Sequence Number", "btle.data_header.next_expected_sequence_number",
Bluetooth: BTLE: SN, NESN should be numbers not booleans SN = Sequence Number, so it is not bool. Change-Id: I0691b17150bbbdd34a0e7cbe3cb90058c9183ff7 Reviewed-on: https://code.wireshark.org/review/5769 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-03 10:06:49 +00:00
FT_UINT8, BASE_DEC, NULL, 0x04,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
{ &hf_data_header_sequence_number,
{ "Sequence Number", "btle.data_header.sequence_number",
Bluetooth: BTLE: SN, NESN should be numbers not booleans SN = Sequence Number, so it is not bool. Change-Id: I0691b17150bbbdd34a0e7cbe3cb90058c9183ff7 Reviewed-on: https://code.wireshark.org/review/5769 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-03 10:06:49 +00:00
FT_UINT8, BASE_DEC, NULL, 0x08,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
{ &hf_data_header_more_data,
{ "More Data", "btle.data_header.more_data",
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
FT_BOOLEAN, 8, NULL, 0x10,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
{ &hf_data_header_length,
{ "Length", "btle.data_header.length",
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
FT_UINT8, BASE_DEC, NULL, 0x0,
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
NULL, HFILL }
},
{ &hf_data_header_rfu,
{ "RFU", "btle.data_header.rfu",
FT_UINT8, BASE_DEC, NULL, 0xE0,
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
"Reserved for Future Use", HFILL }
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
},
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ &hf_data_header_rfu_67,
{ "RFU", "btle.data_header.rfu",
FT_UINT8, BASE_DEC, NULL, 0xC0,
"Reserved for Future Use", HFILL }
},
{ &hf_data_header_rfu_57,
{ "RFU", "btle.data_header.rfu",
FT_UINT8, BASE_DEC, NULL, 0xA0,
"Reserved for Future Use", HFILL }
},
{ &hf_data_header_close_isochronous_event,
{ "Close Isochronous Event", "btle.data_header.close_isochronous_event",
FT_BOOLEAN, 8, NULL, 0x10,
NULL, HFILL }
},
{ &hf_data_header_null_pdu_indicator,
{ "Null PDU Indicator", "btle.data_header.null_pdu_indicator",
FT_BOOLEAN, 8, NULL, 0x40,
NULL, HFILL }
},
{ &hf_data_header_control_subevent_sequence_number,
{ "Control Subevent Sequence Number", "btle.data_header.control_subevent_sequence_number",
FT_UINT8, BASE_DEC, NULL, 0x1C,
NULL, HFILL }
},
{ &hf_data_header_control_subevent_transmission_flag,
{ "Control Subevent Transmission Flag", "btle.data_header.control_subevent_transmission_flag",
FT_BOOLEAN, 8, NULL, 0x20,
NULL, HFILL }
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ &hf_control_opcode,
{ "Control Opcode", "btle.control_opcode",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &control_opcode_vals_ext, 0x0,
NULL, HFILL }
},
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
{ &hf_control_reject_opcode,
{ "Reject Opcode", "btle.control.reject_opcode",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &control_opcode_vals_ext, 0x0,
NULL, HFILL }
},
{ &hf_control_unknown_type,
{ "Unknown Type", "btle.control.unknown_type",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &control_opcode_vals_ext, 0x0,
NULL, HFILL }
},
{ &hf_control_error_code,
{ "Error Code", "btle.control.error_code",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &bthci_cmd_status_vals_ext, 0x0,
NULL, HFILL }
},
{ &hf_control_version_number,
{ "Version Number", "btle.control.version_number",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &ll_version_number_vals_ext, 0x0,
NULL, HFILL }
},
{ &hf_control_company_id,
{ "Company Id", "btle.control.company_id",
Bluetooth protocols: fix some protocol item lengths
2020-10-28 22:19:29 +00:00
FT_UINT16, BASE_HEX | BASE_EXT_STRING, &bluetooth_company_id_vals_ext, 0x0,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
NULL, HFILL }
},
{ &hf_control_subversion_number,
{ "Subversion Number", "btle.control.subversion_number",
btle: Show full LL_VERSION_IND SubVersNr The BT spec does not specify a bitmask for Subversion Number. Change-Id: If6f384badc4228ea1e1c30ec8156f382ca5959e0 Reviewed-on: https://code.wireshark.org/review/17936 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 20:18:06 +00:00
FT_UINT16, BASE_HEX, NULL, 0x0,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
NULL, HFILL }
},
{ &hf_control_feature_set,
{ "Feature Set", "btle.control.feature_set",
FT_UINT64, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_feature_set_le_encryption,
{ "LE Encryption", "btle.control.feature_set.le_encryption",
btle: Fix Feature support bit positions From BT spec 4.2 volume 6 part B section 4.6, Feature support. Bug: 12946 Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf Reviewed-on: https://code.wireshark.org/review/17911 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 08:29:37 +00:00
FT_BOOLEAN, 8, NULL, 0x01,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
NULL, HFILL }
},
{ &hf_control_feature_set_connection_parameters_request_procedure,
{ "Connection Parameters Request Procedure", "btle.control.feature_set.connection_parameters_request_procedure",
btle: Fix Feature support bit positions From BT spec 4.2 volume 6 part B section 4.6, Feature support. Bug: 12946 Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf Reviewed-on: https://code.wireshark.org/review/17911 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 08:29:37 +00:00
FT_BOOLEAN, 8, NULL, 0x02,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
NULL, HFILL }
},
{ &hf_control_feature_set_extended_reject_indication,
{ "Extended Reject Indication", "btle.control.feature_set.extended_reject_indication",
btle: Fix Feature support bit positions From BT spec 4.2 volume 6 part B section 4.6, Feature support. Bug: 12946 Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf Reviewed-on: https://code.wireshark.org/review/17911 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 08:29:37 +00:00
FT_BOOLEAN, 8, NULL, 0x04,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
NULL, HFILL }
},
{ &hf_control_feature_set_slave_initiated_features_exchange,
{ "Slave Initiated Features Exchange", "btle.control.feature_set.slave_initiated_features_exchange",
btle: Fix Feature support bit positions From BT spec 4.2 volume 6 part B section 4.6, Feature support. Bug: 12946 Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf Reviewed-on: https://code.wireshark.org/review/17911 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 08:29:37 +00:00
FT_BOOLEAN, 8, NULL, 0x08,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
NULL, HFILL }
},
{ &hf_control_feature_set_le_ping,
{ "LE Ping", "btle.control.feature_set.le_ping",
btle: Fix Feature support bit positions From BT spec 4.2 volume 6 part B section 4.6, Feature support. Bug: 12946 Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf Reviewed-on: https://code.wireshark.org/review/17911 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 08:29:37 +00:00
FT_BOOLEAN, 8, NULL, 0x10,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
NULL, HFILL }
},
[BTLE] Add new Link layer Feature flags. Change-Id: Ib646d90c6e44075e7ae67f2022dc633fe6423c20 Reviewed-on: https://code.wireshark.org/review/16724 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-27 12:48:00 +00:00
{ &hf_control_feature_set_le_pkt_len_ext,
{ "LE Data Packet Length Extension", "btle.control.feature_set.le_pkt_len_ext",
btle: Fix Feature support bit positions From BT spec 4.2 volume 6 part B section 4.6, Feature support. Bug: 12946 Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf Reviewed-on: https://code.wireshark.org/review/17911 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 08:29:37 +00:00
FT_BOOLEAN, 8, NULL, 0x20,
[BTLE] Add new Link layer Feature flags. Change-Id: Ib646d90c6e44075e7ae67f2022dc633fe6423c20 Reviewed-on: https://code.wireshark.org/review/16724 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-27 12:48:00 +00:00
NULL, HFILL }
},
{ &hf_control_feature_set_ll_privacy,
{ "LL Privacy", "btle.control.feature_set.le_privacy",
btle: Fix Feature support bit positions From BT spec 4.2 volume 6 part B section 4.6, Feature support. Bug: 12946 Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf Reviewed-on: https://code.wireshark.org/review/17911 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 08:29:37 +00:00
FT_BOOLEAN, 8, NULL, 0x40,
[BTLE] Add new Link layer Feature flags. Change-Id: Ib646d90c6e44075e7ae67f2022dc633fe6423c20 Reviewed-on: https://code.wireshark.org/review/16724 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-27 12:48:00 +00:00
NULL, HFILL }
},
{ &hf_control_feature_set_ext_scan_flt_pol,
{ "Extended Scanner Filter Policies", "btle.control.feature_set.ext_scan_flt_pol",
btle: Fix Feature support bit positions From BT spec 4.2 volume 6 part B section 4.6, Feature support. Bug: 12946 Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf Reviewed-on: https://code.wireshark.org/review/17911 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 08:29:37 +00:00
FT_BOOLEAN, 8, NULL, 0x80,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
NULL, HFILL }
},
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
{ &hf_control_feature_set_le_2m_phy,
{ "LE 2M PHY", "btle.control.feature_set.le_2m_phy",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_control_feature_set_stable_modulation_index_transmitter,
{ "Stable Modulation Index - Transmitter", "btle.control.feature_set.st_mod_idx_tx",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_control_feature_set_stable_modulation_index_receiver,
{ "Stable Modulation Index - Receiver", "btle.control.feature_set.st_mod_idx_rx",
FT_BOOLEAN, 8, NULL, 0x04,
NULL, HFILL }
},
{ &hf_control_feature_set_le_coded_phy,
{ "LE Coded PHY", "btle.control.feature_set.le_coded_phy",
FT_BOOLEAN, 8, NULL, 0x08,
NULL, HFILL }
},
{ &hf_control_feature_set_le_extended_advertising,
{ "LE Extended Advertising", "btle.control.feature_set.le_extended_adv",
FT_BOOLEAN, 8, NULL, 0x10,
NULL, HFILL }
},
{ &hf_control_feature_set_le_periodic_advertising,
{ "LE Periodic Advertising", "btle.control.feature_set.periodic_adv",
FT_BOOLEAN, 8, NULL, 0x20,
NULL, HFILL }
},
{ &hf_control_feature_set_channel_selection_algorithm_2,
{ "Channel Selection Algorithm #2", "btle.control.feature_set.ch_sel_2",
FT_BOOLEAN, 8, NULL, 0x40,
NULL, HFILL }
},
{ &hf_control_feature_set_le_power_class_1,
{ "LE Power Class 1", "btle.control.feature_set.le_power_class_1",
FT_BOOLEAN, 8, NULL, 0x80,
NULL, HFILL }
},
{ &hf_control_feature_set_minimum_number_of_used_channels_procedure,
{ "Minimum Number of Used Channels Procedure", "btle.control.feature_set.min_num_used_ch_proc",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_control_feature_set_reserved_bits,
{ "Reserved", "btle.control.feature_set.reserved_bits",
FT_UINT8, BASE_DEC, NULL, 0xFE,
NULL, HFILL }
},
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
{ &hf_control_feature_set_reserved,
{ "Reserved", "btle.control.feature_set.reserved",
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
{ &hf_control_window_size,
{ "Window Size", "btle.control.window_size",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_window_offset,
{ "Window Offset", "btle.control.window_offset",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_interval,
{ "Interval", "btle.control.interval",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_latency,
{ "Latency", "btle.control.latency",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_timeout,
{ "Timeout", "btle.control.timeout",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_instant,
{ "Instant", "btle.control.instant",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_interval_min,
{ "Interval Min", "btle.control.interval.min",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_interval_max,
{ "Interval Max", "btle.control.interval.max",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
More spelling fixes, start of second pass of dissectors. Now easier to find errors due to script improvements and more complete dictionary file.
2020-08-30 21:34:34 +00:00
{ &hf_control_preferred_periodicity,
{ "Preferred Periodicity", "btle.control.preferred_periodicity",
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_reference_connection_event_count,
{ "Reference Connection Event Count","btle.control.reference_connection_event_count",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_offset_0,
{ "Offset 0", "btle.control.offset.0",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_offset_1,
{ "Offset 1", "btle.control.offset.1",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_offset_2,
{ "Offset 2", "btle.control.offset.2",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_offset_3,
{ "Offset 3", "btle.control.offset.3",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_offset_4,
{ "Offset 4", "btle.control.offset.4",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_offset_5,
{ "Offset 5", "btle.control.offset.5",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_channel_map,
{ "Channel Map", "btle.control.channel_map",
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
{ &hf_control_random_number,
{ "Random Number", "btle.control.random_number",
FT_UINT64, BASE_DEC_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_encrypted_diversifier,
{ "Encrypted Diversifier", "btle.control.encrypted_diversifier",
FT_UINT16, BASE_DEC_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_master_session_key_diversifier,
{ "Master Session Key Diversifier", "btle.control.master_session_key_diversifier",
FT_UINT64, BASE_DEC_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_slave_session_key_diversifier,
{ "Slave Session Key Diversifier", "btle.control.slave_session_key_diversifier",
FT_UINT64, BASE_DEC_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_master_session_initialization_vector,
{ "Master Session Initialization Vector", "btle.control.master_session_initialization_vector",
FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_slave_session_initialization_vector,
{ "Slave Session Initialization Vector", "btle.control.slave_session_initialization_vector",
FT_UINT64, BASE_DEC_HEX, NULL, 0x0,
NULL, HFILL }
},
btle: Add LL_LENGTH_REQ/RSP control data Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e Reviewed-on: https://code.wireshark.org/review/17932 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 18:17:29 +00:00
{ &hf_control_max_rx_octets,
{ "Max RX octets", "btle.control.max_rx_octets",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_max_rx_time,
{ "Max RX time", "btle.control.max_rx_time",
Remove proto_item_append_text calls in favor of BASE_UNIT_STRING. Many proto_item_append_text calls were just adding a unit string to a field. There's a better way to do that now. Change-Id: Id18d5ac1ea4d8ecdc4cbe7ebaec07fbd2eab6e78 Reviewed-on: https://code.wireshark.org/review/19289 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-15 18:01:27 +00:00
FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_microsecond_microseconds, 0x0,
btle: Add LL_LENGTH_REQ/RSP control data Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e Reviewed-on: https://code.wireshark.org/review/17932 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 18:17:29 +00:00
NULL, HFILL }
},
{ &hf_control_max_tx_octets,
{ "Max TX octets", "btle.control.max_tx_octets",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_max_tx_time,
{ "Max TX time", "btle.control.max_tx_time",
Remove proto_item_append_text calls in favor of BASE_UNIT_STRING. Many proto_item_append_text calls were just adding a unit string to a field. There's a better way to do that now. Change-Id: Id18d5ac1ea4d8ecdc4cbe7ebaec07fbd2eab6e78 Reviewed-on: https://code.wireshark.org/review/19289 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-15 18:01:27 +00:00
FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_microsecond_microseconds, 0x0,
btle: Add LL_LENGTH_REQ/RSP control data Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e Reviewed-on: https://code.wireshark.org/review/17932 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 18:17:29 +00:00
NULL, HFILL }
},
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
{ &hf_control_phys_sender_le_1m_phy,
{ "Sender prefers to use the LE 1M PHY", "btle.control.phys.le_1m_phy",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_control_phys_sender_le_2m_phy,
{ "Sender prefers to use the LE 2M PHY", "btle.control.phys.le_2m_phy",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_control_phys_sender_le_coded_phy,
{ "Sender prefers to use the LE Coded PHY", "btle.control.phys.le_coded_phy",
FT_BOOLEAN, 8, NULL, 0x04,
NULL, HFILL }
},
{ &hf_control_phys_update_le_1m_phy,
{ "The LE 1M PHY shall be used", "btle.control.phys.le_1m_phy",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_control_phys_update_le_2m_phy,
{ "The LE 2M PHY shall be used", "btle.control.phys.le_2m_phy",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_control_phys_update_le_coded_phy,
{ "The LE Coded PHY shall be used", "btle.control.phys.le_coded_phy",
FT_BOOLEAN, 8, NULL, 0x04,
NULL, HFILL }
},
{ &hf_control_phys_reserved_bits,
{ "Reserved for future use", "btle.control.phys.reserved",
FT_UINT8, BASE_DEC, NULL, 0xF8,
NULL, HFILL }
},
{ &hf_control_tx_phys,
{ "TX PHYs", "btle.control.tx_phys",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_rx_phys,
{ "RX PHYs", "btle.control.rx_phys",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_m_to_s_phy,
{ "Master to Slave PHY", "btle.control.m_to_s_phy",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ &hf_control_m_to_s_phy_le_1m_phy,
{ "LE 1M PHY", "btle.control.m_to_s_phy.le_1m_phy",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_control_m_to_s_phy_le_2m_phy,
{ "LE 2M PHY", "btle.control.m_to_s_phy.le_2m_phy",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_control_m_to_s_phy_le_coded_phy,
{ "LE Coded PHY", "btle.control.m_to_s_phy.le_coded_phy",
FT_BOOLEAN, 8, NULL, 0x04,
NULL, HFILL }
},
{ &hf_control_m_to_s_phy_reserved_bits,
{ "Reserved for future use", "btle.control.m_to_s_phy.reserved",
FT_UINT8, BASE_DEC, NULL, 0xF8,
NULL, HFILL }
},
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
{ &hf_control_s_to_m_phy,
{ "Slave to Master PHY", "btle.control.s_to_m_phy",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ &hf_control_s_to_m_phy_le_1m_phy,
{ "LE 1M PHY", "btle.control.s_to_m_phy.le_1m_phy",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_control_s_to_m_phy_le_2m_phy,
{ "LE 2M PHY", "btle.control.s_to_m_phy.le_2m_phy",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_control_s_to_m_phy_le_coded_phy,
{ "LE Coded PHY", "btle.control.s_to_m_phy.le_coded_phy",
FT_BOOLEAN, 8, NULL, 0x04,
NULL, HFILL }
},
{ &hf_control_s_to_m_phy_reserved_bits,
{ "Reserved for future use", "btle.control.s_to_m_phy.reserved",
FT_UINT8, BASE_DEC, NULL, 0xF8,
NULL, HFILL }
},
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
{ &hf_control_phys,
{ "PHYs", "btle.control.phys",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_phys_le_1m_phy,
{ "LE 1M PHY", "btle.control.phys.le_1m_phy",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_control_phys_le_2m_phy,
{ "LE 2M PHY", "btle.control.phys.le_2m_phy",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_control_phys_le_coded_phy,
{ "LE Coded PHY", "btle.control.phys.le_coded_phy",
FT_BOOLEAN, 8, NULL, 0x04,
NULL, HFILL }
},
{ &hf_control_min_used_channels,
{ "Minimum Used Channels", "btle.control.min_used_channels",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ &hf_control_cte_min_len_req,
{ "MinCTELenReq", "btle.control.cte.min_len_req",
FT_UINT8, BASE_DEC, NULL, 0x1F,
NULL, HFILL }
},
{ &hf_control_cte_rfu,
{ "MinCTELenReq", "btle.control.cte.rfu",
FT_UINT8, BASE_DEC, NULL, 0x20,
NULL, HFILL }
},
{ &hf_control_cte_type_req,
{ "CTETypeReq", "btle.control.cte.type_req",
FT_UINT8, BASE_DEC, VALS(le_cte_type_vals), 0xC0,
NULL, HFILL }
},
{ &hf_control_sync_id,
{ "ID", "btle.control.sync.id",
FT_UINT16, BASE_HEX, NULL, 0xFFFF,
NULL, HFILL }
},
{ &hf_control_sync_info_offset,
{ "Sync Offset", "btle.control.sync_info.sync_offset",
FT_UINT16, BASE_HEX, NULL, 0x1FFF,
NULL, HFILL }
},
{ &hf_control_sync_info_offset_units,
{ "Offset Units", "btle.control.sync_info.offset_units",
FT_BOOLEAN, 16, TFS(&tfs_offset_units), 0x2000,
NULL, HFILL }
},
{ &hf_control_sync_info_offset_adjust,
{ "Offset Adjust", "btle.control.sync_info.offset_adjust",
FT_BOOLEAN, 16, TFS(&tfs_offset_adjust), 0x4000,
NULL, HFILL }
},
{ &hf_control_sync_info_reserved,
{ "Reserved", "btle.control.sync_info.offset_units",
FT_BOOLEAN, 16, NULL, 0x8000,
NULL, HFILL }
},
{ &hf_control_sync_info_interval,
{ "Interval", "btle.control.sync_info.interval",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_control_sync_info_channel_map,
{ "Channel Map", "btle.control.sync_info.channel_map",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_sync_info_sleep_clock_accuracy,
{ "Sleep Clock Accuracy", "btle.control.sync_info.sleep_clock_accuracy",
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &sleep_clock_accuracy_vals_ext, 0xe0,
NULL, HFILL }
},
{ &hf_control_sync_info_access_address,
{ "Access Address", "btle.control.sync_info.access_address",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_sync_info_crc_init,
{ "CRC Init", "btle.control.sync_info.crc_init",
FT_UINT24, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_sync_info_event_counter,
{ "Event counter", "btle.control.sync_info.event_counter",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_sync_conn_event_count,
{ "connEventCount", "btle.control.sync.conn_event_count",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_sync_last_pa_event_counter,
{ "lastPaEventCounter", "btle.control.sync.last_pa_event_counter",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_sync_sid,
{ "SID", "btle.control.sync.sid",
FT_UINT8, BASE_HEX, NULL, 0x0F,
NULL, HFILL }
},
{ &hf_control_sync_atype,
{ "AType", "btle.control.sync.atype",
FT_UINT8, BASE_DEC, NULL, 0x10,
NULL, HFILL }
},
{ &hf_control_sync_sleep_clock_accuracy,
{ "Sleep Clock Accuracy", "btle.control.sync.sleep_clock_accuracy",
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &sleep_clock_accuracy_vals_ext, 0xE0,
NULL, HFILL }
},
{ &hf_control_sync_sync_conn_event_counter,
{ "syncConnEventCount", "btle.control.sync.sync_conn_event_count",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_sleep_clock_accuracy,
{ "Sleep Clock Accuracy", "btle.control.sleep_clock_accuracy",
FT_UINT8, BASE_DEC | BASE_EXT_STRING, &sleep_clock_accuracy_vals_ext, 0xe0,
NULL, HFILL }
},
{ &hf_control_cig_id,
{ "CIG_ID", "btle.control.cig_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_cis_id,
{ "CIS_ID", "btle.control.cis_id",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_max_sdu_m_to_s,
{ "Max_SDU_M_To_S", "btle.control.max_sdu_m_to_s",
FT_UINT16, BASE_DEC, NULL, 0x0fff,
NULL, HFILL }
},
{ &hf_control_rfu_1,
{ "Reserved", "btle.control.rfu.1",
FT_UINT16, BASE_DEC, NULL, 0x7000,
"Reserved for Future Use", HFILL }
},
{ &hf_control_framed,
{ "Framed", "btle.control.framed",
FT_BOOLEAN, 16, NULL, 0x8000,
NULL, HFILL }
},
{ &hf_control_max_sdu_s_to_m,
{ "Max_SDU_S_To_M", "btle.control.max_sdu_s_to_m",
FT_UINT16, BASE_DEC, NULL, 0x0fff,
NULL, HFILL }
},
{ &hf_control_rfu_2,
{ "Reserved", "btle.control.rfu.2",
FT_UINT16, BASE_DEC, NULL, 0xf000,
"Reserved for Future Use", HFILL }
},
{ &hf_control_sdu_interval_m_to_s,
{ "SDU_Interval_M_To_S", "btle.control.sdu_interval_m_to_s",
FT_UINT24, BASE_DEC|BASE_UNIT_STRING, &units_microsecond_microseconds, 0x0fffff,
NULL, HFILL }
},
{ &hf_control_rfu_3,
{ "Reserved", "btle.control.rfu.3",
FT_UINT24, BASE_DEC, NULL, 0xf00000,
"Reserved for Future Use", HFILL }
},
{ &hf_control_sdu_interval_s_to_m,
{ "SDU_Interval_S_To_M", "btle.control.sdu_interval_s_to_m",
FT_UINT24, BASE_DEC|BASE_UNIT_STRING, &units_microsecond_microseconds, 0x0fffff,
NULL, HFILL }
},
{ &hf_control_rfu_4,
{ "Reserved", "btle.control.rfu.4",
FT_UINT24, BASE_DEC, NULL, 0xf00000,
"Reserved for Future Use", HFILL }
},
{ &hf_control_max_pdu_m_to_s,
{ "Max_PDU_M_To_S", "btle.control.max_pdu_m_to_s",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_max_pdu_s_to_m,
{ "Max_PDU_S_To_M", "btle.control.max_pdu_s_to_m",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_num_sub_events,
{ "Num_Sub_Events", "btle.control.num_sub_events",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_sub_interval,
{ "Sub_Interval", "btle.control.sub_interval",
FT_UINT24, BASE_DEC|BASE_UNIT_STRING, &units_microsecond_microseconds, 0x0,
NULL, HFILL }
},
{ &hf_control_bn_m_to_s,
{ "BN_M_To_S", "btle.control.bn_m_to_s",
FT_UINT8, BASE_DEC, NULL, 0x0f,
NULL, HFILL }
},
{ &hf_control_bn_s_to_m,
{ "BN_S_To_M", "btle.control.bn_s_to_m",
FT_UINT8, BASE_DEC, NULL, 0xf0,
NULL, HFILL }
},
{ &hf_control_ft_m_to_s,
{ "FT_M_To_S", "btle.control.ft_m_to_s",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_ft_s_to_m,
{ "FT_S_To_M", "btle.control.ft_s_to_m",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_iso_interval,
{ "ISO_Interval", "btle.control.iso_interval",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_cis_offset_min,
{ "CIS_Offset_Min", "btle.control.cis_offset_min",
FT_UINT24, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_cis_offset_max,
{ "CIS_Offset_Max", "btle.control.cis_offset_max",
FT_UINT24, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_conn_event_count,
{ "connEventCount", "btle.control.conn_event_count",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_access_address,
{ "Access Address", "btle.control.access_address",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_cis_offset,
{ "CIS_Offset", "btle.control.cis_offset",
FT_UINT24, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_cig_sync_delay,
{ "CIG_Sync_Delay", "btle.control.cig_sync_delay",
FT_UINT24, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_cis_sync_delay,
{ "CIS_Sync_Delay", "btle.control.cis_sync_delay",
FT_UINT24, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_pwr_phy,
{ "Power PHY", "btle.control.pwr_phy",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_pwr_phy_le_1m_phy,
{ "LE 1M PHY", "btle.control.pwr_phy.le_1m_phy",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_control_pwr_phy_le_2m_phy,
{ "LE 2M PHY", "btle.control.pwr_phy.le_2m_phy",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_control_pwr_phy_le_coded_s8_phy,
{ "LE Coded S=8 PHY", "btle.control.pwr_phy.le_coded_s8_phy",
FT_BOOLEAN, 8, NULL, 0x04,
NULL, HFILL }
},
{ &hf_control_pwr_phy_le_coded_s2_phy,
{ "LE Coded S=2 PHY", "btle.control.pwr_phy.le_coded_s2_phy",
FT_BOOLEAN, 8, NULL, 0x08,
NULL, HFILL }
},
{ &hf_control_pwr_phy_reserved_bits,
{ "Reserved for future use", "btle.control.pwr_phy.reserved",
FT_UINT8, BASE_DEC, NULL, 0xF0,
NULL, HFILL }
},
{ &hf_control_delta,
{ "Delta", "btle.control.delta",
FT_INT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_txpwr,
{ "TxPower", "btle.control.txpower",
FT_INT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_pwrflags,
{ "Power Flags", "btle.control.pwrflags",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_control_pwrflags_min,
{ "Min", "btle.control.min",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL }
},
{ &hf_control_pwrflags_max,
{ "Max", "btle.control.max",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL }
},
{ &hf_control_pwrflags_reserved_bits,
{ "Reserved for future use", "btle.control.pwrctrl.reserved",
FT_UINT8, BASE_DEC, NULL, 0xFC,
NULL, HFILL }
},
{ &hf_control_acceptable_power_reduction,
{ "Acceptable Power Reduction", "btle.control.acceptable_power_reduction",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_big_control_opcode,
{ "BIG Control Opcode", "btle.big_control_opcode",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &big_control_opcode_vals_ext, 0x0,
NULL, HFILL }
},
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
{ &hf_l2cap_index,
{ "L2CAP Index", "btle.l2cap_index",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
{ &hf_l2cap_fragment,
{ "L2CAP Fragment", "btle.l2cap_data",
FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
{ &hf_connection_parameters_in,
{ "Connection Parameters in", "btle.connection_parameters_in",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
{ &hf_crc,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "CRC", "btle.crc",
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
FT_UINT24, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ &hf_isochronous_data,
{ "Isochronous Data", "btle.isochronous_data",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
{ &hf_btle_l2cap_msg_fragments,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "L2CAP fragments", "btle.l2cap.fragments",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_NONE, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_l2cap_msg_fragment,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "L2CAP fragment", "btle.l2cap.fragment",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_l2cap_msg_fragment_overlap,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "L2CAP fragment overlap", "btle.l2cap.fragment.overlap",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btle_l2cap_msg_fragment_overlap_conflicts,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "L2CAP fragment overlapping with conflicting data", "btle.l2cap.fragment.overlap.conflicts",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btle_l2cap_msg_fragment_multiple_tails,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "L2CAP has multiple tail fragments", "btle.l2cap.fragment.multiple_tails",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btle_l2cap_msg_fragment_too_long_fragment,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "L2CAP fragment too long", "btle.l2cap.fragment.too_long_fragment",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btle_l2cap_msg_fragment_error,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "L2CAP defragmentation error", "btle.l2cap.fragment.error",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_l2cap_msg_fragment_count,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "L2CAP fragment count", "btle.l2cap.fragment.count",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_l2cap_msg_reassembled_in,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "Reassembled in", "btle.l2cap.reassembled.in",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_l2cap_msg_reassembled_length,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "Reassembled L2CAP length", "btle.l2cap.reassembled.length",
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
{ &hf_btle_ea_host_advertising_data_fragments,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "EA HAD fragments", "btle.ea.host_advertising_data.fragments",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_NONE, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_ea_host_advertising_data_fragment,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "EA HAD fragment", "btle.ea.host_advertising_data.fragment",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_ea_host_advertising_data_fragment_overlap,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "EA HAD fragment overlap", "btle.ea.host_advertising_data.fragment.overlap",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btle_ea_host_advertising_data_fragment_overlap_conflicts,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "EA HAD fragment overlapping with conflicting data", "btle.ea.host_advertising_data.fragment.overlap.conflicts",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btle_ea_host_advertising_data_fragment_multiple_tails,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "EA HAD has multiple tail fragments", "btle.ea.host_advertising_data.fragment.multiple_tails",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btle_ea_host_advertising_data_fragment_too_long_fragment,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "EA HAD fragment too long", "btle.ea.host_advertising_data.fragment.too_long_fragment",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_btle_ea_host_advertising_data_fragment_error,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "EA HAD defragmentation error", "btle.ea.host_advertising_data.fragment.error",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_ea_host_advertising_data_fragment_count,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "EA HAD fragment count", "btle.ea.host_advertising_data.fragment.count",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_ea_host_advertising_data_reassembled_in,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "Reassembled in", "btle.ea.host_advertising_data.reassembled.in",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_FRAMENUM, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_btle_ea_host_advertising_data_reassembled_length,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{ "Reassembled EA HAD length", "btle.ea.host_advertising_data.reassembled.length",
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
{ &hf_request_in_frame,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{"Request in Frame", "btle.request_in_frame",
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_REQUEST), 0x0,
NULL, HFILL}
},
{ &hf_response_in_frame,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
{"Response in Frame", "btle.response_in_frame",
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_RESPONSE), 0x0,
NULL, HFILL}
},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
};
static ei_register_info ei[] = {
Bluetooth: btle: Fix reserved field dissection Also cosmetic changes: 1. Clear Info Column at start (fix garbages from previous protocols like Ubertooth) 2. Refactor a little all expert field definitions Change-Id: Ie1cba8c1578597f2d896ec75f7d2af4987325bf3 Reviewed-on: https://code.wireshark.org/review/3768 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-08-15 22:28:58 +00:00
{ &ei_unknown_data,
{ "btle.unknown_data", PI_PROTOCOL, PI_NOTE, "Unknown data", EXPFILL }},
{ &ei_access_address_matched,
{ "btle.access_address.matched", PI_PROTOCOL, PI_NOTE, "AccessAddress matched at capture", EXPFILL }},
{ &ei_access_address_bit_errors,
{ "btle.access_address.bit_errors", PI_PROTOCOL, PI_WARN, "AccessAddress has errors present at capture", EXPFILL }},
{ &ei_access_address_illegal,
{ "btle.access_address.illegal", PI_PROTOCOL, PI_ERROR, "AccessAddress has illegal value", EXPFILL }},
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
{ &ei_control_proc_overlapping,
{ "btle.control_proc_overlapping", PI_PROTOCOL, PI_ERROR, "Initiating a new control procedure before the previous was complete", EXPFILL }},
Bluetooth: Detect invalid control procedure collision resolution See Bluetooth Core Spec, Vol 6, Part B, Section 5.3 If the event counter is available, the procedure is marked as complete when the instant is reached. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-24 21:14:52 +00:00
{ &ei_control_proc_invalid_collision,
{ "btle.control_proc_incompatible", PI_PROTOCOL, PI_ERROR, "Initiating a new incompatible control procedure after having sent a response to an incompatible control procedure", EXPFILL }},
Bluetooth: Match control procedure requests with responses This makes it easier to read logs where both the master and slave initiate control procedures at the same time. Retransmitted packets are not part of the request/response tracing. In order to perform the analysis, direction information must be available. The matching is implemented by storing control procedure contexts for each direction for each connection object as each direction may initiate its own procedure. Limitations: - When there is a control procedure violation where a device initiates a new procedure before the previous is complete, only the first procedure is traced. It would be possible to create more advanced tracing by storing a list of contexts per frame. However, as this is anyways a specification violation, this adds unnecessary complexity. - Control procedures involving an instant are marked as completed when the last frame is sent even though the control procedure is completed when the instant is reached. This is the best possible approach when the event counter is not available. Due to this limitation, we are not able to detect the control procedure violation where a device initiates a new procedure before the instant is reached. The following control procedure violations are detected: - Starting a control procedure before the previous is complete. Control procedure violations where a new procedure is started before the instant is reached is currently not detected. That requires knowing the event counter. - Control procedure packets that are not valid responses to an existing ongoing control procedure. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
2021-01-01 15:14:31 +00:00
{ &ei_control_proc_wrong_seq,
{ "btle.control_proc_unknown_seq", PI_PROTOCOL, PI_ERROR, "Incorrect control procedure packet sequencing or direction", EXPFILL }},
Bluetooth: btle: Fix reserved field dissection Also cosmetic changes: 1. Clear Info Column at start (fix garbages from previous protocols like Ubertooth) 2. Refactor a little all expert field definitions Change-Id: Ie1cba8c1578597f2d896ec75f7d2af4987325bf3 Reviewed-on: https://code.wireshark.org/review/3768 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-08-15 22:28:58 +00:00
{ &ei_crc_cannot_be_determined,
{ "btle.crc.indeterminate", PI_CHECKSUM, PI_NOTE, "CRC unchecked, not all data available", EXPFILL }},
{ &ei_crc_incorrect,
{ "btle.crc.incorrect", PI_CHECKSUM, PI_WARN, "Incorrect CRC", EXPFILL }},
btle: Add item for the generated l2cap index Also detect "Missing Fragment Start" packet. Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c Reviewed-on: https://code.wireshark.org/review/22498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-02 20:47:42 +00:00
{ &ei_missing_fragment_start,
{ "btle.missing_fragment_start", PI_SEQUENCE, PI_WARN, "Missing Fragment Start", EXPFILL }},
btle: Ignore retransmitted frames in reassembly Change NESN/SN check to detect retransmit pr. connection. Frames with same SN in one direction is retransmit. Ignore retransmit frames when doing reassembly (btle and l2cap). Also ignore frames with incorrect CRC when doing reassembly. This fix is related to g95e09a60. Change-Id: I6386b42758ec3abada07ec1964d3e1b7ba7400e4 Reviewed-on: https://code.wireshark.org/review/23771 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28 13:11:10 +00:00
{ &ei_retransmit,
btle: Improve retransmit detection Only use SN to detect retransmission. Lower retransmit expert info severity to Note. Change-Id: I4604903cce9cc58a6fcffff6597e7e99d228aa80 Reviewed-on: https://code.wireshark.org/review/23780 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-09-29 08:58:56 +00:00
{ "btle.retransmit", PI_SEQUENCE, PI_NOTE, "Retransmission", EXPFILL }},
bluetooth: Add context information for next expected sequence number Add context information for next expected sequence number so that analysing for acknowledgedment or request for retransmit can be done without comparing packets manually. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2020-11-27 15:56:45 +00:00
{ &ei_nack,
{ "btle.nack", PI_SEQUENCE, PI_NOTE, "Not acknowledged", EXPFILL }},
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
};
static gint *ett[] = {
&ett_btle,
&ett_advertising_header,
&ett_link_layer_data,
Bluetooth: Dissect the common extendend advertising payload header Dissect the common extendend advertising payload header which is common for the following advertising PDUs: - ADV_EXT_IND - AUX_ADV_IND - AUX_SYNC_IND - AUX_CHAIN_IND - AUX_SCAN_RSP - AUX_CONNECT_RSP Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc6345317 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36781 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-02 10:49:36 +00:00
&ett_extended_advertising_header,
&ett_extended_advertising_flags,
&ett_extended_advertising_cte_info,
&ett_extended_advertising_data_info,
&ett_extended_advertising_aux_pointer,
&ett_extended_advertising_sync_info,
Bluetooth: Complete Additional Controller Advertising Data dissecting Complete Additional Controller Advertising Data dissecting, this was just reported as advertising data in the extended header. Put it under a new tree for ACAD info in the extended header. Also fix the wrong length field used for the length of the ACAD field. In addition put the scan response data under it's own scan response, similar to SCAN_RSP handling. We can only do this if the context has given us the information that this is the aux scan response data. Remove an accidental addition used for debugging, and an empty if-statement for a reserved flag. Change-Id: I7f0ad74b3e30ffecade59b6d0c5965bfc634531e Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Reviewed-on: https://code.wireshark.org/review/36835 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-13 20:27:05 +00:00
&ett_extended_advertising_acad,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
&ett_data_header,
&ett_features,
btle: Add Bluetooth 5.0 LL Control PDUs * Dissect LL_PHY_REQ, LL_PHY_RSP, LL_PHY_UPDATE_IND and LL_MIN_USED_CHANNELS_IND. * Add Control Feature Set values. * Change Advertising Header Length from 6 bits to 8 bits (and removed RFU). * Change Data Header Length from 5 bits to 8 bits (and removed RFU). Change-Id: I453583fbb8c36dc87642c3c5087ab6dd77c46e45 Reviewed-on: https://code.wireshark.org/review/23536 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-14 08:47:26 +00:00
&ett_tx_phys,
&ett_rx_phys,
&ett_m_to_s_phy,
&ett_s_to_m_phy,
&ett_phys,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
&ett_pwr_phy,
&ett_cte,
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606) From Michal Labedzki 1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector 2. Bluetooth: Merge all UUIDs together 3. Bluetooth: Extract LE Channel MAP to separate dissector 4. Ubertooth: Dissect CC2400 registers svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
&ett_channel_map,
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
&ett_scan_response_data,
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
&ett_pwrflags,
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
&ett_btle_l2cap_msg_fragment,
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
&ett_btle_l2cap_msg_fragments,
&ett_btle_ea_host_advertising_data_fragment,
&ett_btle_ea_host_advertising_data_fragments
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
};
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
connection_info_tree = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
btle: decode new control PDUs and advertising info in 5.2 Decode control PDUs and advertising informationintroduced in Bluetooth Core v5.2
2021-03-01 17:15:09 +00:00
broadcastiso_connection_info_tree = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
bluetooth: Add event counter and event counter valid to context Add event counter and event counter valid variables to the btle context. This information has to come from the capture context, and the information is useful to provide context information around LL control procedures with instant. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-01-21 07:22:47 +00:00
connection_parameter_info_tree = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
adi_to_first_frame_tree = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
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>
2014-12-12 10:24:44 +00:00
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
proto_btle = proto_register_protocol("Bluetooth Low Energy Link Layer",
"BT LE LL", "btle");
new_register_dissector -> register_dissector for dissector directory. Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c Reviewed-on: https://code.wireshark.org/review/12485 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 04:04:01 +00:00
btle_handle = register_dissector("btle", dissect_btle, proto_btle);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
proto_register_field_array(proto_btle, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
expert_module = expert_register_protocol(proto_btle);
expert_register_field_array(expert_module, ei, array_length(ei));
bluetooth: Group Bluetooth dissector preferences Change-Id: Ib5360fcbfd8f6b2aee6b33ec7d9dc77362feb50e Reviewed-on: https://code.wireshark.org/review/25162 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-05 13:00:44 +00:00
module = prefs_register_protocol_subtree("Bluetooth", proto_btle, NULL);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
prefs_register_static_text_preference(module, "version",
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
"Bluetooth LE LL version: 5.0 (Core)",
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
"Version of protocol supported by this dissector.");
[BTLE] Implement reassembly of BTLE messages. Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99 Reviewed-on: https://code.wireshark.org/review/16901 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 14:41:25 +00:00
btle: Add preference to detect retransmission In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01 18:15:02 +00:00
prefs_register_bool_preference(module, "detect_retransmit",
"Detect retransmission",
"Detect retransmission based on SN (Sequence Number)",
&btle_detect_retransmit);
Register reassembly tables Register all reassembly tables with a central unit, allowing the central unit to have the callback that initializes and destroys the reassembly tables, rather than have dissectors do it individually. Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4 Reviewed-on: https://code.wireshark.org/review/19834 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-29 00:53:36 +00:00
reassembly_table_register(&btle_l2cap_msg_reassembly_table,
&addresses_reassembly_table_functions);
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
Btle: AE Host Advertising Data reassembly Bluetooth Low Energy Advertising Extensions Host Advertising Data reassembly. Bug: 16666 Change-Id: I78fea77a75f07ff7ef8a661e81ac3c729980de0e Reviewed-on: https://code.wireshark.org/review/38016 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-30 12:40:23 +00:00
reassembly_table_register(&btle_ea_host_advertising_data_reassembly_table,
&addresses_reassembly_table_functions);
btle: Improve reassembly when missing packets Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-30 11:54:55 +00:00
register_init_routine(btle_init);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
}
void
proto_reg_handoff_btle(void)
{
Manually add protocol dependencies derived from find_dissector. Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-16 13:02:52 +00:00
btcommon_ad_handle = find_dissector_add_dependency("btcommon.eir_ad.ad", proto_btle);
btcommon_le_channel_map_handle = find_dissector_add_dependency("btcommon.le_channel_map", proto_btle);
btl2cap_handle = find_dissector_add_dependency("btl2cap", proto_btle);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
Bluetooth: BTLE: Fix data handling from previous dissector Check previous dissector before cast data parameter. That also causes Head overflow too. Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e Reviewed-on: https://code.wireshark.org/review/8512 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-08 07:10:35 +00:00
proto_btle_rf = proto_get_id_by_filter_name("btle_rf");
[BLE] Make the Nordic BLE dissector fill in the btle_context_t struct. Change-Id: I14e62126d022dde10dcce2d7e974def0dc664b20 Reviewed-on: https://code.wireshark.org/review/16840 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 11:54:46 +00:00
proto_nordic_ble = proto_get_id_by_filter_name("nordic_ble");
Bluetooth: BTLE: Fix data handling from previous dissector Check previous dissector before cast data parameter. That also causes Head overflow too. Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e Reviewed-on: https://code.wireshark.org/review/8512 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-08 07:10:35 +00:00
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>
2014-12-12 10:24:44 +00:00
dissector_add_uint("bluetooth.encap", WTAP_ENCAP_BLUETOOTH_LE_LL, btle_handle);
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
}
/*
HTTPS (almost) everywhere. Change all wireshark.org URLs to use https. Fix some broken links while we're at it. Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c Reviewed-on: https://code.wireshark.org/review/34089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:43:17 +00:00
* Editor modelines - https://www.wireshark.org/tools/modelines.html
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 Bluetooth: Add support for Low Energy Link Layer dissector svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00
*
* Local variables:
* c-basic-offset: 4
* tab-width: 8
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=4 tabstop=8 expandtab:
* :indentSize=4:tabSize=8:noTabs=true:
*/