ICMPv6: resolve type errors on proto_tree_add_bitmask()

Bug: 13066
Change-Id: Ia00441a6eea49c56f75f1757041bc7732ff32d00
Reviewed-on: https://code.wireshark.org/review/18555
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 7d62eaf5ac..2f9b358eee 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -5206,7 +5206,7 @@ proto_register_icmpv6(void)
           { "Home Agent Address", "icmpv6.mip6.home_agent_address", FT_IPv6, BASE_NONE, NULL, 0x0,
             "A list of addresses of home agents on the home link for the mobile node", HFILL }},
         { &hf_icmpv6_mip6_flag,
-          { "Flags", "icmpv6.mip6.flag", FT_NONE, BASE_NONE, NULL, 0x0,
+          { "Flags", "icmpv6.mip6.flag", FT_UINT16, BASE_HEX, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_mip6_flag_m,
           { "Managed address configuration", "icmpv6.mip6.flag.m", FT_BOOLEAN, 16, TFS(&tfs_set_notset), FLAGS_EO_M,
@@ -5527,7 +5527,7 @@ proto_register_icmpv6(void)
           { "Metric Length", "icmpv6.rpl.opt.metric.length", FT_UINT8, BASE_DEC, NULL, 0x0,
             "The length of the object body, expressed in bytes.", HFILL }},
         { &hf_icmpv6_rpl_opt_metric_nsa_object,
-          { "Node Sate and Attribute Object","icmpv6.rpl.opt.metric.nsa.object", FT_NONE, BASE_NONE, NULL, 0x0,
+          { "Node Sate and Attribute Object","icmpv6.rpl.opt.metric.nsa.object", FT_UINT16, BASE_HEX, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_rpl_opt_metric_nsa_object_reserved,
           { "Reserved field","icmpv6.rpl.opt.metric.nsa.object.reserved", FT_UINT16, BASE_HEX, NULL, RPL_METRIC_NSA_OBJECT_RESERVED,
@@ -5542,7 +5542,7 @@ proto_register_icmpv6(void)
           { "Flag O", "icmpv6.rpl.opt.metric.nsa.object.flag.o", FT_BOOLEAN, 16, TFS(&tfs_set_notset), RPL_METRIC_NSA_OBJECT_FLAG_O,
             "When set, this indicates that the node is overloaded and may not be able to process traffic.", HFILL }},
         { &hf_icmpv6_rpl_opt_metric_ne_object,
-          { "Node Energy Object","icmpv6.rpl.opt.metric.ne.object", FT_NONE, BASE_NONE, NULL, 0x0,
+          { "Node Energy Object","icmpv6.rpl.opt.metric.ne.object", FT_UINT16, BASE_HEX, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_rpl_opt_metric_ne_object_flags,
           { "Flags field","icmpv6.rpl.opt.metric.ne.object.flags", FT_UINT16, BASE_HEX, NULL, RPL_METRIC_NE_OBJECT_FLAGS,
@@ -5560,7 +5560,7 @@ proto_register_icmpv6(void)
           { "Energy", "icmpv6.rpl.opt.metric.ne.object.energy", FT_UINT16, BASE_HEX, NULL, RPL_METRIC_NE_OBJECT_ENERGY,
             "8-bit unsigned integer field indicating an estimated percentage of remaining energy. The Energy field is only relevant when the 'E' flag is set, and it MUST be set to 0 when the 'E' flag is cleared.", HFILL }},
         { &hf_icmpv6_rpl_opt_metric_hp_object,
-          { "Hop Count Object","icmpv6.rpl.opt.metric.hp.object", FT_NONE, BASE_NONE, NULL, 0x0,
+          { "Hop Count Object","icmpv6.rpl.opt.metric.hp.object", FT_UINT16, BASE_HEX, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_rpl_opt_metric_hp_object_reserved,
           { "Reserved field","icmpv6.rpl.opt.metric.hp.object.reserved", FT_UINT16, BASE_HEX, NULL, RPL_METRIC_HP_OBJECT_RESERVED,
@@ -5572,19 +5572,19 @@ proto_register_icmpv6(void)
           { "Hop Count", "icmpv6.rpl.opt.metric.hp.object.hp", FT_UINT16, BASE_DEC, NULL, RPL_METRIC_HP_OBJECT_HP,
             "When used as a constraint, the DAG root indicates the maximum number of hops that a path may traverse. When used as a metric, each visited node simply increments the Hop Count field.", HFILL }},
         { &hf_icmpv6_rpl_opt_metric_lt_object,
-          { "Link Throughput Object", "icmpv6.rpl.opt.metric.lt.object", FT_NONE, BASE_NONE, NULL, 0x0,
+          { "Link Throughput Object", "icmpv6.rpl.opt.metric.lt.object", FT_UINT32, BASE_HEX, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_rpl_opt_metric_lt_object_lt,
           { "Link Throughput", "icmpv6.rpl.opt.metric.lt", FT_UINT32, BASE_HEX, NULL, 0x0,
             "The Throughput metric is the effective bit rate of a link.", HFILL }},
         { &hf_icmpv6_rpl_opt_metric_ll_object,
-          { "Link Latency Object", "icmpv6.rpl.opt.metric.ll.object", FT_NONE, BASE_NONE, NULL, 0x0,
+          { "Link Latency Object", "icmpv6.rpl.opt.metric.ll.object", FT_UINT32, BASE_HEX, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_rpl_opt_metric_ll_object_ll,
           { "Link Latency", "icmpv6.rpl.opt.metric.ll", FT_UINT32, BASE_HEX, NULL, 0x0,
             "The Latency is encoded in 32 bits in unsigned integer format, expressed in microseconds.", HFILL }},
         { &hf_icmpv6_rpl_opt_metric_lql_object,
-          { "Link Quality Level Object","icmpv6.rpl.opt.metric.lql.object", FT_NONE, BASE_NONE, NULL, 0x0,
+          { "Link Quality Level Object","icmpv6.rpl.opt.metric.lql.object", FT_UINT8, BASE_HEX, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_rpl_opt_metric_lql_object_res,
           { "Reserved field","icmpv6.rpl.opt.metric.lql.object.res", FT_UINT8, BASE_HEX, NULL, RPL_METRIC_LQL_OBJECT_RES,
@@ -5596,7 +5596,7 @@ proto_register_icmpv6(void)
           { "Counter", "icmpv6.rpl.opt.metric.lql.object.counter", FT_UINT8, BASE_DEC, NULL, RPL_METRIC_LQL_OBJECT_COUNTER,
             "The Counter represents the number of links with that value.", HFILL }},
         { &hf_icmpv6_rpl_opt_metric_etx_object,
-          { "ETX Object", "icmpv6.rpl.opt.metric.etx.object", FT_NONE, BASE_NONE, NULL, 0x0,
+          { "ETX Object", "icmpv6.rpl.opt.metric.etx.object", FT_UINT16, BASE_HEX, NULL, 0x0,
             NULL, HFILL }},
         { &hf_icmpv6_rpl_opt_metric_etx_object_etx,
           { "ETX", "icmpv6.rpl.opt.metric.etx", FT_UINT16, BASE_HEX, NULL, 0x0,
@@ -5623,7 +5623,7 @@ proto_register_icmpv6(void)
            { "Prefix Length", "icmpv6.rpl.opt.route.prefix_length", FT_UINT8, BASE_DEC, NULL, 0x0,
              "The number of leading bits in the Prefix that are valid", HFILL }},
         { &hf_icmpv6_rpl_opt_route_flag,
-           { "Flag","icmpv6.rpl.opt.route.flag", FT_NONE, BASE_NONE, NULL, 0x0,
+           { "Flag","icmpv6.rpl.opt.route.flag", FT_UINT8, BASE_HEX, NULL, 0x0,
              NULL, HFILL }},
         { &hf_icmpv6_rpl_opt_route_pref,
            { "Preference","icmpv6.rpl.opt.route.pref", FT_UINT8, BASE_DEC, VALS(nd_flag_router_pref), RPL_OPT_ROUTE_PREFERENCE,
@@ -5638,7 +5638,7 @@ proto_register_icmpv6(void)
            { "Prefix", "icmpv6.rpl.opt.route.prefix", FT_IPv6, BASE_NONE, NULL, 0x0,
              "Variable-length field containing an IP address or a prefix of an IPv6 address", HFILL }},
         { &hf_icmpv6_rpl_opt_config_flag,
-           { "Flag","icmpv6.rpl.opt.config.flag", FT_NONE, BASE_NONE, NULL, 0x0,
+           { "Flag","icmpv6.rpl.opt.config.flag", FT_UINT8, BASE_HEX, NULL, 0x0,
              NULL, HFILL }},
         { &hf_icmpv6_rpl_opt_config_reserved,
            { "Reserved","icmpv6.rpl.opt.config.reserved", FT_UINT8, BASE_DEC, NULL, RPL_OPT_CONFIG_FLAG_RESERVED,
@@ -5802,7 +5802,7 @@ proto_register_icmpv6(void)
            { "Version", "icmpv6.rpl.p2p.dro.version", FT_UINT8, BASE_DEC, NULL, 0x0,
              "Set by the DODAG root to the DODAGVersionNumber", HFILL }},
         { &hf_icmpv6_rpl_p2p_dro_flag,
-           { "Flags", "icmpv6.rpl.p2p.dro.flag", FT_NONE, BASE_NONE, NULL, 0x0,
+           { "Flags", "icmpv6.rpl.p2p.dro.flag", FT_UINT16, BASE_HEX, NULL, 0x0,
              "NULL", HFILL }},
         { &hf_icmpv6_rpl_p2p_dro_flag_stop,
            { "Stop", "icmpv6.rpl.p2p.dro.flag.stop", FT_BOOLEAN, 16, TFS(&tfs_yes_no), RPL_P2P_DRO_FLAG_S,
@@ -5820,7 +5820,7 @@ proto_register_icmpv6(void)
            { "DODAGID", "icmpv6.rpl.p2p.dro.dagid", FT_IPv6, BASE_NONE, NULL, 0x0,
              "IPv6 address set by a DODAG root which uniquely identifies a DODAG", HFILL }},
         { &hf_icmpv6_rpl_p2p_droack_flag,
-           { "Flags", "icmpv6.rpl.p2p.droack.flag", FT_NONE, BASE_NONE, NULL, 0x0,
+           { "Flags", "icmpv6.rpl.p2p.droack.flag", FT_UINT16, BASE_HEX, NULL, 0x0,
              "NULL", HFILL }},
         { &hf_icmpv6_rpl_p2p_droack_flag_seq,
            { "Seq", "icmpv6.rpl.p2p.droack.flag.seq", FT_UINT16, BASE_DEC, NULL, RPL_P2P_DROACK_FLAG_SEQ,