osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Michal Labedzki: 

Add support for AVDTP/A2DP/VDP and SBC

Part of 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893

svn path=/trunk/; revision=45921
This commit is contained in:
Anders Broman 2012-11-05 11:42:10 +00:00
parent 45953625a5
commit 892ff116c9
7 changed files with 2626 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/CMakeLists.txt
View File

@ -398,6 +398,7 @@ set(DISSECTOR_SRC
dissectors/packet-btatt.c
dissectors/packet-btbnep.c
dissectors/packet-btavctp.c
dissectors/packet-btavdtp.c
dissectors/packet-btavrcp.c
dissectors/packet-bthci_acl.c
dissectors/packet-bthci_cmd.c
@ -1076,6 +1077,7 @@ set(DISSECTOR_SRC
dissectors/packet-sap.c
dissectors/packet-sasp.c
dissectors/packet-sbus.c
dissectors/packet-sbc.c
dissectors/packet-sccp.c
dissectors/packet-sccpmg.c
dissectors/packet-scop.c

3
epan/dissectors/Makefile.common
View File

@ -318,6 +318,7 @@ DISSECTOR_SRC = \
packet-btatt.c \
packet-btbnep.c \
packet-btavctp.c \
packet-btavdtp.c \
packet-btavrcp.c \
packet-bthci_acl.c \
packet-bthci_cmd.c \
@ -996,6 +997,7 @@ DISSECTOR_SRC = \
packet-sap.c \
packet-sasp.c \
packet-sbus.c \
packet-sbc.c \
packet-sccp.c \
packet-sccpmg.c \
packet-scop.c \
@ -1230,6 +1232,7 @@ DISSECTOR_INCLUDES = \
packet-bssap.h \
packet-bssgp.h \
packet-btavctp.h \
packet-btavdtp.h \
packet-bthci_acl.h \
packet-btl2cap.h \
packet-btrfcomm.h \

2200
epan/dissectors/packet-btavdtp.c Normal file
View File

File diff suppressed because it is too large Load Diff

47
epan/dissectors/packet-btavdtp.h Normal file
View File

@ -0,0 +1,47 @@
/* packet-btavdtp.h
* Headers for AVDTP
*
* Copyright 2012, 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.
*/
#ifndef __PACKET_BTAVDTP_H__
#define __PACKET_BTAVDTP_H__
typedef struct _btavdtp_data_t {
dissector_handle_t codec_dissector;
} btavdtp_data_t;
#endif
/*
* 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:
*/

24
epan/dissectors/packet-btl2cap.c
View File

@ -155,6 +155,8 @@ typedef struct _config_data_t {
typedef struct _psm_data_t {
guint16 scid;
guint16 dcid;
guint32 first_scid_frame;
guint32 first_dcid_frame;
guint16 psm;
gboolean local_service;
config_data_t in;
@ -418,6 +420,8 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
psm_data->scid = (scid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x8000 : 0x0000));
psm_data->dcid = 0;
psm_data->psm = psm;
psm_data->first_scid_frame = 0;
psm_data->first_dcid_frame = 0;
psm_data->local_service = (pinfo->p2p_dir == P2P_DIR_RECV) ? TRUE : FALSE;
psm_data->in.mode = 0;
psm_data->in.txwindow = 0;
@ -1290,6 +1294,8 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
l2cap_data = ep_alloc(sizeof(btl2cap_data_t));
l2cap_data->chandle = (acl_data)? acl_data->chandle : 0;
l2cap_data->cid = cid;
l2cap_data->psm = 0;
l2cap_data->first_scid_frame = 0;
pd_save = pinfo->private_data;
pinfo->private_data = l2cap_data;
@ -1485,11 +1491,23 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
psm_data = se_tree_lookup32_array_le(cid_to_psm_table, key);
if (psm_data &&
((psm_data->scid == (cid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x0000 : 0x8000)))
|| (psm_data->dcid == (cid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x0000 : 0x8000))))
) {
((psm_data->scid == (cid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x0000 : 0x8000))) ||
(psm_data->dcid == (cid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x0000 : 0x8000))))) {
if ((psm_data->scid == (cid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x0000 : 0x8000))) &&
psm_data->first_scid_frame == 0) {
psm_data->first_scid_frame = pinfo->fd->num;
}
if ((psm_data->dcid == (cid | ((pinfo->p2p_dir == P2P_DIR_RECV) ? 0x0000 : 0x8000))) &&
psm_data->first_dcid_frame == 0) {
psm_data->first_dcid_frame = pinfo->fd->num;
}
psm = psm_data->psm;
l2cap_data->psm = psm;
l2cap_data->first_scid_frame = psm_data->first_scid_frame;
l2cap_data->first_dcid_frame = psm_data->first_dcid_frame;
if (pinfo->p2p_dir == P2P_DIR_RECV)
config_data = &(psm_data->in);

8
epan/dissectors/packet-btl2cap.h
View File

