diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2014-12-12 11:24:44 +0100 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2014-12-18 11:03:05 +0000 |
| commit | f5cd21543d332f6c14da88ebd50730750f791dd4 (patch) | |
| tree | b10694bfabdbdb3d20bb0c011fe9c489676d59e6 /epan/dissectors/packet-btrfcomm.c | |
| parent | 4a467ff609f1b5ee99cbc1aaccdc7b78d3cbecbc (diff) | |
Bluetooth: Add generic Bluetooth dissector
Bluetooth dissector is used to add ability to filter all bluetooth
payload from capture files (there are many transport like:
hci_h4, hci_h1, hci_usb, hci_mon, btle). Also it is used to placeholder for
all data tree used to store additional informations like bd_addrs, names, etc.
Finally it is used to be one point for Bluetooth
Endpoints/Conversation filtering what is enabled now.
Also add Master/Slave Role and Connection Mode tracking.
Change-Id: I67048080fb8ee16fa0f4ec429c1257de81ddd737
Reviewed-on: https://code.wireshark.org/review/5771
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
| -rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index b9e5d9de74..3d26c7b6b5 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -38,7 +38,7 @@ #include <epan/wmem/wmem.h> #include <epan/decode_as.h> -#include "packet-bluetooth-hci.h" +#include "packet-bluetooth.h" #include "packet-btsdp.h" #include "packet-btl2cap.h" #include "packet-btrfcomm.h" @@ -695,7 +695,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data subtree = (wmem_tree_t *) wmem_tree_lookup32_array(service_directions, key); service_direction = (subtree) ? (service_direction_t *) wmem_tree_lookup32_le(subtree, k_frame_number) : NULL; - if (service_direction && service_direction->end_in == G_MAXUINT32) { + if (service_direction && service_direction->end_in == max_disconnect_in_frame) { service_direction->end_in = k_frame_number; } @@ -706,7 +706,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data service_direction = wmem_new(wmem_file_scope(), service_direction_t); service_direction->direction = (pinfo->p2p_dir == P2P_DIR_RECV) ? P2P_DIR_SENT : P2P_DIR_RECV; - service_direction->end_in = G_MAXUINT32; + service_direction->end_in = max_disconnect_in_frame; wmem_tree_insert32_array(service_directions, key, service_direction); } @@ -775,7 +775,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data val_to_str_const(frame_type, vs_frame_type_short, "Unknown"), dlci >> 1); if (dlci && (frame_type == FRAME_TYPE_SABM)) col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) ", - val_to_str_ext_const(service_info->uuid.bt_uuid, &bt_sig_uuid_vals_ext, "Unknown")); + val_to_str_ext_const(service_info->uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown")); /* UID frame */ if ((frame_type == FRAME_TYPE_UIH) && dlci && pf_flag) { |