diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | colorfilters | 1 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-btmcap.c | 458 |
5 files changed, 462 insertions, 0 deletions
@@ -3479,6 +3479,7 @@ Michal Labedzki <michal.labedzki[at]tieto.com> { Bluetooth AVCTP dissector Bluetooth AVRCP dissector Bluetooth HCI USB transport dissector + Bluetooth MCAP dissector } Wido Kelling <kellingwido[At]aol.com> { diff --git a/colorfilters b/colorfilters index b5eac1a331..5a202d1a53 100644 --- a/colorfilters +++ b/colorfilters @@ -33,6 +33,7 @@ @SAP@btsap@[51110,54321,18857][5111,4915,4652] @HFP@bthfp@[57840,49413,65535][5111,4915,4652] @RFCOMM@btrfcomm@[64249,44202,25136][5111,4915,4652] +@MCAP@btmcap@[62194,62965,53970][5111,4915,4652] @SDP@btsdp@[34255,42642,22057][5111,4915,4652] @ATT@btatt@[35252,51463,40197][7995,7208,6946] @L2CAP@btl2cap@[58215,49541,23520][11822,13364,13878] diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 6461df1eef..70bfa73b29 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -411,6 +411,7 @@ set(DISSECTOR_SRC dissectors/packet-bthfp.c dissectors/packet-bthid.c dissectors/packet-btl2cap.c + dissectors/packet-btmcap.c dissectors/packet-btobex.c dissectors/packet-btrfcomm.c dissectors/packet-btsap.c diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 2069e1acd3..5071269766 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -330,6 +330,7 @@ DISSECTOR_SRC = \ packet-bthfp.c \ packet-bthid.c \ packet-btl2cap.c \ + packet-btmcap.c \ packet-btobex.c \ packet-btrfcomm.c \ packet-btsap.c \ diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c new file mode 100644 index 0000000000..3b5404ca60 --- /dev/null +++ b/epan/dissectors/packet-btmcap.c @@ -0,0 +1,458 @@ +/* packet-btmcap.c + * Routines for Bluetooth MCAP dissection + * https://www.bluetooth.org/Technical/Specifications/adopted.htm + * + * Copyright 2013, Michal Labedzki for Tieto Corporation + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" + +#include <epan/packet.h> +#include <epan/prefs.h> +#include <epan/expert.h> + +#include "packet-btl2cap.h" +#include "packet-btsdp.h" + +static int proto_btmcap = -1; + +static int hf_btmcap_op_code = -1; +static int hf_btmcap_response_code = -1; +static int hf_btmcap_mdl_id = -1; +static int hf_btmcap_mdep_id = -1; +static int hf_btmcap_response_parameters = -1; +static int hf_btmcap_configuration = -1; +static int hf_btmcap_timestamp_required_accuracy = -1; +static int hf_btmcap_timestamp_update_information = -1; +static int hf_btmcap_bluetooth_clock_sync_time = -1; +static int hf_btmcap_timestamp_sync_time = -1; +static int hf_btmcap_timestamp_sample_accuracy = -1; +static int hf_btmcap_bluetooth_clock_access_resolution = -1; +static int hf_btmcap_sync_lead_time = -1; +static int hf_btmcap_timestamp_native_resolution = -1; +static int hf_btmcap_timestamp_native_accuracy = -1; + +static int hf_btmcap_data = -1; + +static gint ett_btmcap = -1; + +static const value_string op_code_vals[] = { + { 0x00, "ERROR_RSP" }, + { 0x01, "MD_CREATE_MDL_REQ" }, + { 0x02, "MD_CREATE_MDL_RSP" }, + { 0x03, "MD_RECONNECT_MDL_REQ" }, + { 0x04, "MD_RECONNECT_MDL_RSP" }, + { 0x05, "MD_ABORT_MDL_REQ" }, + { 0x06, "MD_ABORT_MDL_RSP" }, + { 0x07, "MD_DELETE_MDL_REQ" }, + { 0x08, "MD_DELETE_MDL_RSP" }, + { 0x11, "MD_SYNC_CAP_REQ" }, + { 0x12, "MD_SYNC_CAP_RSP" }, + { 0x13, "MD_SYNC_SET_REQ" }, + { 0x14, "MD_SYNC_SET_RSP" }, + { 0x15, "MD_SYNC_INFO_IND" }, + { 0x16, "Reserved as pseudoresponse" }, + { 0, NULL } +}; + +static const value_string response_code_vals[] = { + { 0x00, "Success" }, + { 0x01, "Invalid Op Code" }, + { 0x02, "Invalid Parameter Value" }, + { 0x03, "Invalid MDEP" }, + { 0x04, "MDEP Busy" }, + { 0x05, "Invalid MDL" }, + { 0x06, "MDL Busy" }, + { 0x07, "Invalid Operation" }, + { 0x08, "Resource Unavailable" }, + { 0x09, "Unspecified Error" }, + { 0x0A, "Request Not Supported" }, + { 0x0B, "Configuration Rejected" }, + { 0, NULL } +}; + +static void +dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + proto_item *main_item; + proto_tree *main_tree; + proto_item *pitem; + gint offset = 0; + guint32 op_code; + guint32 response_code; + guint32 mdl_id; + guint32 mdep_id; + guint32 bluetooth_clock_sync_time; + guint64 timestamp_sync_time; + + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MCAP"); + col_clear(pinfo->cinfo, COL_INFO); + + switch (pinfo->p2p_dir) { + + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + + case P2P_DIR_UNKNOWN: + col_clear(pinfo->cinfo, COL_INFO); + break; + + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; + } + + main_item = proto_tree_add_item(tree, proto_btmcap, tvb, offset, -1, ENC_NA); + main_tree = proto_item_add_subtree(main_item, ett_btmcap); + + pitem = proto_tree_add_item(main_tree, hf_btmcap_op_code, tvb, offset, 1, ENC_BIG_ENDIAN); + op_code = tvb_get_guint8(tvb, offset); + offset += 1; + + col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(op_code, op_code_vals, "Unknown Op Code")); + if (op_code >= 0x11 && op_code <= 0x20) { + proto_item_append_text(pitem, " (Clock Sync)"); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Clock Sync)"); + } else { + proto_item_append_text(pitem, " (Standard)"); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Standard)"); + } + + if (op_code & 0x01) { + /* isRequest */ + switch(op_code) { + case 0x01: /* MD_CREATE_MDL_REQ */ + case 0x03: /* MD_RECONNECT_MDL_REQ */ + case 0x05: /* MD_ABORT_MDL_REQ */ + case 0x07: /* MD_DELETE_MDL_REQ */ + pitem = proto_tree_add_item(main_tree, hf_btmcap_mdl_id, tvb, offset, 2, ENC_BIG_ENDIAN); + mdl_id = tvb_get_ntohs(tvb, offset); + offset += 2; + + col_append_fstr(pinfo->cinfo, COL_INFO, " - MDL ID: %u", mdl_id); + if (mdl_id == 0xFFFF) { + proto_item_append_text(pitem, " (Indicates all MDLs)"); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Indicates all MDLs)"); + } else if (mdl_id >= 0x0001 && mdl_id <= 0xFEFF) { + proto_item_append_text(pitem, " (Dynamic Range)"); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Dynamic Range)"); + } else if (mdl_id == 0x0000) { + proto_item_append_text(pitem, " (Reserved)"); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Reserved)"); + } + + if (op_code != 0x07 && mdl_id == 0xFFFF) { + expert_add_info_format(pinfo, pitem, PI_PROTOCOL, PI_WARN, + " The value 0xFFFF is not a valid MDL ID for this request and shall not be used."); + } + + if (op_code == 0x01) { + /* only MD_CREATE_MDL_REQ */ + pitem = proto_tree_add_item(main_tree, hf_btmcap_mdep_id, tvb, offset, 1, ENC_BIG_ENDIAN); + mdep_id = tvb_get_guint8(tvb, offset); + offset += 1; + + if (mdep_id <= 0x7F) { + proto_item_append_text(pitem, " (Available for use)"); + } else { + proto_item_append_text(pitem, " (Reserved)"); + } + + pitem = proto_tree_add_item(main_tree, hf_btmcap_configuration, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; + } + break; + case 0x11: /* MD_SYNC_CAP_REQ */ + pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_required_accuracy, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_item_append_text(pitem, " ppm"); + offset += 2; + break; + case 0x13: /* MD_SYNC_SET_REQ */ + pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_update_information, tvb, offset, 1, ENC_BIG_ENDIAN); + offset += 1; + + pitem = proto_tree_add_item(main_tree, hf_btmcap_bluetooth_clock_sync_time, tvb, offset, 4, ENC_BIG_ENDIAN); + bluetooth_clock_sync_time = tvb_get_ntohl(tvb, offset); + if (bluetooth_clock_sync_time == 0xFFFFFFFF) + proto_item_append_text(pitem, " (Instant Synchronization)"); + else + proto_item_append_text(pitem, " (Baseband Half-Slot Instant)");; + offset += 4; + + pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_sync_time, tvb, offset, 8, ENC_BIG_ENDIAN); + timestamp_sync_time = tvb_get_ntoh64(tvb, offset); + if (timestamp_sync_time == G_GUINT64_CONSTANT(0xFFFFFFFFFFFFFFFF)) + proto_item_append_text(pitem, " (No Time Synchronization)"); + else + proto_item_append_text(pitem, " (Time-Stamp Clock Instant)"); + offset += 8; + break; + case 0x15: /* MD_SYNC_INFO_IND */ + pitem = proto_tree_add_item(main_tree, hf_btmcap_bluetooth_clock_sync_time, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_item_append_text(pitem, " (Baseband Half-Slot Instant)"); + offset += 4; + + pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_sync_time, tvb, offset, 8, ENC_BIG_ENDIAN); + proto_item_append_text(pitem, " (Time-Stamp Clock Instant)"); + offset += 8; + + pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_sample_accuracy, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_item_append_text(pitem, " us"); + offset += 2; + break; + } + } else { + /* isResponse */ + + pitem = proto_tree_add_item(main_tree, hf_btmcap_response_code, tvb, offset, 1, ENC_BIG_ENDIAN); + response_code = tvb_get_guint8(tvb, offset); + offset += 1; + + col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", val_to_str(response_code, response_code_vals, "Unknown ResponseCode")); + + if (op_code >= 0x11 && op_code <= 0x20) { + /* Clock Sync */ + switch(op_code) { + case 0x12: /* MD_SYNC_CAP_RSP */ + pitem = proto_tree_add_item(main_tree, hf_btmcap_bluetooth_clock_access_resolution, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_item_append_text(pitem, " (Baseband half-slots)"); + offset += 1; + + pitem = proto_tree_add_item(main_tree, hf_btmcap_sync_lead_time, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_item_append_text(pitem, " ms"); + offset += 2; + + pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_native_resolution, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_item_append_text(pitem, " us"); + offset += 2; + + pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_native_accuracy, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_item_append_text(pitem, " ppm"); + offset += 2; + break; + case 0x14: /* MD_SYNC_SET_RSP */ + pitem = proto_tree_add_item(main_tree, hf_btmcap_bluetooth_clock_sync_time, tvb, offset, 4, ENC_BIG_ENDIAN); + bluetooth_clock_sync_time = tvb_get_ntohl(tvb, offset); + if (bluetooth_clock_sync_time == 0xFFFFFFFF) + proto_item_append_text(pitem, " (Instant Synchronization)"); + else + proto_item_append_text(pitem, " (Baseband Half-Slot Instant)"); + offset += 4; + + pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_sync_time, tvb, offset, 8, ENC_BIG_ENDIAN); + timestamp_sync_time = tvb_get_ntoh64(tvb, offset); + if (timestamp_sync_time == G_GUINT64_CONSTANT(0xFFFFFFFFFFFFFFFF)) + proto_item_append_text(pitem, " (No Time Synchronization)"); + else + proto_item_append_text(pitem, " (Time-Stamp Clock Instant)"); + offset += 8; + + pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_sample_accuracy, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_item_append_text(pitem, " us"); + offset += 2; + break; + } + } else { + /* Standard Op Code */ + pitem = proto_tree_add_item(main_tree, hf_btmcap_mdl_id, tvb, offset, 2, ENC_BIG_ENDIAN); + mdl_id = tvb_get_ntohs(tvb, offset); + offset += 2; + + col_append_fstr(pinfo->cinfo, COL_INFO, " - %u", mdl_id); + if (mdl_id == 0xFFFF) { + proto_item_append_text(pitem, " (Indicates all MDLs)"); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Indicates all MDLs)"); + } else if (mdl_id >= 0x0001 && mdl_id <= 0xFEFF) { + proto_item_append_text(pitem, " (Dynamic Range)"); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Dynamic Range)"); + } else if (mdl_id == 0x0000) { + proto_item_append_text(pitem, " (Reserved)"); + col_append_fstr(pinfo->cinfo, COL_INFO, " (Reserved)"); + } + + if ((op_code == 0x03 || op_code == 0x05 || op_code == 0x07) && tvb_length_remaining(tvb, offset)) { + expert_add_info_format(pinfo, pitem, PI_PROTOCOL, PI_WARN, + "The Response Parameters for MD_RECONNECT_MDL_RSP shall have length zero."); + } else if (tvb_length_remaining(tvb, offset)) { + pitem = proto_tree_add_item(main_tree, hf_btmcap_response_parameters, tvb, offset, -1, ENC_NA); + if (response_code != 0x00) { + expert_add_info_format(pinfo, pitem, PI_PROTOCOL, PI_WARN, + "When the Response Code is not Success, the Response Parameters shall have length zero."); + } + offset += tvb_length_remaining(tvb, offset); + } + } + } + + if (tvb_length_remaining(tvb, offset)) { + pitem = proto_tree_add_item(main_tree, hf_btmcap_data, tvb, offset, -1, ENC_NA); + expert_add_info_format(pinfo, pitem, PI_PROTOCOL, PI_WARN, + "Unexpected data"); + } +} + + +void +proto_register_btmcap(void) +{ + module_t *module; + + static hf_register_info hf[] = { + { &hf_btmcap_op_code, + { "Op Code", "btmcap.op_code", + FT_UINT8, BASE_HEX, VALS(op_code_vals), 0x0, + NULL, HFILL } + }, + { &hf_btmcap_response_code, + { "Response Code", "btmcap.response_code", + FT_UINT8, BASE_HEX, VALS(response_code_vals), 0x0, + NULL, HFILL } + }, + { &hf_btmcap_mdl_id, + { "MDL ID", "btmcap.mdl_id", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_btmcap_mdep_id, + { "MDEP ID", "btmcap.mdep_id", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_btmcap_configuration, + { "Configuration", "btmcap.configuration", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL } + }, + { &hf_btmcap_timestamp_required_accuracy, + { "Timestamp Required Accuracy", "btmcap.timestamp_required_accuracy", + FT_UINT16, BASE_DEC, NULL, 0x00, + NULL, HFILL } + }, + { &hf_btmcap_timestamp_update_information, + { "Timestamp Update Information", "btmcap.timestamp_update_information", + FT_UINT8, BASE_DEC, NULL, 0x00, + NULL, HFILL } + }, + { &hf_btmcap_bluetooth_clock_sync_time, + { "Bluetooth Clock Sync Time", "btmcap.bluetooth_clock_sync_time", + FT_UINT32, BASE_DEC, NULL, 0x00, + NULL, HFILL } + }, + { &hf_btmcap_timestamp_sync_time, + { "Timestamp Sync Time", "btmcap.timestamp_sync_time", + FT_UINT64, BASE_DEC, NULL, 0x00, + NULL, HFILL } + }, + { &hf_btmcap_timestamp_sample_accuracy, + { "Timestamp Sample Accuracy", "btmcap.timestamp_sample_accuracy", + FT_UINT16, BASE_DEC, NULL, 0x00, + NULL, HFILL } + }, + { &hf_btmcap_bluetooth_clock_access_resolution, + { "Bluetooth Clock Access Resolution","btmcap.bluetooth_clock_access_resolution", + FT_UINT8, BASE_DEC, NULL, 0x00, + NULL, HFILL } + }, + { &hf_btmcap_sync_lead_time, + { "Sync Lead Time", "btmcap.sync_lead_time", + FT_UINT16, BASE_DEC, NULL, 0x00, + NULL, HFILL } + }, + { &hf_btmcap_timestamp_native_resolution, + { "Timestamp Native Resolution", "btmcap.timestamp_native_resolution", + FT_UINT16, BASE_DEC, NULL, 0x00, + NULL, HFILL } + }, + { &hf_btmcap_timestamp_native_accuracy, + { "Timestamp Native Accuracy", "btmcap.timestamp_native_accuracy", + FT_UINT16, BASE_DEC, NULL, 0x00, + NULL, HFILL } + }, + { &hf_btmcap_response_parameters, + { "Response Parameters", "btmcap.response_parameters", + FT_BYTES, BASE_NONE, NULL, 0x00, + NULL, HFILL } + }, + + { &hf_btmcap_data, + { "Data", "btmcap.data", + FT_NONE, BASE_NONE, NULL, 0x00, + NULL, HFILL } + }, + + }; + + static gint *ett[] = { + &ett_btmcap + }; + + proto_btmcap = proto_register_protocol("Bluetooth MCAP Profile", "MCAP", "btmcap"); + register_dissector("btmcap", dissect_btmcap, proto_btmcap); + + proto_register_field_array(proto_btmcap, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + + module = prefs_register_protocol(proto_btmcap, NULL); + prefs_register_static_text_preference(module, "mcap.version", + "Bluetooth Protocol MCAP version: 1.0", + "Version of protocol supported by this dissector."); +} + + +void +proto_reg_handoff_btmcap(void) +{ + dissector_handle_t btmcap_handle; + + btmcap_handle = find_dissector("btmcap"); + + dissector_add_uint("btl2cap.service", BTSDP_MCAP_CONTROL_CHANNEL_PROTOCOL_UUID, btmcap_handle); + dissector_add_uint("btl2cap.service", BTSDP_MCAP_DATA_CHANNEL_PROTOCOL_UUID, btmcap_handle); + + dissector_add_uint("btl2cap.service", BTSDP_HDP_SERVICE_UUID, btmcap_handle); + dissector_add_uint("btl2cap.service", BTSDP_HDP_SOURCE_SERVICE_UUID, btmcap_handle); + dissector_add_uint("btl2cap.service", BTSDP_HDP_SINK_SERVICE_UUID, btmcap_handle); + + /* dynamic PSM */ + dissector_add_handle("btl2cap.psm", btmcap_handle); + dissector_add_handle("btl2cap.cid", btmcap_handle); +} + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * 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: + */ |