diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-02 19:20:04 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-02 19:20:04 +0000 |
| commit | a267501b82a84ab3d5b9cb7d2f06129d5ca57e42 (patch) | |
| tree | 056e815b8f475e4c3b5ae57d80f89e202d47aa13 /epan/dissectors/packet-btatt.c | |
| parent | 2c85824a469dba2edc674f29a18058bcec19139e (diff) | |
Bluetooth: Use dissector data instead of pinfo->private_data. Bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893)
From Michal Labedzki
svn path=/trunk/; revision=53051
Diffstat (limited to 'epan/dissectors/packet-btatt.c')
| -rw-r--r-- | epan/dissectors/packet-btatt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 4adfb52875..c12cd88c47 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -265,6 +265,12 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U proto_tree *st, *ltree; guint8 opcode; + if (tvb_length_remaining(tvb, 0) < 1) + return 0; + + ti = proto_tree_add_item(tree, proto_btatt, tvb, 0, -1, ENC_NA); + st = proto_item_add_subtree(ti, ett_btatt); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATT"); switch (pinfo->p2p_dir) { @@ -280,12 +286,6 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U break; } - if (tvb_length_remaining(tvb, 0) < 1) - return FALSE; - - ti = proto_tree_add_item(tree, proto_btatt, tvb, 0, -1, ENC_NA); - st = proto_item_add_subtree(ti, ett_btatt); - item = proto_tree_add_item(st, hf_btatt_opcode, tvb, 0, 1, ENC_LITTLE_ENDIAN); opcode = tvb_get_guint8(tvb, 0); offset++; |