diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-07-10 14:26:10 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-07-12 06:30:31 +0000 |
commit | 8c2fc911dfe6b3296bbd2d7e404b15fd55a3b3a4 (patch) | |
tree | 9293dd830a28f080d82603ad472e80a73ce03669 /epan/dissectors/packet-vxlan.c | |
parent | be7d295fbf06788c7fec948cf8755c218ad7c32d (diff) |
VXLAN: Remove a (flag) subtree level
Change-Id: Ic7cdb78d6a162351900e9e1ea8f4ad74ded167d3
Reviewed-on: https://code.wireshark.org/review/9587
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-vxlan.c')
-rw-r--r-- | epan/dissectors/packet-vxlan.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-vxlan.c b/epan/dissectors/packet-vxlan.c index ddadf99a58..38e89dd84d 100644 --- a/epan/dissectors/packet-vxlan.c +++ b/epan/dissectors/packet-vxlan.c @@ -65,8 +65,8 @@ static dissector_handle_t eth_handle; static void dissect_vxlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_tree *vxlan_tree, *flg_tree; - proto_item *ti, *flg_item; + proto_tree *vxlan_tree; + proto_item *ti; tvbuff_t *next_tvb; int offset = 0; @@ -92,10 +92,7 @@ dissect_vxlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * VXLAN Network ID (VNI). The remaining 12 bits (designated "R") are * reserved fields and MUST be set to zero. */ - flg_item = proto_tree_add_item(vxlan_tree, hf_vxlan_flags, tvb, offset, 2, ENC_BIG_ENDIAN); - flg_tree = proto_item_add_subtree(flg_item, ett_vxlan_flgs); - - proto_tree_add_bitmask(flg_tree, tvb, offset, hf_vxlan_flags, + proto_tree_add_bitmask(vxlan_tree, tvb, offset, hf_vxlan_flags, ett_vxlan_flgs, flags_fields, ENC_BIG_ENDIAN); offset+=2; |