diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-01-12 02:29:51 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-01-12 02:29:51 +0000 |
| commit | 11a61d757d25c8e47b95c9dd2c1309df78ded7ed (patch) | |
| tree | b0eab612cda9b5fb2bbad998b8739cb15a0a91b1 /epan/dissectors/packet-btbnep.c | |
| parent | c071a1c7286eb9789dc5c96bb45ab75c75c3ecb4 (diff) | |
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
Diffstat (limited to 'epan/dissectors/packet-btbnep.c')
| -rw-r--r-- | epan/dissectors/packet-btbnep.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index a214459918..fa74836398 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -31,6 +31,7 @@ #include <epan/etypes.h> #include <epan/expert.h> +#include "packet-bluetooth-hci.h" #include "packet-btl2cap.h" #include "packet-btsdp.h" @@ -178,17 +179,17 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) pitem = proto_tree_add_item(tree, hf_btbnep_destination_service_uuid, tvb, offset, uuid_size, ENC_NA); uuid_dst = tvb_get_ntohs(tvb, offset); - proto_item_append_text(pitem, " (%s)", val_to_str_ext(uuid_dst, &vs_service_classes_ext, "Unknown uuid")); + proto_item_append_text(pitem, " (%s)", val_to_str_ext(uuid_dst, &bt_sig_uuid_vals_ext, "Unknown uuid")); offset += uuid_size; pitem = proto_tree_add_item(tree, hf_btbnep_source_service_uuid, tvb, offset, uuid_size, ENC_NA); uuid_src = tvb_get_ntohs(tvb, offset); - proto_item_append_text(pitem, " (%s)", val_to_str_ext(uuid_src, &vs_service_classes_ext, "Unknown uuid")); + proto_item_append_text(pitem, " (%s)", val_to_str_ext(uuid_src, &bt_sig_uuid_vals_ext, "Unknown uuid")); offset += uuid_size; col_append_fstr(pinfo->cinfo, COL_INFO, " - dst: <%s>, src: <%s>", - val_to_str_ext(uuid_dst, &vs_service_classes_ext, "Unknown uuid"), - val_to_str_ext(uuid_src, &vs_service_classes_ext, "Unknown uuid")); + val_to_str_ext(uuid_dst, &bt_sig_uuid_vals_ext, "Unknown uuid"), + val_to_str_ext(uuid_src, &bt_sig_uuid_vals_ext, "Unknown uuid")); break; case 0x02: /* Setup Connection Response */ proto_tree_add_item(tree, hf_btbnep_setup_connection_response_message, tvb, offset, 2, ENC_BIG_ENDIAN); |