diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index d06408b51a..86df491593 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -16593,7 +16593,7 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_nominal_pwr, { "Nominal Power", "ansi_map.cdmachanneldata.nominal_pwr", - FT_UINT8, BASE_DEC, NULL, 0x71, + FT_UINT8, BASE_DEC, NULL, 0x78, NULL, HFILL }}, {&hf_ansi_map_cdmachanneldata_nr_preamble, { "Number Preamble", "ansi_map.cdmachanneldata.nr_preamble", diff --git a/epan/dissectors/packet-brcm-tag.c b/epan/dissectors/packet-brcm-tag.c index db0468a8a5..d1c61e0a8d 100644 --- a/epan/dissectors/packet-brcm-tag.c +++ b/epan/dissectors/packet-brcm-tag.c @@ -137,7 +137,7 @@ proto_register_brcm_tag(void) }, { &hf_brcm_tag_frame_octet_cnt, { "Frame octet count", "brcm_tag.frame_octet_cnt", - FT_UINT16, BASE_DEC, NULL, 0xFFF, NULL, HFILL } + FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL } }, { &hf_brcm_tag_dest_dev_id, { "Destination device ID", "brcm_tag.dest_dev_id", diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index 7a8ca0277b..258796bc7b 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -339,7 +339,7 @@ proto_register_brdwlk(void) {"Packet Dropped", "brdwlk.drop", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}}, { &hf_brdwlk_vsan, - {"VSAN", "brdwlk.vsan", FT_UINT16, BASE_DEC, NULL, 0xFFF, NULL, + {"VSAN", "brdwlk.vsan", FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL}}, { &hf_brdwlk_plen, {"Original Packet Length", "brdwlk.plen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c index f19acf6362..bc37402d67 100644 --- a/epan/dissectors/packet-btmesh.c +++ b/epan/dissectors/packet-btmesh.c @@ -8841,7 +8841,7 @@ proto_register_btmesh(void) }, { &hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_net, { "NetKeyIndex", "btmesh.model.config_appkey_add.netkeyindexandappkeyindex.net", - FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0xFFF, + FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0x000FFF, NULL, HFILL } }, { &hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_app, @@ -8861,7 +8861,7 @@ proto_register_btmesh(void) }, { &hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_net, { "NetKeyIndex", "btmesh.model.config_appkey_update.netkeyindexandappkeyindex.net", - FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0xFFF, + FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0x000FFF, NULL, HFILL } }, { &hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_app, @@ -9136,7 +9136,7 @@ proto_register_btmesh(void) }, { &hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_net, { "NetKeyIndex", "btmesh.model.config_appkey_delete.netkeyindexandappkeyindex.net", - FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0xFFF, + FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0x000FFF, NULL, HFILL } }, { &hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_app, @@ -9201,7 +9201,7 @@ proto_register_btmesh(void) }, { &hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_net, { "NetKeyIndex", "btmesh.model.config_appkey_status.netkeyindexandappkeyindex.net", - FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0xFFF, + FT_UINT24, BASE_CUSTOM, CF_FUNC(format_key_index), 0x000FFF, NULL, HFILL } }, { &hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_app, diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c index c832ae1bc9..4a489738f2 100644 --- a/epan/dissectors/packet-canopen.c +++ b/epan/dissectors/packet-canopen.c @@ -1426,7 +1426,7 @@ proto_register_canopen(void) }, { &hf_canopen_function_code, { "Function code", "canopen.function_code", - FT_UINT32, BASE_HEX, NULL, 0x780, + FT_UINT32, BASE_HEX, NULL, 0x00000780, NULL, HFILL } }, { &hf_canopen_node_id, diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 962eee4fe9..206557921c 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -434,11 +434,11 @@ proto_register_dsi(void) "Attention flag, don't reconnect bit", HFILL }}, { &hf_dsi_attn_flag_time, { "Minutes", "dsi.attn_flag.time", - FT_UINT16, BASE_DEC, NULL, 0xfff, + FT_UINT16, BASE_DEC, NULL, 0x0fff, "Number of minutes", HFILL }}, { &hf_dsi_attn_flag_bitmap, { "Bitmap", "dsi.attn_flag.bitmap", - FT_UINT16, BASE_HEX, NULL, 0xfff, + FT_UINT16, BASE_HEX, NULL, 0x0fff, "Attention extended bitmap", HFILL }}, }; diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 98b10c792a..88748efc62 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -6150,15 +6150,15 @@ proto_register_dvbci(void) }, { &hf_dvbci_dlv_sys_hint_t, { "terrestrial network (DVB-T/T2)", "dvb-ci.opp.dlv_sys_hint.t", - FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x04, NULL, HFILL } + FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x4, NULL, HFILL } }, { &hf_dvbci_dlv_sys_hint_s, { "satellite network (DVB-S/S2)", "dvb-ci.opp.dlv_sys_hint.s", - FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x02, NULL, HFILL } + FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x2, NULL, HFILL } }, { &hf_dvbci_dlv_sys_hint_c, { "cable network (DVB-C/C2)", "dvb-ci.opp.dlv_sys_hint.c", - FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x01, NULL, HFILL } + FT_BOOLEAN, 4, TFS(&tfs_set_notset), 0x1, NULL, HFILL } }, { &hf_dvbci_refr_req_date, { "Refresh request date", "dvb-ci.opp.refresh_req_date", diff --git a/epan/dissectors/packet-ecp.c b/epan/dissectors/packet-ecp.c index e621bbe297..eaf22dd5dc 100644 --- a/epan/dissectors/packet-ecp.c +++ b/epan/dissectors/packet-ecp.c @@ -497,10 +497,10 @@ proto_register_vdp(void) NULL, 0x0, NULL, HFILL }}, { &hf_vdp_vidstr_ps, { "VIDSTR PS", "vdp21.vidstr.ps", FT_UINT16, BASE_HEX, - NULL, 0x800, NULL, HFILL }}, + NULL, 0x0800, NULL, HFILL }}, { &hf_vdp_vidstr_pcp, { "VIDSTR PCP", "vdp21.vidstr.pcp", FT_UINT16, BASE_HEX, - NULL, 0x700, NULL, HFILL }}, + NULL, 0x0700, NULL, HFILL }}, { &hf_vdp_vidstr_vid, { "VIDSTR VID", "vdp21.vidstr.vid", FT_UINT16, BASE_HEX, NULL, 0x0FFF, NULL, HFILL }}, diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index ac95ff1b57..cbe87d4a9c 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -4214,22 +4214,22 @@ proto_register_enip(void) { &hf_elink_icapability_capability_bits_manual, { "Manual Setting Requires Reset", "cip.elink.icapability.capability_bits.manual", - FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0001, + FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x00000001, NULL, HFILL }}, { &hf_elink_icapability_capability_bits_auto_neg, { "Auto-negotiate", "cip.elink.icapability.capability_bits.auto_neg", - FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0002, + FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x00000002, NULL, HFILL }}, { &hf_elink_icapability_capability_bits_auto_mdix, { "Auto-MDIX", "cip.elink.icapability.capability_bits.auto_mdix", - FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0004, + FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x00000004, NULL, HFILL } }, { &hf_elink_icapability_capability_bits_manual_speed, { "Manual Speed/Duplex", "cip.elink.icapability.capability_bits.manual_speed", - FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x0008, + FT_BOOLEAN, 32, TFS(&tfs_enabled_disabled), 0x00000008, NULL, HFILL } }, { &hf_elink_icapability_capability_speed_duplex_array_count, diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 908e35dc5d..3f8e14e1f9 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -5611,87 +5611,87 @@ proto_register_epl(void) }, { &hf_epl_asnd_identresponse_feat_bit0, { "Isochronous", "epl.asnd.ires.features.bit0", - FT_BOOLEAN, 32, NULL, 0x0001, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit1, { "SDO by UDP/IP", "epl.asnd.ires.features.bit1", - FT_BOOLEAN, 32, NULL, 0x0002, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit2, { "SDO by ASnd", "epl.asnd.ires.features.bit2", - FT_BOOLEAN, 32, NULL, 0x0004, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit3, { "SDO by PDO", "epl.asnd.ires.features.bit3", - FT_BOOLEAN, 32, NULL, 0x0008, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000008, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit4, { "NMT Info Services", "epl.asnd.ires.features.bit4", - FT_BOOLEAN, 32, NULL, 0x0010, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000010, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit5, { "Ext. NMT State Commands", "epl.asnd.ires.features.bit5", - FT_BOOLEAN, 32, NULL, 0x0020, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000020, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit6, { "Dynamic PDO Mapping", "epl.asnd.ires.features.bit6", - FT_BOOLEAN, 32, NULL, 0x0040, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000040, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit7, { "NMT Service by UDP/IP", "epl.asnd.ires.features.bit7", - FT_BOOLEAN, 32, NULL, 0x0080, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit8, { "Configuration Manager", "epl.asnd.ires.features.bit8", - FT_BOOLEAN, 32, NULL, 0x0100, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000100, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit9, { "Multiplexed Access", "epl.asnd.ires.features.bit9", - FT_BOOLEAN, 32, NULL, 0x0200, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000200, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bitA, { "NodeID setup by SW", "epl.asnd.ires.features.bitA", - FT_BOOLEAN, 32, NULL, 0x0400, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000400, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bitB, { "MN Basic Ethernet Mode", "epl.asnd.ires.features.bitB", - FT_BOOLEAN, 32, NULL, 0x0800, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00000800, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bitC, { "Routing Type 1 Support", "epl.asnd.ires.features.bitC", - FT_BOOLEAN, 32, NULL, 0x1000, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00001000, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bitD, { "Routing Type 2 Support", "epl.asnd.ires.features.bitD", - FT_BOOLEAN, 32, NULL, 0x2000, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00002000, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bitE, { "SDO Read/Write All", "epl.asnd.ires.features.bitE", - FT_BOOLEAN, 32, NULL, 0x4000, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00004000, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bitF, { "SDO Read/Write Multiple", "epl.asnd.ires.features.bitF", - FT_BOOLEAN, 32, NULL, 0x8000, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00008000, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit10, { "Multiple-ASend Support", "epl.asnd.ires.features.bit10", - FT_BOOLEAN, 32, NULL, 0x010000, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00010000, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit11, { "Ring Redundancy", "epl.asnd.ires.features.bit11", - FT_BOOLEAN, 32, NULL, 0x020000, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00020000, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit12, { "PResChaining", "epl.asnd.ires.features.bit12", - FT_BOOLEAN, 32, NULL, 0x040000, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00040000, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit13, { "Multiple PReq/PRes", "epl.asnd.ires.features.bit13", - FT_BOOLEAN, 32, NULL, 0x080000, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00080000, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit14, { "Dynamic Node Allocation", "epl.asnd.ires.features.bit14", - FT_BOOLEAN, 32, NULL, 0x100000, NULL, HFILL } + FT_BOOLEAN, 32, NULL, 0x00100000, NULL, HFILL } }, { &hf_epl_asnd_identresponse_feat_bit21, { "Modular Device", "epl.asnd.ires.features.bit21", diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index e92b99a08a..6a3b9cfb4b 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -2096,7 +2096,7 @@ void proto_register_icmp(void) NULL, HFILL}}, {&hf_icmp_mpls_s, - {"Stack bit", "icmp.mpls.s", FT_BOOLEAN, 24, + {"Stack bit", "icmp.mpls.s", FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x01, NULL, HFILL}}, diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index f164a6c11f..b1390cf48c 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -37182,7 +37182,7 @@ proto_register_ieee80211(void) {&hf_ieee80211_block_ack_control_ack_policy, {"BA Ack Policy", "wlan.ba.control.ackpolicy", - FT_BOOLEAN, 16, TFS(&ieee80211_block_ack_control_ack_policy_flag), 0x01, + FT_BOOLEAN, 16, TFS(&ieee80211_block_ack_control_ack_policy_flag), 0x0001, "Block Ack Request (BAR) Ack Policy", HFILL }}, {&hf_ieee80211_block_ack_control_type, @@ -40142,7 +40142,7 @@ proto_register_ieee80211(void) {&hf_ieee80211_ftm_rsta_partial_tsf_timer1, {"Partial TSF Timer", "wlan.ranging.rsta.partial_tsf_timer", - FT_UINT32, BASE_CUSTOM, CF_FUNC(partial_tsf_custom), 0xffff, NULL, HFILL }}, + FT_UINT32, BASE_CUSTOM, CF_FUNC(partial_tsf_custom), 0x0000ffff, NULL, HFILL }}, {&hf_ieee80211_ftm_rsta_duration1, {"Duration", "wlan.ranging.rsta.duration", @@ -40150,7 +40150,7 @@ proto_register_ieee80211(void) {&hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved1, {"Reserved", "wlan.ranging.rsta.reserved1", - FT_BOOLEAN, 32, NULL, 0x800000, NULL, HFILL }}, + FT_BOOLEAN, 32, NULL, 0x00800000, NULL, HFILL }}, {&hf_ieee80211_ftm_rsta_periodicity1, {"Periodicity", "wlan.ranging.rsta.periodicity1", @@ -40166,11 +40166,11 @@ proto_register_ieee80211(void) {&hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved, {"Reserved", "wlan.ranging.rsta.reserved", - FT_BOOLEAN, 40, NULL, 0x800000, NULL, HFILL }}, + FT_BOOLEAN, 40, NULL, 0x0000800000, NULL, HFILL }}, {&hf_ieee80211_ftm_rsta_periodicity, {"Periodicity", "wlan.ranging.rsta.periodicity", - FT_UINT40, BASE_DEC, NULL, 0xff000000, NULL, HFILL }}, + FT_UINT40, BASE_DEC, NULL, 0x00ff000000, NULL, HFILL }}, {&hf_ieee80211_ftm_rsta_format_and_bandwidth, {"Format and Bandwidth", "wlan.ftm.rsta.format_and_bandwidth", @@ -46685,37 +46685,37 @@ proto_register_ieee80211(void) {&hf_ieee80211_tag_extended_capabilities_b56_2, {"Alternate EDCA", "wlan.extcap.b56", - FT_BOOLEAN, 16, NULL, 0x01, + FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL }}, {&hf_ieee80211_tag_extended_capabilities_b57_2, {"Unprotected TXOP Negotiation", "wlan.extcap.b57", - FT_BOOLEAN, 16, NULL, 0x02, + FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL }}, {&hf_ieee80211_tag_extended_capabilities_b58_2, {"Protected TXOP Negotiation", "wlan.extcap.b58", - FT_BOOLEAN, 16, NULL, 0x04, + FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL }}, {&hf_ieee80211_tag_extended_capabilities_b59_2, {"Reserved", "wlan.extcap.b59", - FT_UINT16, BASE_HEX, NULL, 0x08, + FT_UINT16, BASE_HEX, NULL, 0x0008, NULL, HFILL }}, {&hf_ieee80211_tag_extended_capabilities_b60_2, {"Protected QLoad Report", "wlan.extcap.b60", - FT_BOOLEAN, 16, NULL, 0x10, + FT_BOOLEAN, 16, NULL, 0x0010, NULL, HFILL }}, {&hf_ieee80211_tag_extended_capabilities_b61_2, {"TDLS Wider Bandwidth", "wlan.extcap.b61", - FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x20, + FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0020, NULL, HFILL }}, {&hf_ieee80211_tag_extended_capabilities_b62_2, {"Operating Mode Notification", "wlan.extcap.b62", - FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x40, + FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0040, NULL, HFILL }}, {&hf_ieee80211_tag_extended_capabilities_max_num_msdus, @@ -48674,35 +48674,35 @@ proto_register_ieee80211(void) {&hf_ieee80211_he_cci_ac_constraint, {"AC Constraint", "wlan.htc.he.a_control.cci.ac_constraint", - FT_BOOLEAN, 32, NULL, 0x01, NULL, HFILL }}, + FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, {&hf_ieee80211_he_cci_rdg_more_ppdu, {"RDG/More PPDU", "wlan.htc.he.a_control.cci.rdg_more_ppdu", - FT_BOOLEAN, 32, NULL, 0x02, NULL, HFILL }}, + FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }}, {&hf_ieee80211_he_cci_sr_ppdu_indic, {"PSRT PPDU", "wlan.htc.he.a_control.cci.sr_ppdu_indic", - FT_BOOLEAN, 32, NULL, 0x04, NULL, HFILL }}, + FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL }}, {&hf_ieee80211_he_cci_reserved, {"Reserved", "wlan.htc.he.a_control.cci.reserved", - FT_UINT32, BASE_HEX, NULL, 0xF8, NULL, HFILL }}, + FT_UINT32, BASE_HEX, NULL, 0x000000F8, NULL, HFILL }}, {&hf_ieee80211_he_eht_om_rx_nss_ext, {"Rx NSS Extension", "wlan.htc.he.a_control.eht_om.rx_nss_ext", - FT_BOOLEAN, 32, NULL, 0x01, NULL, HFILL }}, + FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }}, {&hf_ieee80211_he_eht_om_chan_w_ext, {"Channel Width Extension", "wlan.htc.he.a_control.eht_om.chan_w_ext", - FT_BOOLEAN, 32, NULL, 0x02, NULL, HFILL }}, + FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }}, {&hf_ieee80211_he_eht_om_tx_nsts_ext, {"Tx NSTS Extension", "wlan.htc.he.a_control.eht_om.tx_nsts_ext", - FT_BOOLEAN, 32, NULL, 0x04, NULL, HFILL }}, + FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL }}, {&hf_ieee80211_he_eht_om_reserved, {"Reserved", "wlan.htc.he.a_control.eht_om.reserved", - FT_UINT32, BASE_HEX, NULL, 0x38, NULL, HFILL }}, + FT_UINT32, BASE_HEX, NULL, 0x00000038, NULL, HFILL }}, {&hf_ieee80211_he_srs_ppdu_resp_dur, {"PPDU Response Duration", "wlan.htc.he.a_control.srs.ppdu_resp_dur", @@ -49670,7 +49670,7 @@ proto_register_ieee80211(void) {&hf_ieee80211_osen_rsn_cap_peerkey, {"PeerKey Enabled", "wlan.osen.rsn.capabilities.peerkey", - FT_BOOLEAN, 16, TFS(&tfs_enabled_disabled), 0x200, NULL, HFILL }}, + FT_BOOLEAN, 16, TFS(&tfs_enabled_disabled), 0x0200, NULL, HFILL }}, {&hf_ieee80211_osen_rsn_cap_flags, {"RSN Capability Flags", "wlan.osen.rsn.capabilities.flags", @@ -50595,7 +50595,7 @@ proto_register_ieee80211(void) {&hf_ieee80211_he_trs_support, {"TRS Support", "wlan.ext_tag.he_mac_cap.Trs_support", - FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), 0x0000040000, + FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), 0x000000040000, NULL, HFILL }}, {&hf_ieee80211_he_bsr_support, @@ -50675,7 +50675,7 @@ proto_register_ieee80211(void) {&hf_ieee80211_he_psr_responder, {"PSR Responder", "wlan.ext_tag.he_mac_cap.psr_responder", - FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), 0x0800000000, + FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), 0x000800000000, NULL, HFILL }}, {&hf_ieee80211_he_ndp_feedback_report_support, @@ -50705,7 +50705,7 @@ proto_register_ieee80211(void) {&hf_ieee80211_he_2_996_tone_ru_support, {"UL 2x996-tone RU Support", "wlan.ext_tag.he_mac_cap.ul_2_996_tone_ru_support", FT_BOOLEAN, 48, TFS(&tfs_supported_not_supported), - 0x80000000000, NULL, HFILL }}, + 0x080000000000, NULL, HFILL }}, {&hf_ieee80211_he_om_control_ul_mu_data_disable_rx_support, {"OM Control UL MU Data Disable RX Support", "wlan.ext_tag.he_mac_cap.om_cntl_ul_mu_data_disable_rx_support", diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index ca1b04db3d..4ec60e8803 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -7086,11 +7086,11 @@ void proto_register_ieee802154(void) "New Mode Modulation Scheme", HFILL }}, { &hf_ieee802154_tap_phr_fsk_ms_mode_mode, - { "Mode", "wpan-tap.phr.fsk_ms.page", FT_UINT16, BASE_HEX, VALS(ieee802154_phr_fsk_ms_mode), IEEE802154_TAP_PHR_FSK_MS_MODE_MODE, + { "Mode", "wpan-tap.phr.fsk_ms.mode", FT_UINT16, BASE_HEX, VALS(ieee802154_phr_fsk_ms_mode), IEEE802154_TAP_PHR_FSK_MS_MODE_MODE, "New Mode Mode", HFILL }}, { &hf_ieee802154_tap_phr_fsk_ms_mode_addl_mode, - { "Additional Mode", "wpan-tap.phr.fsk_ms.page", FT_UINT16, BASE_HEX, VALS(ieee802154_phr_fsk_ms_additional_modes), IEEE802154_TAP_PHR_FSK_MS_MODE_MODE, + { "Additional Mode", "wpan-tap.phr.fsk_ms.mode", FT_UINT16, BASE_HEX, VALS(ieee802154_phr_fsk_ms_additional_modes), IEEE802154_TAP_PHR_FSK_MS_MODE_MODE, "New Mode Additional Mode", HFILL }}, { &hf_ieee802154_tap_phr_wisun_fsk_ms_reserved, diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 66386bc5ab..734db24e1e 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -4527,57 +4527,57 @@ proto_register_ipv6(void) }, { &hf_ipv6_opt_ioam_trace_type_bit4, { "Transit delay", "ipv6.opt.ioam.trace.type.bit4", - FT_BOOLEAN, 24, NULL, 0x80000, + FT_BOOLEAN, 24, NULL, 0x080000, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_bit5, { "IOAM-Namespace specific data (short)", "ipv6.opt.ioam.trace.type.bit5", - FT_BOOLEAN, 24, NULL, 0x40000, + FT_BOOLEAN, 24, NULL, 0x040000, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_bit6, { "Queue depth", "ipv6.opt.ioam.trace.type.bit6", - FT_BOOLEAN, 24, NULL, 0x20000, + FT_BOOLEAN, 24, NULL, 0x020000, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_bit7, { "Checksum complement", "ipv6.opt.ioam.trace.type.bit7", - FT_BOOLEAN, 24, NULL, 0x10000, + FT_BOOLEAN, 24, NULL, 0x010000, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_bit8, { "Hop_Lim and Node ID (wide)", "ipv6.opt.ioam.trace.type.bit8", - FT_BOOLEAN, 24, NULL, 0x8000, + FT_BOOLEAN, 24, NULL, 0x008000, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_bit9, { "Ingress and Egress IDs (wide)", "ipv6.opt.ioam.trace.type.bit9", - FT_BOOLEAN, 24, NULL, 0x4000, + FT_BOOLEAN, 24, NULL, 0x004000, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_bit10, { "IOAM-Namespace specific data (wide)", "ipv6.opt.ioam.trace.type.bit10", - FT_BOOLEAN, 24, NULL, 0x2000, + FT_BOOLEAN, 24, NULL, 0x002000, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_bit11, { "Buffer occupancy", "ipv6.opt.ioam.trace.type.bit11", - FT_BOOLEAN, 24, NULL, 0x1000, + FT_BOOLEAN, 24, NULL, 0x001000, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_undef, { "Undefined", "ipv6.opt.ioam.trace.type.undef", - FT_BOOLEAN, 24, NULL, 0xffc, + FT_BOOLEAN, 24, NULL, 0x000ffc, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_bit22, { "Opaque State Snapshot", "ipv6.opt.ioam.trace.type.bit22", - FT_BOOLEAN, 24, NULL, 0x2, + FT_BOOLEAN, 24, NULL, 0x000002, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_type_rsv, { "Reserved", "ipv6.opt.ioam.trace.type.rsv", - FT_BOOLEAN, 24, NULL, 0x1, + FT_BOOLEAN, 24, NULL, 0x000001, NULL, HFILL } }, { &hf_ipv6_opt_ioam_trace_rsv, diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index fd2181d3cd..8b096e0285 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -3237,7 +3237,7 @@ proto_register_l2tp(void) NULL, HFILL }}, { &hf_l2tp_avp_vendor_id, - { "Vendor ID", "l2tp.avp.vendor_id", FT_UINT16, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0, + { "Vendor ID", "l2tp.avp.vendor_id", FT_UINT32, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0, "AVP Vendor ID", HFILL }}, { &hf_l2tp_avp_type, @@ -3616,10 +3616,10 @@ proto_register_l2tp(void) { &hf_l2tp_avp_error_message, { "Error Message", "l2tp.avp.error_message", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_protocol_version, { "Version", "l2tp.avp.protocol_version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_protocol_revision, { "Revision", "l2tp.avp.protocol_revision", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_l2tp_avp_async_framing_supported, { "Async Framing Supported", "l2tp.avp.async_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, - { &hf_l2tp_avp_sync_framing_supported, { "Sync Framing Supported", "l2tp.avp.sync_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, - { &hf_l2tp_avp_analog_access_supported, { "Analog Access Supported", "l2tp.avp.analog_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, - { &hf_l2tp_avp_digital_access_supported, { "Digital Access Supported", "l2tp.avp.digital_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, + { &hf_l2tp_avp_async_framing_supported, { "Async Framing Supported", "l2tp.avp.async_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }}, + { &hf_l2tp_avp_sync_framing_supported, { "Sync Framing Supported", "l2tp.avp.sync_framing_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }}, + { &hf_l2tp_avp_analog_access_supported, { "Analog Access Supported", "l2tp.avp.analog_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }}, + { &hf_l2tp_avp_digital_access_supported, { "Digital Access Supported", "l2tp.avp.digital_access_supported", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }}, { &hf_l2tp_avp_firmware_revision, { "Firmware Revision", "l2tp.avp.firmware_revision", FT_UINT16, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_host_name, { "Host Name", "l2tp.avp.host_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_vendor_name, { "Vendor Name", "l2tp.avp.vendor_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -3632,10 +3632,10 @@ proto_register_l2tp(void) { &hf_l2tp_avp_call_serial_number, { "Call Serial Number", "l2tp.avp.call_serial_number", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_minimum_bps, { "Minimum BPS", "l2tp.avp.minimum_bps", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_maximum_bps, { "Maximum BPS", "l2tp.avp.maximum_bps", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_l2tp_avp_analog_bearer_type, { "Analog Bearer Type", "l2tp.avp.analog_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, - { &hf_l2tp_avp_digital_bearer_type, { "Digital Bearer Type", "l2tp.avp.digital_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, - { &hf_l2tp_avp_async_framing_type, { "Async Framing Type", "l2tp.avp.async_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0002, NULL, HFILL }}, - { &hf_l2tp_avp_sync_framing_type, { "Sync Framing Type", "l2tp.avp.sync_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0001, NULL, HFILL }}, + { &hf_l2tp_avp_analog_bearer_type, { "Analog Bearer Type", "l2tp.avp.analog_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }}, + { &hf_l2tp_avp_digital_bearer_type, { "Digital Bearer Type", "l2tp.avp.digital_bearer_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }}, + { &hf_l2tp_avp_async_framing_type, { "Async Framing Type", "l2tp.avp.async_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002, NULL, HFILL }}, + { &hf_l2tp_avp_sync_framing_type, { "Sync Framing Type", "l2tp.avp.sync_framing_type", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001, NULL, HFILL }}, { &hf_l2tp_avp_sub_address, { "Sub-Address", "l2tp.avp.sub_address", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_connect_speed, { "Connect Speed", "l2tp.avp.connect_speed", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_l2tp_avp_physical_channel, { "Physical Channel", "l2tp.avp.physical_channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-link16.c b/epan/dissectors/packet-link16.c index 3807073e7d..3f63111a02 100644 --- a/epan/dissectors/packet-link16.c +++ b/epan/dissectors/packet-link16.c @@ -252,13 +252,13 @@ void proto_register_link16(void) { static hf_register_info hf[] = { { &hf_link16_wordformat, - { "Word Format", "link16.wordformat", FT_UINT16, BASE_DEC, VALS(WordFormat_Strings), 0x3, + { "Word Format", "link16.wordformat", FT_UINT16, BASE_DEC, VALS(WordFormat_Strings), 0x0003, NULL, HFILL }}, { &hf_link16_label, - { "Label", "link16.label", FT_UINT16, BASE_DEC, VALS(Link16_Label_Strings), 0x7C, + { "Label", "link16.label", FT_UINT16, BASE_DEC, VALS(Link16_Label_Strings), 0x007C, NULL, HFILL }}, { &hf_link16_sublabel, - { "Sublabel", "link16.sublabel", FT_UINT16, BASE_DEC, NULL, 0x380, + { "Sublabel", "link16.sublabel", FT_UINT16, BASE_DEC, NULL, 0x0380, NULL, HFILL }}, { &hf_link16_mli, { "Message Length Indicator", "link16.mli", FT_UINT16, BASE_DEC, NULL, 0x1C00, diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index 09807799d4..2c6937874f 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.c @@ -89,7 +89,7 @@ proto_register_llt(void) static hf_register_info hf[] = { { &hf_llt_cluster_num, { "Cluster number", "llt.cluster_num", - FT_UINT8, BASE_DEC, NULL, 0, + FT_UINT16, BASE_DEC, NULL, 0, "Cluster number that this node belongs to", HFILL } }, { &hf_llt_message_type, { "Message type", "llt.message_type", diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index 569ed95c76..328dbc4971 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -263,95 +263,95 @@ proto_register_macctrl(void) { &hf_macctrl_cbfc_enbv_c0, { "C0", "macc.cbfc.enbv.c0", FT_BOOLEAN, 16, - NULL, 0x01, NULL, HFILL }}, + NULL, 0x0001, NULL, HFILL }}, { &hf_macctrl_cbfc_enbv_c1, { "C1", "macc.cbfc.enbv.c1", FT_BOOLEAN, 16, - NULL, 0x02, NULL, HFILL }}, + NULL, 0x0002, NULL, HFILL }}, { &hf_macctrl_cbfc_enbv_c2, { "C2", "macc.cbfc.enbv.c2", FT_BOOLEAN, 16, - NULL, 0x04, NULL, HFILL }}, + NULL, 0x0004, NULL, HFILL }}, { &hf_macctrl_cbfc_enbv_c3, { "C3", "macc.cbfc.enbv.c3", FT_BOOLEAN, 16, - NULL, 0x08, NULL, HFILL }}, + NULL, 0x0008, NULL, HFILL }}, { &hf_macctrl_cbfc_enbv_c4, { "C4", "macc.cbfc.enbv.c4", FT_BOOLEAN, 16, - NULL, 0x10, NULL, HFILL }}, + NULL, 0x0010, NULL, HFILL }}, { &hf_macctrl_cbfc_enbv_c5, { "C5", "macc.cbfc.enbv.c5", FT_BOOLEAN, 16, - NULL, 0x20, NULL, HFILL }}, + NULL, 0x0020, NULL, HFILL }}, { &hf_macctrl_cbfc_enbv_c6, { "C6", "macc.cbfc.enbv.c6", FT_BOOLEAN, 16, - NULL, 0x40, NULL, HFILL }}, + NULL, 0x0040, NULL, HFILL }}, { &hf_macctrl_cbfc_enbv_c7, { "C7", "macc.cbfc.enbv.c7", FT_BOOLEAN, 16, - NULL, 0x80, NULL, HFILL }}, + NULL, 0x0080, NULL, HFILL }}, { &hf_macctrl_cbfc_pause_time_c0, { "C0", "macc.cbfc.pause_time.c0", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_macctrl_cbfc_pause_time_c1, { "C1", "macc.cbfc.pause_time.c1", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_macctrl_cbfc_pause_time_c2, { "C2", "macc.cbfc.pause_time.c2", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_macctrl_cbfc_pause_time_c3, { "C3", "macc.cbfc.pause_time.c3", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_macctrl_cbfc_pause_time_c4, { "C4", "macc.cbfc.pause_time.c4", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_macctrl_cbfc_pause_time_c5, { "C5", "macc.cbfc.pause_time.c5", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_macctrl_cbfc_pause_time_c6, { "C6", "macc.cbfc.pause_time.c6", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_macctrl_cbfc_pause_time_c7, { "C7", "macc.cbfc.pause_time.c7", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_reg_flags, { "Flags", "macc.reg.flags", FT_UINT8, BASE_HEX, - VALS(reg_flags_vals), 0x00, NULL, HFILL }}, + VALS(reg_flags_vals), 0x0, NULL, HFILL }}, { &hf_reg_req_grants, { "Pending Grants", "macc.regreq.grants", FT_UINT8, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_reg_grants, { "Echoed Pending Grants", "macc.reg.grants", FT_UINT8, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_reg_port, { "Assigned Port (LLID)", "macc.reg.assignedport", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_reg_ack_port, { "Echoed Assigned Port (LLID)", "macc.regack.assignedport", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_reg_time, { "Sync Time", "macc.reg.synctime", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_reg_ack_time, { "Echoed Sync Time", "macc.regack.synctime", FT_UINT16, BASE_DEC, - NULL, 0x00, NULL, HFILL }} + NULL, 0x0, NULL, HFILL }} }; static gint *ett[] = { diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c index 7754509cd9..10ee5b955a 100644 --- a/epan/dissectors/packet-mih.c +++ b/epan/dissectors/packet-mih.c @@ -2557,7 +2557,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0001, + 0x00000001, NULL, HFILL } }, @@ -2569,7 +2569,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0002, + 0x00000002, NULL, HFILL } }, @@ -2581,7 +2581,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0004, + 0x00000004, NULL, HFILL } }, @@ -2605,7 +2605,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0001, + 0x00000001, NULL, HFILL } }, @@ -2617,7 +2617,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0002, + 0x00000002, NULL, HFILL } }, @@ -2629,7 +2629,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0004, + 0x00000004, NULL, HFILL } }, @@ -2653,7 +2653,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0001, + 0x00000001, NULL, HFILL } }, @@ -2665,7 +2665,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0002, + 0x00000002, NULL, HFILL } }, @@ -2677,7 +2677,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0004, + 0x00000004, NULL, HFILL } }, @@ -2689,7 +2689,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0008, + 0x00000008, NULL, HFILL } }, @@ -2701,7 +2701,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0010, + 0x00000010, NULL, HFILL } }, @@ -2725,7 +2725,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0001, + 0x00000001, NULL, HFILL } }, @@ -2737,7 +2737,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0002, + 0x00000002, NULL, HFILL } }, @@ -2749,7 +2749,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0004, + 0x00000004, NULL, HFILL } }, @@ -2761,7 +2761,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0008, + 0x00000008, NULL, HFILL } }, @@ -2773,7 +2773,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0010, + 0x00000010, NULL, HFILL } }, @@ -2785,7 +2785,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0020, + 0x00000020, NULL, HFILL } }, @@ -2809,7 +2809,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0001, + 0x00000001, NULL, HFILL } }, @@ -2821,7 +2821,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0002, + 0x00000002, NULL, HFILL } }, @@ -2833,7 +2833,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0004, + 0x00000004, NULL, HFILL } }, @@ -2845,7 +2845,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0008, + 0x00000008, NULL, HFILL } }, @@ -2869,7 +2869,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0001, + 0x00000001, NULL, HFILL } }, @@ -2881,7 +2881,7 @@ void proto_register_mih(void) FT_BOOLEAN, 32, NULL, - 0x0002, + 0x00000002, NULL, HFILL } }, diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 7d6e98d676..a8ce4bcb43 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -581,7 +581,7 @@ proto_register_mpls(void) {&hf_mpls_ttl, {"MPLS TTL", "mpls.ttl", - FT_UINT32, BASE_DEC, NULL, 0x0000000FF, + FT_UINT32, BASE_DEC, NULL, 0x000000FF, NULL, HFILL } }, diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c index f2fbcae995..fd6891b1f5 100644 --- a/epan/dissectors/packet-nas_5gs.c +++ b/epan/dissectors/packet-nas_5gs.c @@ -13447,7 +13447,7 @@ proto_register_nas_5gs(void) }, { &hf_nas_5gs_mm_relay_key_req_params_relay_service_code, { "Relay service code", "nas_5gs.mm.relay_key_req_params.relay_service_code", - FT_UINT8, BASE_DEC, NULL, 0, + FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL } }, { &hf_nas_5gs_mm_relay_key_req_params_nonce_1, diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index c4f094d936..6ee9729318 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -8303,7 +8303,7 @@ proto_register_nas_eps(void) }, { &hf_nas_eps_esm_qci, { "Quality of Service Class Identifier (QCI)","nas_eps.esm.qci", - FT_UINT8,(BASE_DEC|BASE_RANGE_STRING), RVALS(nas_eps_qci_vals), 0x0, + FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(nas_eps_qci_vals), 0x0, NULL, HFILL } }, { &hf_nas_eps_esm_mbr_ul, diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index c6d59d0313..04f99e31ff 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -8648,7 +8648,7 @@ proto_register_ndps(void) { &hf_ndps_len, { "Length", "ndps.len", - FT_UINT16, BASE_DEC, NULL, 0x0, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ndps_limit_enc, diff --git a/epan/dissectors/packet-nvme-mi.c b/epan/dissectors/packet-nvme-mi.c index 34a6e75587..044202a14e 100644 --- a/epan/dissectors/packet-nvme-mi.c +++ b/epan/dissectors/packet-nvme-mi.c @@ -405,27 +405,27 @@ proto_register_nvme_mi(void) }, { &hf_nvme_mi_mctp_ic, { "MCTP IC", "nvme-mi.mctp-ic", - FT_BOOLEAN, 32, NULL, 0x80, + FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL }, }, { &hf_nvme_mi_csi, { "CSI", "nvme-mi.csi", - FT_UINT32, BASE_DEC, NULL, 0x0100, + FT_UINT32, BASE_DEC, NULL, 0x00000100, NULL, HFILL }, }, { &hf_nvme_mi_type, { "Type", "nvme-mi.type", - FT_UINT32, BASE_HEX, VALS(mi_type_vals), 0x7800, + FT_UINT32, BASE_HEX, VALS(mi_type_vals), 0x00007800, NULL, HFILL }, }, { &hf_nvme_mi_ror, { "ROR", "nvme-mi.ror", - FT_BOOLEAN, 32, TFS(&tfs_response_request), 0x8000, + FT_BOOLEAN, 32, TFS(&tfs_response_request), 0x00008000, NULL, HFILL }, }, { &hf_nvme_mi_meb, { "MEB", "nvme-mi.meb", - FT_BOOLEAN, 32, TFS(&tfs_meb), 0x10000, + FT_BOOLEAN, 32, TFS(&tfs_meb), 0x00010000, NULL, HFILL }, }, { &hf_nvme_mi_mic, diff --git a/epan/dissectors/packet-oampdu.c b/epan/dissectors/packet-oampdu.c index 4818a7764c..b13bb0d446 100644 --- a/epan/dissectors/packet-oampdu.c +++ b/epan/dissectors/packet-oampdu.c @@ -2954,42 +2954,42 @@ proto_register_oampdu(void) { &hf_oam_dpoe_s1_autoneg_hd, { "Half Duplex", "oampdu.s1.autoneg.hd", - FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x01, + FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0001, NULL, HFILL } }, { &hf_oam_dpoe_s1_autoneg_fd, { "Full Duplex", "oampdu.s1.autoneg.fd", - FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x02, + FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0002, NULL, HFILL } }, { &hf_oam_dpoe_s1_autoneg_10, { "10 Mbps", "oampdu.s1.autoneg.10", - FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x04, + FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0004, NULL, HFILL } }, { &hf_oam_dpoe_s1_autoneg_100, { "100 Mbps", "oampdu.s1.autoneg.100", - FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x08, + FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0008, NULL, HFILL } }, { &hf_oam_dpoe_s1_autoneg_1000, { "1000 Mbps", "oampdu.s1.autoneg.1000", - FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x10, + FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0010, NULL, HFILL } }, { &hf_oam_dpoe_s1_autoneg_10000, { "10Gbps", "oampdu.s1.autoneg.10000", - FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x20, + FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0020, NULL, HFILL } }, { &hf_oam_dpoe_s1_autoneg_fc, { "Flow Control", "oampdu.s1.autoneg.fc", - FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x40, + FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0040, NULL, HFILL } }, { &hf_oam_dpoe_s1_autoneg_mdi, { "Auto MDI/MDI-X", "oampdu.s1.autoneg.mdi", - FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x80, + FT_BOOLEAN, 16, TFS(&tfs_yes_no), 0x0080, NULL, HFILL } }, { &hf_oam_dpoe_user_port_object, diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c index 81e5c0d54f..87136e693c 100644 --- a/epan/dissectors/packet-tetra.c +++ b/epan/dissectors/packet-tetra.c @@ -9222,7 +9222,7 @@ void proto_register_tetra (void) { "Channel 3", "tetra.rxchannel3", FT_UINT8, BASE_DEC, VALS(recvchanneltypenames), 0x0, "Logical channels type", HFILL }}, { &hf_tetra_timer, - { "Timer", "tetra.timer", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Timer", "tetra.timer", FT_UINT32, BASE_HEX, NULL, 0x0, "Timer Register", HFILL }}, { &hf_tetra_crc, { "CRC", "tetra.crc", FT_BOOLEAN, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index dc2b529b78..3a67138554 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -5930,7 +5930,7 @@ proto_register_tn3270(void) { &hf_tn3270_bsc, { "SNA BSC", "tn3270.bsc", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, /* END - 5.16 - Outbound 3270DS */ @@ -6002,7 +6002,7 @@ proto_register_tn3270(void) { &hf_tn3270_interval, { "Checkpoint interval", "tn3270.interval", - FT_UINT8, BASE_HEX, NULL, 0x0, + FT_UINT16, BASE_HEX, NULL, 0x0, "Specifies the number of pages in the interval between terminal checkpoints", HFILL } }, /* End - 5.26 - Set Checkpoint Interval */ diff --git a/epan/dissectors/packet-usbip.c b/epan/dissectors/packet-usbip.c index 07ac0b3392..5f1dd2438c 100644 --- a/epan/dissectors/packet-usbip.c +++ b/epan/dissectors/packet-usbip.c @@ -993,12 +993,12 @@ proto_register_usbip(void) {&hf_usbip_direction, {"Direction", "usbip.endpoint_number.direction", - FT_UINT8, BASE_HEX, VALS(usb_endpoint_direction_vals), 0x1, + FT_UINT32, BASE_HEX, VALS(usb_endpoint_direction_vals), 0x00000001, "USB endpoint direction", HFILL}}, {&hf_usbip_ep, {"Endpoint", "usbip.endpoint_number", - FT_UINT8, BASE_HEX, NULL, 0xf, + FT_UINT32, BASE_HEX, NULL, 0x0000000f, "USB endpoint number", HFILL}}, {&hf_usbip_transfer_flags, diff --git a/epan/dissectors/packet-vsip.c b/epan/dissectors/packet-vsip.c index 695caff974..f6c0e4379f 100644 --- a/epan/dissectors/packet-vsip.c +++ b/epan/dissectors/packet-vsip.c @@ -929,7 +929,7 @@ static guint32 vsip_PingResp(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t proto_tree_add_item(tree, hf_vsip_PingResp_ProductType, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_vsip_PingResp_Status, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_vsip_PingResp_Status, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; len = tvb_get_ntohs(tvb, offset); diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index e1a326552d..a4773d91a2 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -6030,28 +6030,28 @@ void proto_register_wassp(void) &hf_aeroscout_header, { "Location Base Service Header", "wassp.aeroscout.header", FT_BYTES, BASE_NONE, NULL, - 0x00, "Aeroscout header", HFILL + 0x0, "Aeroscout header", HFILL } }, { &hf_aeroscout_header_magic_number, { "Header Magic Number", "wassp.aeroscout.header_magic", FT_UINT16, BASE_HEX, NULL, - 0x00, "Aeroscout header magic number", HFILL + 0x0, "Aeroscout header magic number", HFILL } }, { &hf_aeroscout_request_id, { "Request ID", "wassp.aeroscout.request_id", FT_UINT16, BASE_DEC, NULL, - 0x00, "Aeroscout Request ID", HFILL + 0x0, "Aeroscout Request ID", HFILL } }, { &hf_aeroscout_code, { "Operation Code", "wassp.aeroscout.code", FT_UINT8, BASE_DEC, NULL, - 0x00, "Aeroscout Operation Code", HFILL + 0x0, "Aeroscout Operation Code", HFILL } }, @@ -6059,49 +6059,49 @@ void proto_register_wassp(void) &hf_aeroscout_sub_code, { "Operation Sub Code", "wassp.aeroscout.sub_code", FT_UINT8, BASE_DEC, NULL, - 0x00, "Aeroscout Operation Sub Code", HFILL + 0x0, "Aeroscout Operation Sub Code", HFILL } }, { &hf_aeroscout_datalength, { "Length of Data Payload", "wassp.aeroscout.datalength", FT_UINT16, BASE_DEC, NULL, - 0x00, "Aeroscout Length of Data Payload", HFILL + 0x0, "Aeroscout Length of Data Payload", HFILL } }, { &hf_lbs_vendor_id, { "Location Base Service Vendor ID", "wassp.lbs.vendor_id", FT_UINT16, BASE_DEC, NULL, - 0x00, "LBS TAG Vendor ID", HFILL + 0x0, "LBS TAG Vendor ID", HFILL } }, { &hf_lbs_rsvd1, { "LBS Rsvd", "wassp.lbs.rsvd1", FT_UINT16, BASE_HEX, NULL, - 0x00, "LBS TAG rsvd", HFILL + 0x0, "LBS TAG rsvd", HFILL } }, { &hf_lbs_ap_bssid, { "Location Base Service AccessPoint BSSID", "wassp.lbs.ap_bssid", FT_BYTES, BASE_NONE, NULL, - 0x00, "LBS TAG ap bssid", HFILL + 0x0, "LBS TAG ap bssid", HFILL } }, { &hf_lbs_rsvd2, { "LBS Rsvd", "wassp.lbs.rsvd2", FT_UINT8, BASE_HEX, NULL, - 0x00, "LBS TAG rsvd2", HFILL + 0x0, "LBS TAG rsvd2", HFILL } }, { &hf_lbs_rxchan, { "LBS rxchan", "wassp.lbs.rxchan", FT_UINT8, BASE_DEC, NULL, - 0x00, "LBS TAG rxchan", HFILL + 0x0, "LBS TAG rxchan", HFILL } }, @@ -6109,105 +6109,105 @@ void proto_register_wassp(void) &hf_lsb_tstamp, { "Location Base Service Time Stamp", "wassp.lbs.tstamp", FT_UINT32, BASE_DEC, NULL, - 0x00, "LBS TAG tstamp", HFILL + 0x0, "LBS TAG tstamp", HFILL } }, { &hf_hf_lsb_rsvd3, { "LBS Rsvd", "wassp.lbs.rsvd3", FT_UINT16, BASE_HEX, NULL, - 0x00, "LBS TAG rsvd3", HFILL + 0x0, "LBS TAG rsvd3", HFILL } }, { &hf_lsb_rssi, { "Location Base Service RSSI", "wassp.lbs.rssi", FT_INT8, BASE_DEC, NULL, - 0x00, "LBS TAG rssi", HFILL + 0x0, "LBS TAG rssi", HFILL } }, { &hf_lsb_rsvd, { "LBS Rsvd", "wassp.lbs.rsvd", FT_UINT8, BASE_HEX, NULL, - 0x00, "LBS TAG rsvd4", HFILL + 0x0, "LBS TAG rsvd4", HFILL } }, { &hf_lsb_noise_floor, { "LBS Noise Floor", "wassp.lsb.noise_floor", FT_INT8, BASE_DEC, NULL, - 0x00, "LBS TAG noise floor", HFILL + 0x0, "LBS TAG noise floor", HFILL } }, { &hf_lsb_rsvd4, { - "LBS Rsvd", "wassp.lsb.rsvd4", FT_UINT8, BASE_HEX, NULL, - 0x00, "LBS TAG rsvd5", HFILL + "LBS Rsvd", "wassp.lsb.rsvd4", FT_UINT24, BASE_HEX, NULL, + 0x0, "LBS TAG rsvd5", HFILL } }, { &hf_lsb_chan_rate, { "LBS channel Rate", "wassp.lsb.chan_rate", FT_UINT8, BASE_DEC, NULL, - 0x00, "LBS TAG channel rate", HFILL + 0x0, "LBS TAG channel rate", HFILL } }, { &hf_lsb_rsvd5, { "LBS Rsvd", "wassp.lsb.rsvd5", FT_UINT8, BASE_HEX, NULL, - 0x00, "LBS TAG rsvd6", HFILL + 0x0, "LBS TAG rsvd6", HFILL } }, { &hf_lsb_wh_fc, { "LBS Wireless Header Frame Control", "wassp.lsb.wh_fc", FT_UINT16, BASE_HEX, NULL, - 0x00, "LBS TAG Frame Control", HFILL + 0x0, "LBS TAG Frame Control", HFILL } }, { &hf_lsb_wh_seq, { "LBS Wireless Header Sequence Number", "wassp.hf_lsb_wh_seq", FT_UINT16, BASE_HEX, NULL, - 0x00, "LBS TAG Sequence Number", HFILL + 0x0, "LBS TAG Sequence Number", HFILL } }, { &hf_lsb_rsvd6, { "LBS Rsvd", "wassp.lsb.rsvd6", FT_UINT16, BASE_HEX, NULL, - 0x00, "LBS TAG rsvd7", HFILL + 0x0, "LBS TAG rsvd7", HFILL } }, { &hf_lsb_wh_addr2, { "MAC address2", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL, - 0x00, "Mobile Unit Ethernet address", HFILL + 0x0, "Mobile Unit Ethernet address", HFILL } }, { &hf_lsb_wh_addr3, { "MAC address3", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL, - 0x00, "Mobile Unit Ethernet address", HFILL + 0x0, "Mobile Unit Ethernet address", HFILL } }, { &hf_lsb_wh_addr4, { "MAC address4", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL, - 0x00, "Mobile Unit Ethernet address", HFILL + 0x0, "Mobile Unit Ethernet address", HFILL } }, { &hf_wassp_version, { "Version", "wassp.version", FT_UINT8, BASE_DEC, NULL, - 0x00, "Wassp Protocol Version", HFILL + 0x0, "Wassp Protocol Version", HFILL } }, /* ru discover header */ @@ -6215,63 +6215,63 @@ void proto_register_wassp(void) &hf_ru_rad_num, { "RU Random Number", "wassp.ru_xid", FT_UINT16, BASE_DEC, NULL, - 0x00, "random number for checking the session", HFILL + 0x0, "random number for checking the session", HFILL } }, { &hf_ru_checksum, { "RU Messages Checksum", "wassp.ru_checksum", FT_UINT16, BASE_DEC, NULL, - 0x00, "AccessPoint messages checksum", HFILL + 0x0, "AccessPoint messages checksum", HFILL } }, { &hf_ru_ac_op, { "Controller Operation", "wassp.ru_ac_op", FT_UINT16, BASE_DEC, NULL, - 0x00, NULL, HFILL + 0x0, NULL, HFILL } }, { &hf_ru_ac_mode, { "Controller Operation Mode", "wassp.ru_ac_mode", FT_UINT16, BASE_DEC, NULL, - 0x00, NULL, HFILL + 0x0, NULL, HFILL } }, { &hf_ru_mac, { "AP MAC address", "wassp.ru_mac", FT_ETHER, BASE_NONE, NULL, - 0x00, "AP Ethernet address", HFILL + 0x0, "AP Ethernet address", HFILL } }, { &hf_ru_discover_header, { "RU Discover Header", "wassp.ru.header", FT_BYTES, BASE_NONE, NULL , - 0x00, "AccessPoint Discover Header", HFILL + 0x0, "AccessPoint Discover Header", HFILL } }, { &hf_wassp_header, { "Wassp Header", "wassp.header", FT_BYTES, BASE_NONE, NULL , - 0x00, "Wassp Message Header", HFILL + 0x0, "Wassp Message Header", HFILL } }, { &hf_wassp_type, { "WASSP Type", "wassp.type", FT_UINT8, BASE_DEC, - VALS(wassp_header_types), 0x00, "Wassp message type", HFILL + VALS(wassp_header_types), 0x0, "Wassp message type", HFILL } }, { &hf_wassp_seq_num_flag, { "Sequence Number & Flag", "wassp.seq_num_flag", FT_UINT16, BASE_DEC, NULL, - 0x00, "Sequence number and flag for multi-message", HFILL + 0x0, "Sequence number and flag for multi-message", HFILL } }, { @@ -6313,14 +6313,14 @@ void proto_register_wassp(void) &hf_wassp_sessionid, { "Session ID", "wassp.session_id", FT_UINT16, BASE_DEC, NULL, - 0x00, "Concentrator Session ID", HFILL + 0x0, "Concentrator Session ID", HFILL } }, { &hf_wassp_length, { "Length", "wassp.length", FT_UINT16, BASE_DEC, NULL, - 0x00, "Length of Payload", HFILL + 0x0, "Length of Payload", HFILL } }, /* wassp MU data --- start */ @@ -6336,28 +6336,28 @@ void proto_register_wassp(void) &hf_wassp_mu_data_header, { "Wassp MU Data Header", "wassp.mu_data_header", FT_BYTES, BASE_NONE, NULL, - 0x00, "MU Data Header", HFILL + 0x0, "MU Data Header", HFILL } }, { &hf_wassp_mu_type, { "Type", "wassp.data.mu_type", FT_UINT8, BASE_DEC, NULL, - 0x00, "Wassp MU message type", HFILL + 0x0, "Wassp MU message type", HFILL } }, { &hf_wassp_mu_qos, { "QOS", "wassp.data.mu_qos", FT_UINT8, BASE_DEC, NULL, - 0x00, "Quality of Service identifier", HFILL + 0x0, "Quality of Service identifier", HFILL } }, { &hf_wassp_mu_action_ssid, { "Action & SSID/Vlan ID", "wassp.data.mu_action_ssid", FT_UINT16, BASE_DEC, NULL, - 0x00, "Action and where device is currently registered", HFILL + 0x0, "Action and where device is currently registered", HFILL } }, { @@ -6379,28 +6379,28 @@ void proto_register_wassp(void) &hf_wassp_mu_resv0, { "Reserved0", "wassp.data.mu_resv0", FT_UINT16, BASE_HEX, VALS(mu_resv0_strings), - 0x00, "MU data Reserved0 or Flag", HFILL + 0x0, "MU data Reserved0 or Flag", HFILL } }, { &hf_wassp_mu_resv1, { "Reserved1", "wassp.data.mu_resv1", FT_UINT16, BASE_DEC, NULL, - 0x00, "MU data Reserved 1", HFILL + 0x0, "MU data Reserved 1", HFILL } }, { &hf_wassp_mu_assoc_status, { "Association Status", "wassp.data.mu_assoc_status", FT_UINT8, BASE_CUSTOM, CF_FUNC(mu_association_status), - 0x00, "MU Association Status", HFILL + 0x0, "MU Association Status", HFILL } }, { &hf_wassp_mu_mac, { "MAC address", "wassp.data.mu_mac", FT_ETHER, BASE_NONE, NULL, - 0x00, "Mobile Unit Ethernet address", HFILL + 0x0, "Mobile Unit Ethernet address", HFILL } }, /* netflow */ @@ -6408,147 +6408,147 @@ void proto_register_wassp(void) &hf_wassp_mu_netflow_tree, { "WASSP MU Data NetFlow Tree", "wassp.mu.data.netflow.subtree", FT_NONE, BASE_NONE, NULL, - 0x00, NULL, HFILL + 0x0, NULL, HFILL } }, { &hf_wassp_mu_netflow_header, { "Wassp MU Data NetFlow Header", "wassp.mu_data_netflow_header", FT_BYTES, BASE_NONE, NULL, - 0x00, "MU Data NetFlow Header", HFILL + 0x0, "MU Data NetFlow Header", HFILL } }, { &hf_wassp_mu_netflow_version, { "Version", "wassp.data.mu_netflow_version", FT_UINT16, BASE_DEC, NULL, - 0x00, "MU NetFlow Version", HFILL + 0x0, "MU NetFlow Version", HFILL } }, { &hf_wassp_mu_netflow_length, { "Length", "wassp.data.mu_netflow_length", FT_UINT16, BASE_DEC, NULL, - 0x00, "MU NetFlow Length", HFILL + 0x0, "MU NetFlow Length", HFILL } }, { &hf_wassp_mu_netflow_flags, { "Flag", "wassp.data.mu_netflow_flag", FT_UINT16, BASE_HEX, NULL, - 0x00, "MU NetFlow Flag", HFILL + 0x0, "MU NetFlow Flag", HFILL } }, { &hf_wassp_mu_netflow_uptime, { "UpTime", "wassp.data.mu_netflow_uptime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, - 0x00, "MU NetFlow Up Time", HFILL + 0x0, "MU NetFlow Up Time", HFILL } }, { &hf_wassp_mu_netflow_record, { "Record", "wassp.data.mu_netflow_record", FT_BYTES, BASE_NONE, NULL, - 0x00, "MU NetFlow Record", HFILL + 0x0, "MU NetFlow Record", HFILL } }, { &hf_wassp_mu_netflow_in_bytes, { "InBytes", "wassp.data.mu_netflow_inbytes", FT_UINT32, BASE_DEC, NULL, - 0x00, "MU NetFlow In Bytes", HFILL + 0x0, "MU NetFlow In Bytes", HFILL } }, { &hf_wassp_mu_netflow_in_packets, { "InPackets", "wassp.data.mu_netflow_inpackets", FT_UINT32, BASE_DEC, NULL, - 0x00, "MU NetFlow In Packets", HFILL + 0x0, "MU NetFlow In Packets", HFILL } }, { &hf_wassp_mu_netflow_ip_protocol_number, { "Protocol", "wassp.data.mu_netflow_protocol", FT_UINT8, BASE_DEC, NULL, - 0x00, "MU NetFlow IP Protocol", HFILL + 0x0, "MU NetFlow IP Protocol", HFILL } }, { &hf_wassp_mu_netflow_source_tos, { "Source TOS", "wassp.data.mu_netflow_tos", FT_UINT8, BASE_HEX, NULL, - 0x00, "MU NetFlow Source TOS", HFILL + 0x0, "MU NetFlow Source TOS", HFILL } }, { &hf_wassp_mu_netflow_source_port, { "Source Port", "wassp.data.mu_netflow_source_port", FT_INT16, BASE_DEC, NULL, - 0x00, "MU NetFlow Source Port", HFILL + 0x0, "MU NetFlow Source Port", HFILL } }, { &hf_wassp_mu_netflow_source_ip, { "IP", "wassp.data.mu_netflow_source_ip", FT_IPv4, BASE_NONE, NULL, - 0x00, "MU NetFlow Source IP", HFILL + 0x0, "MU NetFlow Source IP", HFILL } }, { &hf_wassp_mu_netflow_input_snmp, { "In SNMP", "wassp.data.mu_netflow_in_snmp", FT_UINT16, BASE_DEC, NULL, - 0x00, "MU NetFlow In Snmp", HFILL + 0x0, "MU NetFlow In Snmp", HFILL } }, { &hf_wassp_mu_netflow_dest_port, { "Dest Port", "wassp.data.mu_netflow_dest_port", FT_INT16, BASE_DEC, NULL, - 0x00, "MU NetFlow Dest Port", HFILL + 0x0, "MU NetFlow Dest Port", HFILL } }, { &hf_wassp_mu_netflow_dest_ip, { "Dest IP", "wassp.data.mu_netflow_dest_ip", FT_IPv4, BASE_NONE, NULL, - 0x00, "MU NetFlow Dest IP", HFILL + 0x0, "MU NetFlow Dest IP", HFILL } }, { &hf_wassp_mu_netflow_output_snmp, { "Out SNMP", "wassp.data.mu_netflow_out_snmp", FT_UINT16, BASE_DEC, NULL, - 0x00, "MU NetFlow Out Snmp", HFILL + 0x0, "MU NetFlow Out Snmp", HFILL } }, { &hf_wassp_mu_netflow_last_time, { "Last Time", "wassp.data.mu_netflow_last_time", FT_UINT32, BASE_DEC, NULL, - 0x00, "MU NetFlow Last Time", HFILL + 0x0, "MU NetFlow Last Time", HFILL } }, { &hf_wassp_mu_netflow_first_time, { "First Time", "wassp.data.mu_netflow_first_time", FT_UINT32, BASE_DEC, NULL, - 0x00, "MU NetFlow First Time", HFILL + 0x0, "MU NetFlow First Time", HFILL } }, { &hf_wassp_mu_netflow_in_source_mac, { "Source Mac", "wassp.data.mu_netflow_source_mac", FT_ETHER, BASE_NONE, NULL, - 0x00, "MU NetFlow Source MAC Address", HFILL + 0x0, "MU NetFlow Source MAC Address", HFILL } }, { &hf_wassp_mu_netflow_in_dest_mac, { "Dest Mac", "wassp.data.mu_netflow_dest_mac", FT_ETHER, BASE_NONE, NULL, - 0x00, "MU NetFlow Dest MAC Address", HFILL + 0x0, "MU NetFlow Dest MAC Address", HFILL } }, /* wassp TLV */ @@ -6556,84 +6556,84 @@ void proto_register_wassp(void) &hf_wassp_tlv_value, { "Wassp TLV", "wassp.tlv.value", FT_NONE, BASE_NONE, NULL, - 0x00, "Wassp TLV in hexadecimal", HFILL + 0x0, "Wassp TLV in hexadecimal", HFILL } }, { &hf_wassp_tlv_type_main, { "Type", "wassp.tlv.type", FT_UINT16, BASE_DEC, VALS(wassp_tlv_types), - 0x00, "Wassp TLV type", HFILL + 0x0, "Wassp TLV type", HFILL } }, { &hf_wassp_tlv_type_sub, { "Type", "wassp.tlv.type", FT_NONE, BASE_NONE, NULL, - 0x00, "Wassp TLV type", HFILL + 0x0, "Wassp TLV type", HFILL } }, { &hf_wassp_tlv_length, { "Length", "wassp.tlv.length", FT_UINT16, BASE_DEC, NULL, - 0x00, "Wassp TLV length", HFILL + 0x0, "Wassp TLV length", HFILL } }, { &hf_wassp_tlv_value_octext, { "value", "wassp.tlv.value_octext", FT_BYTES, BASE_NONE, NULL, - 0x00, "Wassp TLV Value in hexadecimal", HFILL + 0x0, "Wassp TLV Value in hexadecimal", HFILL } }, { &hf_wassp_tlv_value_string, { "Value", "wassp.tlv.valuestr", FT_STRING, BASE_NONE, NULL, - 0x00, "Wassp TLV Value in string format", HFILL + 0x0, "Wassp TLV Value in string format", HFILL } }, { &hf_wassp_tlv_value_ip, { "Value", "wassp.tlv.valueip", FT_IPv4, BASE_NONE, NULL, - 0x00, "Wassp TLV Value in IP format", HFILL + 0x0, "Wassp TLV Value in IP format", HFILL } }, { &hf_wassp_tlv_value_int, { "Value", "wassp.tlv.valueint", FT_UINT8, BASE_DEC, NULL, - 0x00, "Wassp TLV Value in an integer", HFILL + 0x0, "Wassp TLV Value in an integer", HFILL } }, { &hf_wassp_tlv_eid_status, { "Status", "wassp.tlv.eid.status", FT_UINT32, BASE_DEC, VALS(wassp_eid_status_types), - 0x00, "Explicit indication of request's status", HFILL + 0x0, "Explicit indication of request's status", HFILL } }, { &hf_wassp_tlv_eid_action, { "action", "wassp.tlv.eid.action", FT_UINT32, BASE_DEC, VALS(wassp_eid_action_types), - 0x00, "upgrade action request", HFILL + 0x0, "upgrade action request", HFILL } }, { &hf_wassp_tlv_eid_rustate, { "RU State", "wassp.tlv.eid.rustate", FT_BOOLEAN, FT_UINT8, TFS(&wassp_eid_rustate_types), - 0x00, "Remote Unit State", HFILL + 0x0, "Remote Unit State", HFILL } }, { &hf_wassp_ipaddress, { "IPv4 address", "wassp.ipaddress", FT_IPv4, BASE_NONE, NULL, - 0x00, "IPv4 IP address", HFILL + 0x0, "IPv4 IP address", HFILL } }, /* fragmentation */ @@ -6648,14 +6648,14 @@ void proto_register_wassp(void) &hf_wassp_fragment_overlap_conflict, { "Conflicting data in fragment overlap", "wassp.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, - 0x00, "Overlapping fragments contained conflicting data", HFILL + 0x0, "Overlapping fragments contained conflicting data", HFILL } }, { &hf_wassp_fragment_multiple_tails, { "Multiple tail fragments found", "wassp.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, - 0x00, "Several tails were found when defragmenting the packet", HFILL + 0x0, "Several tails were found when defragmenting the packet", HFILL } }, { @@ -6669,112 +6669,112 @@ void proto_register_wassp(void) &hf_wassp_fragment_error, { "Defragmentation error", "wassp.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, - 0x00, "Defragmentation error due to illegal fragments", HFILL + 0x0, "Defragmentation error due to illegal fragments", HFILL } }, { &hf_wassp_fragment, { "WASSP Fragment", "wassp.fragment", FT_FRAMENUM, BASE_NONE, NULL, - 0x00, "wassp Fragmented", HFILL + 0x0, "wassp Fragmented", HFILL } }, { &hf_wassp_fragments, { "WASSP Fragments", "wassp.fragments", FT_NONE, BASE_NONE, NULL, - 0x00, "wassp more Fragments", HFILL + 0x0, "wassp more Fragments", HFILL } }, { &hf_wassp_fragment_count, { "WASSP Fragment count", "wassp.fragment.count", FT_UINT32, BASE_DEC, NULL, - 0x00, "Fragment Count", HFILL + 0x0, "Fragment Count", HFILL } }, { &hf_wassp_reassembled_in, { "Reassembled WASSP in frame", "wassp.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, - 0x00, "This WASSP frame is reassembled in this frame", HFILL + 0x0, "This WASSP frame is reassembled in this frame", HFILL } }, { &hf_wassp_reassembled_length, { "Reassembled WASSP length", "wassp.reassembled.length", FT_UINT32, BASE_DEC, NULL, - 0x00, "The total length of the reassembled payload", HFILL + 0x0, "The total length of the reassembled payload", HFILL } }, { &hf_wassp_sub_tree, { "WASSP Sub TLV Block", "wassp.subtree", FT_NONE, BASE_NONE, NULL, - 0x00, "WASSP sub tree", HFILL + 0x0, "WASSP sub tree", HFILL } }, { &hf_wassp_tlv_unknown, { "WASSP unknown tlv", "wassp.tlv.unknown", FT_UINT32, BASE_DEC, NULL, - 0x00, "Unknown tlv", HFILL + 0x0, "Unknown tlv", HFILL } }, { &hf_wassp_tlv_invalid, { "WASSP invalid tlv", "wassp.tlv.invalid", FT_UINT32, BASE_DEC, NULL, - 0x00, "Invalid tlv", HFILL + 0x0, "Invalid tlv", HFILL } }, { &hf_wassp_topologykey, { "Topology Key", "wassp.topology_key", FT_UINT16, BASE_DEC, NULL, - 0x00, "Topology ID", HFILL + 0x0, "Topology ID", HFILL } }, { &hf_wassp_vlanid, { "Vlan ID", "wassp.vlan_id", FT_UINT16, BASE_DEC, NULL, - 0x00, "Vlan Number", HFILL + 0x0, "Vlan Number", HFILL } }, { &hf_wassp_topology_mode, { "Topology Mode", "wassp.topology_mode", FT_UINT16,BASE_CUSTOM, CF_FUNC(topology_moder_print), - 0x00, "Wassp Topology Mode", HFILL + 0x0, "Wassp Topology Mode", HFILL } }, { &hf_wassp_in_cir, { "Committed Information Rate(In direction)", "wassp.in_cir", FT_UINT16, BASE_DEC, NULL, - 0x00, "Committed Information Rate", HFILL + 0x0, "Committed Information Rate", HFILL } }, { &hf_wassp_out_cir, { "Committed Information Rate(out direction)", "wassp.out_cir", FT_UINT16, BASE_DEC, NULL, - 0x00, "Committed Information Rate", HFILL + 0x0, "Committed Information Rate", HFILL } }, { &hf_wassp_flag_1b, { "Flag (1 byte)", "wassp.flag.1b", FT_UINT8, BASE_HEX, NULL, - 0x00, "Flag", HFILL + 0x0, "Flag", HFILL } }, { &hf_wassp_tos, { "Type of Service", "wassp.tos", FT_UINT8, BASE_HEX, NULL, - 0x00, "Tos", HFILL + 0x0, "Tos", HFILL } }, { @@ -6788,14 +6788,14 @@ void proto_register_wassp(void) &hf_wassp_tos_mask, { "Type of Service Mask", "wassp.tos.mask", FT_UINT8, BASE_HEX, NULL, - 0x00, "ToS Mask", HFILL + 0x0, "ToS Mask", HFILL } }, { &hf_cos_tos_mask, { "Class of Service ToS Mask", "wassp.cos_tos.mask", FT_UINT8, BASE_HEX, NULL, - 0x00, "Cos Tos Mask", HFILL + 0x0, "Cos Tos Mask", HFILL } }, { @@ -6830,140 +6830,140 @@ void proto_register_wassp(void) &hf_wassp_filter_rule, { "WASSP Filter Rule", "wassp.filter.rule", FT_BYTES, BASE_NONE, NULL, - 0x00, "Filter Rule", HFILL + 0x0, "Filter Rule", HFILL } }, { &hf_wassp_filter_flag, { "WASSP Filter Flag", "wassp.filter.flag", FT_UINT32, BASE_HEX, NULL, - 0x00, "Filter Flag", HFILL + 0x0, "Filter Flag", HFILL } }, { &hf_filter_rule_port_range, { "TCP/UDP Port range", "wassp.port", FT_UINT32, BASE_CUSTOM, CF_FUNC(port_range_print), - 0x00, "WASSP TCP/UDP Port", HFILL + 0x0, "WASSP TCP/UDP Port", HFILL } }, { &hf_wassp_ipprotocol, { "IP Protocol", "wassp.ip_protocol", FT_UINT8, BASE_DEC, NULL, - 0x00, "WASSP IP Protocol", HFILL + 0x0, "WASSP IP Protocol", HFILL } }, { &hf_wassp_netmasklength, { "Netmask Length Bit", "wassp.netmask_length", FT_UINT8, BASE_DEC, NULL, - 0x00, "WASSP Netmask Length Bit", HFILL + 0x0, "WASSP Netmask Length Bit", HFILL } }, { &hf_wassp_macaddr, { "MAC address", "wassp.mac_address", FT_ETHER, BASE_NONE, NULL, - 0x00, "WASSP MAC address", HFILL + 0x0, "WASSP MAC address", HFILL } }, { &hf_wassp_macaddr_mask, { "MAC address mask", "wassp.mac_address.mask", FT_ETHER, BASE_NONE, NULL, - 0x00, "MAC mask", HFILL + 0x0, "MAC mask", HFILL } }, { &hf_wassp_ethernet_type, { "Ethernet Type", "wassp.ethernet_type", FT_UINT16, BASE_HEX, NULL, - 0x00, "Ethernet Type Field", HFILL + 0x0, "Ethernet Type Field", HFILL } }, { &hf_wassp_reserve, { "Reserve", "wassp.reserve", FT_UINT16, BASE_DEC, NULL, - 0x00, "Reserve value", HFILL + 0x0, "Reserve value", HFILL } }, { &hf_wassp_freq, { "Freq in MHz", "wassp.freq", FT_UINT16, BASE_DEC, NULL, - 0x00, "WASSP Freq", HFILL + 0x0, "WASSP Freq", HFILL } }, { &hf_wassp_rss, { "RSS", "wassp.rss", FT_UINT16, BASE_DEC, NULL, - 0x00, "WASSP RSS", HFILL + 0x0, "WASSP RSS", HFILL } }, { &hf_wassp_rssi, { "RSSI", "wassp.rssi", FT_UINT16, BASE_DEC, NULL, - 0x00, "WASSP RSSI", HFILL + 0x0, "WASSP RSSI", HFILL } }, { &hf_wassp_threatstate, { "WASSP Threat State", "wassp.threat_state", FT_UINT8, BASE_HEX, VALS(threat_state_strings), - 0x00, "WASSP Threat State (NA/Active/Inactive)", HFILL + 0x0, "WASSP Threat State (NA/Active/Inactive)", HFILL } }, { &hf_wassp_radioparams, { "Radio Params QOS", "wassp.radio_params", FT_UINT8, BASE_HEX, VALS(radio_params_strings), - 0x00, "WASSP Radio Params QOS", HFILL + 0x0, "WASSP Radio Params QOS", HFILL } }, { &hf_wassp_channelfreq, { "Channel Frequency", "wassp.channel_freq", FT_UINT16, BASE_DEC, NULL, - 0x00, "WASSP Channel Frequency", HFILL + 0x0, "WASSP Channel Frequency", HFILL } }, { &hf_wassp_mu, { "Total Mu", "wassp.mu", FT_UINT32, BASE_DEC, NULL, - 0x00, "WASSP Total Mu", HFILL + 0x0, "WASSP Total Mu", HFILL } }, { &hf_wassp_apprules, { "Number of Application Rules", "wassp.num_apprules", FT_UINT16, BASE_DEC, NULL, - 0x00, "WASSP number of app rules", HFILL + 0x0, "WASSP number of app rules", HFILL } }, { &hf_wassp_displayid, { "Display ID", "wassp.display_id", FT_UINT16, BASE_DEC, NULL, - 0x00, "WASSP display ID", HFILL + 0x0, "WASSP display ID", HFILL } }, { &hf_wassp_txbytes, { "Tx Bytes", "wassp.tx_bytes", FT_UINT32, BASE_DEC, NULL, - 0x00, "WASSP Tx Bytes", HFILL + 0x0, "WASSP Tx Bytes", HFILL } }, { &hf_wassp_rxbytes, { "Rx Bytes", "wassp.rx_bytes", FT_UINT32, BASE_DEC, NULL, - 0x00, "WASSP Rx Bytes", HFILL + 0x0, "WASSP Rx Bytes", HFILL } }, }; diff --git a/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c index b0723b6ab4..082037cff7 100644 --- a/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c +++ b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c @@ -3208,8 +3208,7 @@ proto_register_wimaxmacphy(void) "wimaxmacphy.prim_fast_feedback_sub_type", FT_UINT16, BASE_DEC, - VALS( - wimaxmacphy_prim_fast_feedback_sub_type_vals), + VALS(wimaxmacphy_prim_fast_feedback_sub_type_vals), 0x7000, NULL, HFILL @@ -3547,8 +3546,7 @@ proto_register_wimaxmacphy(void) "wimaxmacphy.zone_disable_pusc_subchannel_rotation", FT_UINT8, BASE_DEC, - VALS( - wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation_vals), + VALS(wimaxmacphy_ul_zone_disable_pusc_subchannel_rotation_vals), 0x0f, NULL, HFILL @@ -4423,8 +4421,7 @@ proto_register_wimaxmacphy(void) "wimaxmacphy.burst_sounding_max_cyclic_shift_indx", FT_UINT8, BASE_DEC, - VALS( - wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx_vals), + VALS(wimaxmacphy_ul_burst_sounding_max_cyclic_shift_indx_vals), 0x0, NULL, HFILL @@ -4450,8 +4447,7 @@ proto_register_wimaxmacphy(void) "wimaxmacphy.burst_sounding_decimation_offset_rand", FT_UINT8, BASE_DEC, - VALS( - wimaxmacphy_ul_burst_sounding_decimation_offset_rand_vals), + VALS(wimaxmacphy_ul_burst_sounding_decimation_offset_rand_vals), 0x0, NULL, HFILL @@ -5231,8 +5227,7 @@ proto_register_wimaxmacphy(void) "wimaxmacphy.sub_burst_sounding_power_assignment_method", FT_UINT8, BASE_HEX, - VALS( - wimaxmacphy_ul_sub_burst_sounding_power_assignment_vals), + VALS(wimaxmacphy_ul_sub_burst_sounding_power_assignment_vals), 0x0, NULL, HFILL @@ -5258,8 +5253,7 @@ proto_register_wimaxmacphy(void) "wimaxmacphy.sub_burst_sounding_allocation_mode", FT_UINT8, BASE_DEC, - VALS( - wimaxmacphy_ul_sub_burst_sounding_allocation_mode_vals), + VALS(wimaxmacphy_ul_sub_burst_sounding_allocation_mode_vals), 0x0, NULL, HFILL diff --git a/tools/check_typed_item_calls.py b/tools/check_typed_item_calls.py index 2b546edf62..c19cd10fba 100755 --- a/tools/check_typed_item_calls.py +++ b/tools/check_typed_item_calls.py @@ -359,7 +359,19 @@ def is_ignored_consecutive_filter(filter): re.compile(r'^opa.mad.attributemodifier.p'), re.compile(r'^v5ua.efa'), re.compile(r'^zbncp.data.tx_power'), - re.compile(r'^zbncp.data.nwk_addr') + re.compile(r'^zbncp.data.nwk_addr'), + re.compile(r'^zbee_zcl_hvac.pump_config_control.attr.ctrl_mode'), + re.compile(r'^nat-pmp.external_port'), + re.compile(r'^zbee_zcl.attr.float'), + re.compile(r'^wpan-tap.phr.fsk_ms.mode'), + re.compile(r'^mysql.exec_flags'), + re.compile(r'^pim.metric_pref'), + re.compile(r'^modbus.regval_float'), + re.compile(r'^alcap.cau.value'), + re.compile(r'^bpv7.crc_field'), + re.compile(r'^at.chld.mode'), + re.compile(r'^btl2cap.psm'), + re.compile(r'^srvloc.srvtypereq.nameauthlistlen') ] for patt in ignore_patterns: @@ -725,6 +737,8 @@ apiChecks.append(ProtoTreeAddItemCheck(True)) # for ptvcursor_add() def removeComments(code_string): code_string = re.sub(re.compile(r"/\*.*?\*/",re.DOTALL ) ,"" , code_string) # C-style comment code_string = re.sub(re.compile(r"//.*?\n" ) ,"" , code_string) # C++-style comment + code_string = re.sub(re.compile(r"#if 0.*?#endif",re.DOTALL ) ,"" , code_string) # Ignored region + return code_string # Test for whether the given file was automatically generated. @@ -766,10 +780,11 @@ def find_items(filename, check_mask=False, mask_exact_width=False, check_label=F contents = removeComments(contents) # N.B. re extends all the way to HFILL to avoid greedy matching - matches = re.finditer( r'.*\{\s*\&(hf_[a-z_A-Z0-9]*)\s*,\s*{\s*\"(.*?)\"\s*,\s*\"(.*?)\"\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*([a-zA-Z0-9\W\s_]*?)\s*,\s*HFILL', contents) + matches = re.finditer( r'.*\{\s*\&(hf_[a-z_A-Z0-9]*)\s*,\s*{\s*\"(.*?)\"\s*,\s*\"(.*?)\"\s*,\s*(.*?)\s*,\s*([0-9A-Z_\|\s]*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*([a-zA-Z0-9\W\s_\u00f6\u00e4]*?)\s*,\s*HFILL', contents) for m in matches: # Store this item. hf = m.group(1) + #print(hf) items[hf] = Item(filename, hf, filter=m.group(3), label=m.group(2), item_type=m.group(4), mask=m.group(7), type_modifier=m.group(5), check_mask=check_mask,