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>

1 files changed, 12 insertions, 18 deletions

diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index a3454f7fba..464f1cc7d3 100644
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -704,11 +704,19 @@ do_hello_msg(
     guint msg)
 {
     guint   my_offset = offset;
-    guint8  iinfo, priority;
+    guint8  priority;
     guint16 version, eco_nr, user_eco;
     proto_item *ti;
-    proto_tree *iinfo_tree;
     char *addr;
+    static const int * info_flags[] = {
+        &hf_dec_rt_iinfo_node_type,
+        &hf_dec_rt_iinfo_vrf,
+        &hf_dec_rt_iinfo_rej,
+        &hf_dec_rt_iinfo_verf,
+        &hf_dec_rt_iinfo_mta,
+        &hf_dec_rt_iinfo_blkreq,
+        NULL
+    };
 
     version = tvb_get_guint8(tvb, my_offset);
     eco_nr = tvb_get_guint8(tvb, my_offset + 1);
@@ -724,23 +732,9 @@ do_hello_msg(
         proto_item_append_text(ti, " (%s)", addr);
     }
     my_offset += 6;
-    iinfo = tvb_get_guint8(tvb, my_offset);
-    ti = proto_tree_add_uint(
-        tree, hf_dec_rt_iinfo, tvb, my_offset, 1, iinfo);
-    iinfo_tree = proto_item_add_subtree(ti, ett_dec_rt_info_flags);
-    proto_tree_add_uint(
-        iinfo_tree, hf_dec_rt_iinfo_node_type, tvb, my_offset, 1, iinfo);
-    proto_tree_add_boolean(iinfo_tree, hf_dec_rt_iinfo_vrf,
-        tvb, my_offset, 1, iinfo);
-    proto_tree_add_boolean(iinfo_tree, hf_dec_rt_iinfo_rej,
-        tvb, my_offset, 1, iinfo);
-    proto_tree_add_boolean(iinfo_tree, hf_dec_rt_iinfo_verf,
-        tvb, my_offset, 1, iinfo);
-    proto_tree_add_boolean(iinfo_tree, hf_dec_rt_iinfo_mta,
-        tvb, my_offset, 1, iinfo);
-    proto_tree_add_boolean(iinfo_tree, hf_dec_rt_iinfo_blkreq,
-        tvb, my_offset, 1, iinfo);
+    proto_tree_add_bitmask(tree, tvb, my_offset, hf_dec_rt_iinfo, ett_dec_rt_info_flags, info_flags, ENC_NA);
     my_offset++;
+
     proto_tree_add_item(tree, hf_dec_rt_blk_size, tvb,
         my_offset, 2, ENC_LITTLE_ENDIAN);
     my_offset += 2;