diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-30 12:51:30 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-12-01 08:52:03 +0000 |
| commit | 4f9af8608cc4279b3f559db3d2f3bc6224ad58a5 (patch) | |
| tree | dc87094a132b0fe6284bedb7573714038d017627 /epan/dissectors/packet-dtn.c | |
| parent | 86c659c2721a659641aded94ec59d1a863cc86db (diff) | |
Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.
Part 2 of many
Change-Id: I50815e7738b011382392f3078a7107d3d9eec4ec
Reviewed-on: https://code.wireshark.org/review/5542
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dtn.c')
| -rw-r--r-- | epan/dissectors/packet-dtn.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index 1b14ad69bf..a35c184573 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -1587,9 +1587,13 @@ display_metadata_block(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int } case BUNDLE_BLOCK_TYPE_EXTENDED_COS: { - proto_item *ecos_flag_item; - proto_tree *ecos_flag_tree; int flags, flow_label; + static const int * ecos_flags_fields[] = { + &hf_ecos_flags_critical, + &hf_ecos_flags_streaming, + &hf_ecos_flags_ordinal, + NULL + }; /* check requirements for Block Processing Control Flags */ if ((control_flags & BLOCK_CONTROL_REPLICATE) == 0) { @@ -1601,11 +1605,7 @@ display_metadata_block(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int /* flags byte */ flags = (int)tvb_get_guint8(tvb, offset); - ecos_flag_item = proto_tree_add_item(block_tree, hf_ecos_flags, tvb, offset, 1, ENC_BIG_ENDIAN); - ecos_flag_tree = proto_item_add_subtree(ecos_flag_item, ett_block_flags); - proto_tree_add_boolean(ecos_flag_tree, hf_ecos_flags_critical, tvb, offset, 1, flags); - proto_tree_add_boolean(ecos_flag_tree, hf_ecos_flags_streaming, tvb, offset, 1, flags); - proto_tree_add_boolean(ecos_flag_tree, hf_ecos_flags_ordinal, tvb, offset, 1, flags); + proto_tree_add_bitmask(block_tree, tvb, offset, hf_ecos_flags, ett_block_flags, ecos_flags_fields, ENC_BIG_ENDIAN); offset += 1; /* ordinal byte */ |