@ -51,9 +51,11 @@
* chandle, cid and direction
*/
typedef struct _btl2cap_data_t {
guint16 chandle; /* only low 12 bits used */
guint16 cid;
guint16 psm;
guint16 chandle; /* only low 12 bits used */
guint16 cid;
guint16 psm;
guint32 first_scid_frame;
guint32 first_dcid_frame;
} btl2cap_data_t;
#endif

348
epan/dissectors/packet-sbc.c Normal file
View File

@ -0,0 +1,348 @@
/* packet-sbc.c
* Routines for Bluetooth SBC dissection
*
* Copyright 2012, 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/expert.h>
#include <epan/prefs.h>
#define CHANNELS_MONO 0x00
#define CHANNELS_JOINT_STEREO 0x03
#define FREQUENCY_16000 0x00
#define FREQUENCY_32000 0x01
#define FREQUENCY_44100 0x02
#define FREQUENCY_48000 0x03
static int proto_sbc = -1;
static int hf_sbc_fragmented = -1;
static int hf_sbc_starting_packet = -1;
static int hf_sbc_last_packet = -1;
static int hf_sbc_rfa = -1;
static int hf_sbc_number_of_frames = -1;
static int hf_sbc_syncword = -1;
static int hf_sbc_sampling_frequency = -1;
static int hf_sbc_blocks = -1;
static int hf_sbc_channel_mode = -1;
static int hf_sbc_allocation_method = -1;
static int hf_sbc_subbands = -1;
static int hf_sbc_bitpool = -1;
static int hf_sbc_crc_check = -1;
static int hf_sbc_data = -1;
static gint ett_sbc = -1;
static gint ett_sbc_list = -1;
static dissector_handle_t data_handle;
extern value_string_ext media_codec_audio_type_vals_ext;
static const value_string sampling_frequency_vals[] = {
{ 0x00, "16 kHz"},
{ 0x01, "32 kHz"},
{ 0x02, "44.1 kHz"},
{ 0x03, "48 kHz"},
{ 0, NULL }
};
static const value_string blocks_vals[] = {
{ 0x00, "4"},
{ 0x01, "8"},
{ 0x02, "12"},
{ 0x03, "16"},
{ 0, NULL }
};
static const value_string channel_mode_vals[] = {
{ 0x00, "Mono"},
{ 0x01, "Dual Channel"},
{ 0x02, "Stereo"},
{ 0x03, "Joint Stereo"},
{ 0, NULL }
};
static const value_string allocation_method_vals[] = {
{ 0x00, "Loudness"},
{ 0x01, "SNR"},
{ 0, NULL }
};
static const value_string subbands_vals[] = {
{ 0x00, "4"},
{ 0x01, "8"},
{ 0, NULL }
};
static gint
dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
proto_item *ti;
proto_tree *sbc_tree;
proto_item *pitem;
proto_item *ritem;
proto_tree *rtree;
gint offset = 0;
guint8 number_of_frames;
guint8 syncword;
guint8 byte;
guint8 blocks;
guint8 channels;
guint8 subbands;
guint8 bitpool;
guint frequency;
guint8 sbc_blocks;
gint sbc_channels;
guint8 sbc_subbands;
gint val;
gint counter = 1;
gint frame_length;
gint expected_speed_data;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SBC");
ti = proto_tree_add_item(tree, proto_sbc, tvb, offset, -1, ENC_NA);
sbc_tree = proto_item_add_subtree(ti, ett_sbc);
proto_tree_add_item(sbc_tree, hf_sbc_fragmented, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sbc_tree, hf_sbc_starting_packet, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sbc_tree, hf_sbc_last_packet, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sbc_tree, hf_sbc_rfa, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sbc_tree, hf_sbc_number_of_frames, tvb, offset, 1, ENC_BIG_ENDIAN);
number_of_frames = tvb_get_guint8(tvb, offset) & 0x0F;
offset += 1;
while (tvb_length_remaining(tvb, offset)) {
byte = tvb_get_guint8(tvb, offset + 1);
frequency = (byte & 0xC0) >> 6;
blocks = (byte & 0x30) >> 4;
channels = (byte & 0x0C)>> 2;
subbands = byte & 0x01;
bitpool = tvb_get_guint8(tvb, offset + 2);
if (channels == CHANNELS_MONO)
sbc_channels = 1;
else
sbc_channels = 2;
switch (frequency) {
case FREQUENCY_16000:
frequency = 16000;
break;
case FREQUENCY_32000:
frequency = 32000;
break;
case FREQUENCY_44100:
frequency = 44100;
break;
case FREQUENCY_48000:
frequency = 48000;
break;
default:
frequency = 0;
}
sbc_subbands = 4 * (subbands + 1);
sbc_blocks = 4 * (blocks + 1);
frame_length = (4 * sbc_subbands * sbc_channels) / 8;
if (sbc_channels == 1)
val = sbc_blocks * sbc_channels * bitpool;
else
val = (((channels == CHANNELS_JOINT_STEREO) ? 1 : 0) * sbc_subbands + sbc_blocks * bitpool);
frame_length += val / 8;
if (val % 8)
frame_length += 1;
expected_speed_data = (frame_length * frequency) / (sbc_subbands * sbc_blocks);
ritem = proto_tree_add_text(sbc_tree, tvb, offset, 4 + frame_length,
"Frame: %3u/%3u", counter, number_of_frames);
rtree = proto_item_add_subtree(ritem, ett_sbc_list);
pitem = proto_tree_add_item(rtree, hf_sbc_syncword, tvb, offset, 1, ENC_BIG_ENDIAN);
syncword = tvb_get_guint8(tvb, offset);
if (syncword != 0x9C) {
expert_add_info_format(pinfo, pitem, PI_PROTOCOL, PI_WARN,
"Unexpected syncword");
}
offset += 1;
proto_tree_add_item(ritem, hf_sbc_sampling_frequency, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ritem, hf_sbc_blocks, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ritem, hf_sbc_channel_mode, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ritem, hf_sbc_allocation_method, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(ritem, hf_sbc_subbands, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(ritem, hf_sbc_bitpool, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(ritem, hf_sbc_crc_check, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(ritem, hf_sbc_data, tvb, offset, frame_length, ENC_BIG_ENDIAN);
offset += frame_length;
/* TODO: expert_info for invalid CRC*/
pitem = proto_tree_add_text(ritem, tvb, offset, 0, "Expected speed data: %u KiB/s", expected_speed_data / 1024);
PROTO_ITEM_SET_GENERATED(pitem);
counter += 1;
}
/* TODO: more precise dissection: blocks, channels, subbands, padding */
col_append_fstr(pinfo->cinfo, COL_INFO, " Frames=%u", number_of_frames);
return offset;
}
void
proto_register_sbc(void)
{
module_t *module;
static hf_register_info hf[] = {
{ &hf_sbc_fragmented,
{ "Fragmented", "sbc.fragmented",
FT_BOOLEAN, 8, NULL, 0x80,
NULL, HFILL }
},
{ &hf_sbc_starting_packet,
{ "Starting Packet", "sbc.starting_packet",
FT_BOOLEAN, 8, NULL, 0x40,
NULL, HFILL }
},
{ &hf_sbc_last_packet,
{ "Last Packet", "sbc.last_packet",
FT_BOOLEAN, 8, NULL, 0x20,
NULL, HFILL }
},
{ &hf_sbc_rfa,
{ "RFA", "sbc.rfa",
FT_BOOLEAN, 8, NULL, 0x10,
NULL, HFILL }
},
{ &hf_sbc_number_of_frames,
{ "Number of Frames", "sbc.number_of_frames",
FT_UINT8, BASE_DEC, NULL, 0x0F,
NULL, HFILL }
},
{ &hf_sbc_syncword,
{ "Sync Word", "sbc.syncword",
FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_sbc_sampling_frequency,
{ "Sampling Frequency", "sbc.sampling_frequency",
FT_UINT8, BASE_HEX, VALS(sampling_frequency_vals), 0xC0,
NULL, HFILL }
},
{ &hf_sbc_blocks,
{ "Blocks", "sbc.blocks",
FT_UINT8, BASE_HEX, VALS(blocks_vals), 0x30,
NULL, HFILL }
},
{ &hf_sbc_channel_mode,
{ "Channel Mode", "sbc.channel_mode",
FT_UINT8, BASE_HEX, VALS(channel_mode_vals), 0x0C,
NULL, HFILL }
},
{ &hf_sbc_allocation_method,
{ "Allocation Method", "sbc.allocation_method",
FT_UINT8, BASE_HEX, VALS(allocation_method_vals), 0x02,
NULL, HFILL }
},
{ &hf_sbc_subbands,
{ "Subbands", "sbc.subbands",
FT_UINT8, BASE_HEX, VALS(subbands_vals), 0x01,
NULL, HFILL }
},
{ &hf_sbc_bitpool,
{ "Bitpool", "sbc.bitpool",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
{ &hf_sbc_crc_check,
{ "CRC Check", "sbc.crc_check",
FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_sbc_data,
{ "Data", "sbc.data",
FT_NONE, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
};
static gint *ett[] = {
&ett_sbc,
&ett_sbc_list,
};
proto_sbc = proto_register_protocol("Bluetooth SBC Codec", "SBC", "sbc");
proto_register_field_array(proto_sbc, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
new_register_dissector("sbc", dissect_sbc, proto_sbc);
module = prefs_register_protocol(proto_sbc, NULL);
prefs_register_static_text_preference(module, "a2dp.version",
"Bluetooth Audio Codec SBC version based on A2DP 1.3",
"Version of codec supported by this dissector.");
}
void
proto_reg_handoff_sbc(void)
{
dissector_handle_t sbc_handle;
sbc_handle = find_dissector("sbc");
data_handle = find_dissector("data");
}
/*
* 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:
*/