diff options
| author | dsrsupport <eugene.exarevsky@dsr-company.com> | 2015-12-25 12:06:27 +0300 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-25 14:35:17 +0000 |
| commit | 7c05f6a9e9081a36f16201969f6322225704688c (patch) | |
| tree | 9e7b329199854ee13a1e13a9d329cb35156773ac /epan/dissectors/packet-zbee-nwk.c | |
| parent | ec6fa1a8a0d1fa536f2f39e472a67fcae23b93a4 (diff) | |
ZigBee NWK: fix Fix placement of NWK FC
NWK Frame Control tree bitmask was placed into the main tree.
As a result, it was displayed at the same level as NWK packet.
Fixed by changing tree to nwk_tree moving NWK FC into NWK packet.
Bug: 11926
Change-Id: Iae8ce89098d81a5ab7fb3bd57660853c2f20957d
Reviewed-on: https://code.wireshark.org/review/12858
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-zbee-nwk.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index ff17551997..08e187c66d 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -415,9 +415,9 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void /* Display the FCF. */ if (packet.version >= ZBEE_VERSION_2007) { - ti = proto_tree_add_bitmask(tree, tvb, offset, hf_zbee_nwk_fcf, ett_zbee_nwk_fcf, fcf_flags_2007, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_bitmask(nwk_tree, tvb, offset, hf_zbee_nwk_fcf, ett_zbee_nwk_fcf, fcf_flags_2007, ENC_LITTLE_ENDIAN); } else { - ti = proto_tree_add_bitmask(tree, tvb, offset, hf_zbee_nwk_fcf, ett_zbee_nwk_fcf, fcf_flags, ENC_LITTLE_ENDIAN); + ti = proto_tree_add_bitmask(nwk_tree, tvb, offset, hf_zbee_nwk_fcf, ett_zbee_nwk_fcf, fcf_flags, ENC_LITTLE_ENDIAN); } proto_item_append_text(ti, " %s", val_to_str_const(packet.type, zbee_nwk_frame_types, "Unknown")); offset += 2; |