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-btl2cap.c | |
parent | c071a1c7286eb9789dc5c96bb45ab75c75c3ecb4 (diff) | |
download | wireshark-11a61d757d25c8e47b95c9dd2c1309df78ded7ed.tar.gz |
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-btl2cap.c')
-rw-r--r-- | epan/dissectors/packet-btl2cap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 078b7ec662..a3b90fdf10 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -550,7 +550,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, uuid = get_service_uuid(pinfo, l2cap_data, psm, (pinfo->p2p_dir == P2P_DIR_RECV) ? TRUE : FALSE); if (uuid) { - psm_str = val_to_str_ext_const(uuid, &vs_service_classes_ext, "Unknown PSM"); + psm_str = val_to_str_ext_const(uuid, &bt_sig_uuid_vals_ext, "Unknown PSM"); proto_item_append_text(item, " (%s)", psm_str); } } @@ -1376,7 +1376,7 @@ dissect_b_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, psm_item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_psm_dynamic, tvb, offset, 0, psm); if (uuid) proto_item_append_text(psm_item, ": %s", - val_to_str_ext_const(uuid, &vs_service_classes_ext, "Unknown service")); + val_to_str_ext_const(uuid, &bt_sig_uuid_vals_ext, "Unknown service")); } PROTO_ITEM_SET_GENERATED(psm_item); @@ -1541,7 +1541,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, psm_item = proto_tree_add_uint(btl2cap_tree, hf_btl2cap_psm_dynamic, tvb, offset, 0, psm); if (uuid) proto_item_append_text(psm_item, " (%s)", - val_to_str_ext_const(uuid, &vs_service_classes_ext, "Unknown service")); + val_to_str_ext_const(uuid, &bt_sig_uuid_vals_ext, "Unknown service")); } PROTO_ITEM_SET_GENERATED(psm_item); |