More fussing with items and calls.

This commit is contained in:
Martin Mathieson 2023-01-31 13:34:04 +00:00 committed by Martin Mathieson
parent 858f759fa2
commit ed8ee831fd
32 changed files with 302 additions and 293 deletions

View File

@ -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",

View File

@ -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",

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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 }},
};

View File

@ -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",

View File

@ -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 }},

View File

@ -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,

View File

@ -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",

View File

@ -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}},

View File

@ -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",

View File

@ -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,

View File

@ -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,

View File

@ -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 }},

View File

@ -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,

View File

@ -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",

View File

@ -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[] = {

View File

@ -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
}
},

View File

@ -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 }
},

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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,

View File

@ -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 */

View File

@ -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,

View File

@ -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);

View File

@ -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,