osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Bluetooth: ATT: Dissect almost all attributes 

Change-Id: Ia388c07150d9664327daf2d1990b4465b5f4ae28
Reviewed-on: https://code.wireshark.org/review/6910
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>
This commit is contained in:
Michal Labedzki 2015-01-07 12:16:15 +01:00
parent 60b9be9644
commit ca3fe281f5
3 changed files with 3611 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-bluetooth.c
View File

@ -61,7 +61,7 @@ static wmem_tree_t *hci_vendors = NULL;
static int bluetooth_tap = -1;
static const value_string bluetooth_uuid_vals[] = {
const value_string bluetooth_uuid_vals[] = {
/* Protocol Identifiers - https://www.bluetooth.org/en-us/specification/assigned-numbers/service-discovery */
{ 0x0001, "SDP" },
{ 0x0002, "UDP" },
@ -1228,6 +1228,15 @@ print_uuid(uuid_t *uuid)
}
}
gchar *
print_numeric_uuid(uuid_t *uuid)
{
if (uuid && uuid->size > 0)
return bytes_to_str(wmem_packet_scope(), uuid->data, uuid->size);
return NULL;
}
static gint
dissect_bluetooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)

4
epan/dissectors/packet-bluetooth.h
View File

@ -209,7 +209,8 @@ typedef struct _custom_uuid_t {
const gchar *name;
} custom_uuid_t;
extern const custom_uuid_t custom_uuid[];
extern const value_string bluetooth_uuid_vals[];
extern const custom_uuid_t custom_uuid[];
extern value_string_ext bluetooth_uuid_vals_ext;
extern value_string_ext bluetooth_company_id_vals_ext;
@ -220,6 +221,7 @@ extern gint dissect_bd_addr(gint hf_bd_addr, proto_tree *tree, tvbuff_t *tvb,
extern uuid_t get_uuid(tvbuff_t *tvb, gint offset, gint size);
extern gchar *print_uuid(uuid_t *uuid);
extern gchar *print_numeric_uuid(uuid_t *uuid);
extern void save_local_device_name_from_eir_ad(tvbuff_t *tvb, gint offset,
packet_info *pinfo, guint8 size, bluetooth_data_t *bluetooth_data);

3709
epan/dissectors/packet-btatt.c
View File

File diff suppressed because it is too large Load Diff