diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-01-06 10:47:33 +0100 |
|---|---|---|
| committer | Michal Labedzki <michal.labedzki@tieto.com> | 2015-02-07 16:56:17 +0000 |
| commit | 13f6bce802a2dced0218a893ca9c196fb113cb22 (patch) | |
| tree | 0142afd4dcd5b5ea83dd5a12fbdebb18284d4324 /epan/dissectors | |
| parent | 617c733b9fc3bf17536d77801a33f0aa63d2df4e (diff) | |
Bluetooth: ATT: Use proto_tree_add_new_bytes for UUID128
Change-Id: I018b3e125bcbb6908276dd2b3b9f66def9aa745b
Reviewed-on: https://code.wireshark.org/review/6907
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-bluetooth.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-btatt.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index 6746c0d3a1..cef7a63616 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -1178,8 +1178,9 @@ get_uuid(tvbuff_t *tvb, gint offset, gint size) { uuid_t uuid; + uuid.bt_uuid = 0; + if (size != 2 && size != 16) { - uuid.bt_uuid = 0; uuid.size = 0; return uuid; diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index eb976ce685..597728a70c 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -1662,8 +1662,8 @@ dissect_handle_uint(proto_tree *tree, packet_info *pinfo, gint hf, if (local_uuid.size == 2) sub_item = proto_tree_add_uint(sub_tree, hf_btatt_uuid16, tvb, 0, 0, local_uuid.bt_uuid); -/* else - sub_item = proto_tree_add_bytes(sub_tree, hf_btatt_uuid128, tvb, 0, 16, uuid.data);*/ + else + sub_item = proto_tree_add_new_bytes(sub_tree, hf_btatt_uuid128, tvb, 0, 0, local_uuid.data, 16); PROTO_ITEM_SET_GENERATED(sub_item); |