osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix various issues seen with tools/check_typed_item_calls.py

This commit is contained in:
Martin Mathieson 2023-01-16 15:35:04 +00:00
parent da0c933aa8
commit 4dd78f11c9
15 changed files with 129 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-dhcpv6.c
View File

@ -3419,9 +3419,9 @@ proto_register_dhcpv6(void)
{ &hf_packetcable_cccV6_sec_tcm,
{ "SEC TCM Flags", "dhcpv6.packetcable.cccV6.sec_tcm", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_packetcable_cccV6_sec_tcm_provisioning_server,
{ "Provisioning Server", "dhcpv6.packetcable.cccV6.sec_tcm.provisioning_server", FT_BOOLEAN, 16, TFS(&tfs_on_off), 0x01, NULL, HFILL }},
{ "Provisioning Server", "dhcpv6.packetcable.cccV6.sec_tcm.provisioning_server", FT_BOOLEAN, 16, TFS(&tfs_on_off), 0x0001, NULL, HFILL }},
{ &hf_packetcable_cccV6_sec_tcm_call_manager_server,
{ "Call Manager Servers", "dhcpv6.packetcable.cccV6.tgt_flag.call_manager_server", FT_BOOLEAN, 16, TFS(&tfs_on_off), 0x02, NULL, HFILL }},
{ "Call Manager Servers", "dhcpv6.packetcable.cccV6.tgt_flag.call_manager_server", FT_BOOLEAN, 16, TFS(&tfs_on_off), 0x0002, NULL, HFILL }},
{ &hf_cablelabs_opts,
{ "Suboption", "dhcpv6.cablelabs.opt", FT_UINT16, BASE_DEC | BASE_EXT_STRING, &cl_vendor_subopt_values_ext, 0, NULL, HFILL }},
{ &hf_cablelabs_ipv6_server,

4
epan/dissectors/packet-gsm_sms.c
View File

@ -3439,12 +3439,12 @@ proto_register_gsm_sms(void)
NULL, HFILL }
},
{ &hf_gsm_sms_formatting_mode_alignment,
{ "Alignment", "gsm_sms.udh_created",
{ "Alignment", "gsm_sms.formatting_mode.alignment",
FT_UINT8, BASE_DEC, VALS(alignment_values), 0x03,
NULL, HFILL }
},
{ &hf_gsm_sms_formatting_mode_font_size,
{ "Font Size", "gsm_sms.udh_created",
{ "Font Size", "gsm_sms.formatting_mode.font_size",
FT_UINT8, BASE_DEC, VALS(font_size_values), 0x0C,
NULL, HFILL }
},

24
epan/dissectors/packet-gvcp.c
View File

@ -3917,25 +3917,25 @@ void proto_register_gvcp(void)
{ &hf_gvcp_sc_packet_resend_destination_option_supported_v2_0,
{ "Resend Destination Option Supported", "gvcp.bootstrap.sccx.resenddestinationoptionsupported",
FT_BOOLEAN, 32, NULL, 0x8,
FT_BOOLEAN, 32, NULL, 0x00000008,
NULL, HFILL
}},
{ &hf_gvcp_sc_packet_resend_all_in_transmission_supported_v2_0,
{ "All In Transmission Supported", "gvcp.bootstrap.sccx.allintransmissionsupported",
FT_BOOLEAN, 32, NULL, 0x4,
FT_BOOLEAN, 32, NULL, 0x00000004,
NULL, HFILL
}},
{ &hf_gvcp_sc_unconditional_streaming_supported,
{ "Unconditional Streaming Supported", "gvcp.bootstrap.sccx.unconditionalstreamingsupported",
FT_BOOLEAN, 32, NULL, 0x2,
FT_BOOLEAN, 32, NULL, 0x00000002,
NULL, HFILL
}},
{ &hf_gvcp_sc_extended_chunk_data_supported,
{ "Extended Chunk Data Supported", "gvcp.bootstrap.sccx.extendedchunkdatasupported",
FT_BOOLEAN, 32, NULL, 0x1,
FT_BOOLEAN, 32, NULL, 0x00000001,
NULL, HFILL
}},
@ -3943,43 +3943,43 @@ void proto_register_gvcp(void)
{ &hf_gvcp_sc_gendc_enabled_v2_2,
{ "GenDC Enabled", "gvcp.bootstrap.sccfgx.gendcenabled",
FT_BOOLEAN, 32, NULL, 0x80,
FT_BOOLEAN, 32, NULL, 0x00000080,
NULL, HFILL
} },
{ &hf_gvcp_sc_multi_part_enabled_v2_1,
{ "Multi-part Enabled", "gvcp.bootstrap.sccfgx.multipartenabled",
FT_BOOLEAN, 32, NULL, 0x40,
FT_BOOLEAN, 32, NULL, 0x00000040,
NULL, HFILL
}},
{ &hf_gvcp_sc_large_leader_trailer_enabled_v2_1,
{ "Large Leader/Trailer Enabled", "gvcp.bootstrap.sccfgx.largeleadertrailerenabled",
FT_BOOLEAN, 32, NULL, 0x20,
FT_BOOLEAN, 32, NULL, 0x00000020,
NULL, HFILL
}},
{ &hf_gvcp_sc_packet_resend_destination_option_enabled_v2_0,
{ "Resend Destination Option Enabled", "gvcp.bootstrap.sccfgx.resenddestinationoptionenabled",
FT_BOOLEAN, 32, NULL, 0x8,
FT_BOOLEAN, 32, NULL, 0x00000008,
NULL, HFILL
}},
{ &hf_gvcp_sc_packet_resend_all_in_transmission_enabled_v2_0,
{ "All In Transmission Enabled", "gvcp.bootstrap.sccfgx.allintransmissionenabled",
FT_BOOLEAN, 32, NULL, 0x4,
FT_BOOLEAN, 32, NULL, 0x00000004,
NULL, HFILL
}},
{ &hf_gvcp_sc_unconditional_streaming_enabled,
{ "Unconditional Streaming Enabled", "gvcp.bootstrap.sccfgx.unconditionalstreamingenabled",
FT_BOOLEAN, 32, NULL, 0x2,
FT_BOOLEAN, 32, NULL, 0x00000002,
NULL, HFILL
}},
{ &hf_gvcp_sc_extended_chunk_data_enabled,
{ "Extended Chunk Data Enabled", "gvcp.bootstrap.sccfgx.extendedchunkdataenabled",
FT_BOOLEAN, 32, NULL, 0x1,
FT_BOOLEAN, 32, NULL, 0x00000001,
NULL, HFILL
}},
@ -4278,7 +4278,7 @@ void proto_register_gvcp(void)
}},
{ &hf_gvcp_custom_memory_addr,
{ "Custom Memory Address", "gvcp.bootstrap.custom.register.write",
{ "Custom Memory Address", "gvcp.bootstrap.custom.memory.write",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL
}},

2
epan/dissectors/packet-mbim.c
View File

@ -10277,7 +10277,7 @@ proto_register_mbim(void)
},
{ &hf_mbim_data_subclass_5gnedc,
{ "5G NE-DC", "mbim.control.data_subclass.5gnedc",
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x0000004,
FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00000004,
NULL, HFILL }
},
{ &hf_mbim_data_subclass_5gelte,

32
epan/dissectors/packet-obex.c
View File

@ -3370,82 +3370,82 @@ proto_register_obex(void)
},
{ &hf_map_application_parameter_data_parameter_mask_reply_to_addressing,
{ "Parameter Mask: Reply to Addressing", "obex.parameter.value.parameter_mask.reply_to_addressing",
FT_BOOLEAN, 32, NULL, 0x8000,
FT_BOOLEAN, 32, NULL, 0x00008000,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_protected,
{ "Parameter Mask: Protected", "obex.parameter.value.parameter_mask.protected",
FT_BOOLEAN, 32, NULL, 0x4000,
FT_BOOLEAN, 32, NULL, 0x00004000,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_sent,
{ "Parameter Mask: Sent", "obex.parameter.value.parameter_mask.sent",
FT_BOOLEAN, 32, NULL, 0x2000,
FT_BOOLEAN, 32, NULL, 0x00002000,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_read,
{ "Parameter Mask: Read", "obex.parameter.value.parameter_mask.read",
FT_BOOLEAN, 32, NULL, 0x1000,
FT_BOOLEAN, 32, NULL, 0x00001000,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_priority,
{ "Parameter Mask: Priority", "obex.parameter.value.parameter_mask.priority",
FT_BOOLEAN, 32, NULL, 0x0800,
FT_BOOLEAN, 32, NULL, 0x00000800,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_attachment_size,
{ "Parameter Mask: Attachment Size", "obex.parameter.value.parameter_mask.attachment_size",
FT_BOOLEAN, 32, NULL, 0x0400,
FT_BOOLEAN, 32, NULL, 0x00000400,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_text,
{ "Parameter Mask: Text", "obex.parameter.value.parameter_mask.text",
FT_BOOLEAN, 32, NULL, 0x0200,
FT_BOOLEAN, 32, NULL, 0x00000200,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_reception_status,
{ "Parameter Mask: Reception Status", "obex.parameter.value.parameter_mask.reception_status",
FT_BOOLEAN, 32, NULL, 0x0100,
FT_BOOLEAN, 32, NULL, 0x00000100,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_size,
{ "Parameter Mask: Size", "obex.parameter.value.parameter_mask.size",
FT_BOOLEAN, 32, NULL, 0x0080,
FT_BOOLEAN, 32, NULL, 0x00000080,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_type,
{ "Parameter Mask: Type", "obex.parameter.value.parameter_mask.type",
FT_BOOLEAN, 32, NULL, 0x0040,
FT_BOOLEAN, 32, NULL, 0x00000040,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_recipient_addressing,
{ "Parameter Mask: Recipient Addressing", "obex.parameter.value.parameter_mask.recipient_addressing",
FT_BOOLEAN, 32, NULL, 0x0020,
FT_BOOLEAN, 32, NULL, 0x00000020,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_recipient_name,
{ "Parameter Mask: Recipient Name", "obex.parameter.value.parameter_mask.recipient_name",
FT_BOOLEAN, 32, NULL, 0x0010,
FT_BOOLEAN, 32, NULL, 0x00000010,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_sender_addressing,
{ "Parameter Mask: Sender Addressing", "obex.parameter.value.parameter_mask.sender_addressing",
FT_BOOLEAN, 32, NULL, 0x0008,
FT_BOOLEAN, 32, NULL, 0x00000008,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_sender_name,
{ "Parameter Mask: Sender Name", "obex.parameter.value.parameter_mask.sender_name",
FT_BOOLEAN, 32, NULL, 0x0004,
FT_BOOLEAN, 32, NULL, 0x00000004,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_datetime,
{ "Parameter Mask: Datetime", "obex.parameter.value.parameter_mask.datetime",
FT_BOOLEAN, 32, NULL, 0x0002,
FT_BOOLEAN, 32, NULL, 0x00000002,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_subject,
{ "Parameter Mask: Subject", "obex.parameter.value.parameter_mask.subject",
FT_BOOLEAN, 32, NULL, 0x0001,
FT_BOOLEAN, 32, NULL, 0x00000001,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_folder_listing_size,

16
epan/dissectors/packet-pcep.c
View File

@ -4630,42 +4630,42 @@ proto_register_pcep(void)
},
{ &hf_pcep_no_path_tlvs_pce,
{ "PCE currently unavailable", "pcep.no_path_tlvs.pce",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0001,
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000001,
NULL, HFILL }
},
{ &hf_pcep_no_path_tlvs_unk_dest,
{ "Unknown destination", "pcep.no_path_tlvs.unk_dest",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0002,
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000002,
NULL, HFILL }
},
{ &hf_pcep_no_path_tlvs_unk_src,
{ "Unknown source", "pcep.no_path_tlvs.unk_src",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0004,
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000004,
NULL, HFILL }
},
{ &hf_pcep_no_path_tlvs_brpc,
{ "BRPC Path computation chain unavailable", "pcep.no_path_tlvs.brpc",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0008,
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000008,
NULL, HFILL }
},
{ &hf_pcep_no_path_tlvs_pks,
{ "PKS expansion failure", "pcep.no_path_tlvs.pks",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0010,
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000010,
NULL, HFILL }
},
{ &hf_pcep_no_path_tlvs_no_gco_migr,
{ "No GCO migration path found", "pcep.no_path_tlvs.no_gco_migr",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0020,
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000020,
NULL, HFILL }
},
{ &hf_pcep_no_path_tlvs_no_gco_soln,
{ "No GCO solution found", "pcep.no_path_tlvs.no_gco_soln",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0040,
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000040,
NULL, HFILL }
},
{ &hf_pcep_no_path_tlvs_p2mp,
{ "P2MP Reachability Problem", "pcep.no_path_tlvs.p2mp",
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0080,
FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x00000080,
NULL, HFILL }
},
{ &hf_pcep_stateful_pce_capability_flags,

8
epan/dissectors/packet-rdp.c
View File

@ -4009,19 +4009,19 @@ proto_register_rdp(void) {
NULL, HFILL }},
{ &hf_rdp_pointerFlags_wheel_rotation,
{ "Wheel rotation", "rdp.pointerflags.wheelrotation",
FT_UINT16, BASE_DEC, NULL, 0x1ff,
FT_UINT16, BASE_DEC, NULL, 0x01ff,
NULL, HFILL }},
{ &hf_rdp_pointerFlags_wheel_neg,
{ "Wheel negative", "rdp.pointerflags.wheelnegative",
FT_BOOLEAN, 16, NULL, 0x100,
FT_BOOLEAN, 16, NULL, 0x0100,
NULL, HFILL }},
{ &hf_rdp_pointerFlags_wheel,
{ "Wheel", "rdp.pointerflags.wheel",
FT_BOOLEAN, 16, NULL, 0x200,
FT_BOOLEAN, 16, NULL, 0x0200,
NULL, HFILL }},
{ &hf_rdp_pointerFlags_hwheel,
{ "Horizontal wheel", "rdp.pointerflags.hwheel",
FT_BOOLEAN, 16, NULL, 0x400,
FT_BOOLEAN, 16, NULL, 0x0400,
NULL, HFILL }},
{ &hf_rdp_pointer_xpos,
{ "xPos", "rdp.pointer.xpos",

60
epan/dissectors/packet-rsvp.c
View File

@ -8873,85 +8873,85 @@ proto_register_rsvp(void)
{&hf_rsvp_sender_tspec_regenerator_section,
{ "Section/Regenerator Section layer transparency", "rsvp.sender_tspec.regenerator_section",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0001,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000001,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_multiplex_section,
{ "Line/Multiplex Section layer transparency", "rsvp.sender_tspec.multiplex_section",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0002,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000002,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_J0_transparency,
{ "J0 transparency", "rsvp.sender_tspec.J0_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0004,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000004,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_SOH_RSOH_DCC_transparency,
{ "SOH/RSOH DCC transparency", "rsvp.sender_tspec.SOH_RSOH_DCC_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0008,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000008,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_LOH_MSOH_DCC_transparency,
{ "LOH/MSOH DCC transparency", "rsvp.sender_tspec.LOH_MSOH_DCC_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0010,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000010,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_LOH_MSOH_extended_DCC_transparency,
{ "LOH/MSOH Extended DCC transparency", "rsvp.sender_tspec.LOH_MSOH_extended_DCC_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0020,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000020,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_K1_K2_transparency,
{ "K1/K2 transparency", "rsvp.sender_tspec.K1_K2_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0040,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000040,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_E1_transparency,
{ "E1 transparency", "rsvp.sender_tspec.E1_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0080,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000080,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_F1_transparency,
{ "F1 transparency", "rsvp.sender_tspec.F1_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0100,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000100,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_E2_transparency,
{ "E2 transparency", "rsvp.sender_tspec.E2_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0200,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000200,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_B1_transparency,
{ "B1 transparency", "rsvp.sender_tspec.B1_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0400,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000400,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_B2_transparency,
{ "B2 transparency", "rsvp.sender_tspec.B2_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0800,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000800,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_M0_transparency,
{ "M0 transparency", "rsvp.sender_tspec.M0_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x1000,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00001000,
NULL, HFILL }
},
{&hf_rsvp_sender_tspec_M1_transparency,
{ "M1 transparency", "rsvp.sender_tspec.M1_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x2000,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00002000,
NULL, HFILL }
},
@ -8969,85 +8969,85 @@ proto_register_rsvp(void)
{&hf_rsvp_flowspec_regenerator_section,
{ "Section/Regenerator Section layer transparency", "rsvp.flowspec.regenerator_section",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0001,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000001,
NULL, HFILL }
},
{&hf_rsvp_flowspec_multiplex_section,
{ "Line/Multiplex Section layer transparency", "rsvp.flowspec.multiplex_section",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0002,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000002,
NULL, HFILL }
},
{&hf_rsvp_flowspec_J0_transparency,
{ "J0 transparency", "rsvp.flowspec.J0_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0004,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000004,
NULL, HFILL }
},
{&hf_rsvp_flowspec_SOH_RSOH_DCC_transparency,
{ "SOH/RSOH DCC transparency", "rsvp.flowspec.SOH_RSOH_DCC_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0008,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000008,
NULL, HFILL }
},
{&hf_rsvp_flowspec_LOH_MSOH_DCC_transparency,
{ "LOH/MSOH DCC transparency", "rsvp.flowspec.LOH_MSOH_DCC_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0010,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000010,
NULL, HFILL }
},
{&hf_rsvp_flowspec_LOH_MSOH_extended_DCC_transparency,
{ "LOH/MSOH Extended DCC transparency", "rsvp.flowspec.LOH_MSOH_extended_DCC_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0020,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000020,
NULL, HFILL }
},
{&hf_rsvp_flowspec_K1_K2_transparency,
{ "K1/K2 transparency", "rsvp.flowspec.K1_K2_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0040,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000040,
NULL, HFILL }
},
{&hf_rsvp_flowspec_E1_transparency,
{ "E1 transparency", "rsvp.flowspec.E1_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0080,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000080,
NULL, HFILL }
},
{&hf_rsvp_flowspec_F1_transparency,
{ "F1 transparency", "rsvp.flowspec.F1_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0100,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000100,
NULL, HFILL }
},
{&hf_rsvp_flowspec_E2_transparency,
{ "E2 transparency", "rsvp.flowspec.E2_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0200,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000200,
NULL, HFILL }
},
{&hf_rsvp_flowspec_B1_transparency,
{ "B1 transparency", "rsvp.flowspec.B1_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0400,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000400,
NULL, HFILL }
},
{&hf_rsvp_flowspec_B2_transparency,
{ "B2 transparency", "rsvp.flowspec.B2_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x0800,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00000800,
NULL, HFILL }
},
{&hf_rsvp_flowspec_M0_transparency,
{ "M0 transparency", "rsvp.flowspec.M0_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x1000,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00001000,
NULL, HFILL }
},
{&hf_rsvp_flowspec_M1_transparency,
{ "M1 transparency", "rsvp.flowspec.M1_transparency",
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x2000,
FT_BOOLEAN, 32, TFS(&tfs_yes_no), 0x00002000,
NULL, HFILL }
},
@ -9480,12 +9480,12 @@ proto_register_rsvp(void)
},
{&hf_rsvp_3gpp_obj_tft_opcode,
{ "TFT Operation Code", "rsvp.3gpp_obj.tft_opcode",
FT_UINT32, BASE_DEC, VALS(rsvp_3gpp_obj_tft_opcode_vals), 0x000ff00,
FT_UINT32, BASE_DEC, VALS(rsvp_3gpp_obj_tft_opcode_vals), 0x0000ff00,
NULL, HFILL }
},
{&hf_rsvp_3gpp_obj_tft_n_pkt_flt,
{ "Number of Packet filters", "rsvp.3gpp_obj.tft_n_pkt_flt",
FT_UINT32, BASE_DEC, NULL, 0x00000ff,
FT_UINT32, BASE_DEC, NULL, 0x000000ff,
NULL, HFILL }
},
{ &hf_rsvp_3gpp_obj_flow_id,

16
epan/dissectors/packet-rtp-midi.c
View File

@ -6762,7 +6762,7 @@ proto_register_rtp_midi( void )
FT_BOOLEAN,
24,
TFS(&rtp_midi_cj_flag_p),
0x80,
0x000080,
NULL, HFILL
}
},
@ -6774,7 +6774,7 @@ proto_register_rtp_midi( void )
FT_BOOLEAN,
24,
TFS(&rtp_midi_cj_flag_c),
0x40,
0x000040,
NULL, HFILL
}
},
@ -6786,7 +6786,7 @@ proto_register_rtp_midi( void )
FT_BOOLEAN,
24,
TFS(&rtp_midi_cj_flag_m),
0x20,
0x000020,
NULL, HFILL
}
},
@ -6798,7 +6798,7 @@ proto_register_rtp_midi( void )
FT_BOOLEAN,
24,
TFS(&rtp_midi_cj_flag_w),
0x10,
0x000010,
NULL, HFILL
}
},
@ -6810,7 +6810,7 @@ proto_register_rtp_midi( void )
FT_BOOLEAN,
24,
TFS(&rtp_midi_cj_flag_n),
0x08,
0x000008,
NULL, HFILL
}
},
@ -6822,7 +6822,7 @@ proto_register_rtp_midi( void )
FT_BOOLEAN,
24,
TFS(&rtp_midi_cj_flag_e),
0x04,
0x000004,
NULL, HFILL
}
},
@ -6834,7 +6834,7 @@ proto_register_rtp_midi( void )
FT_BOOLEAN,
24,
TFS(&rtp_midi_cj_flag_t),
0x02,
0x000002,
NULL, HFILL
}
},
@ -6846,7 +6846,7 @@ proto_register_rtp_midi( void )
FT_BOOLEAN,
24,
TFS(&rtp_midi_cj_flag_a),
0x01,
0x000001,
NULL, HFILL
}
},

2
epan/dissectors/packet-usb.c
View File

@ -6507,7 +6507,7 @@ proto_register_usb(void)
{ &hf_usb_wMaxPacketSize_size,
{ "Maximum Packet Size", "usb.wMaxPacketSize.size",
FT_UINT16, BASE_DEC, NULL, 0x3FF,
FT_UINT16, BASE_DEC, NULL, 0x03FF,
NULL, HFILL }},
{ &hf_usb_wMaxPacketSize_slots,

44
plugins/epan/ethercat/packet-ethercat-datagram.c
View File

@ -2592,11 +2592,11 @@ void proto_register_ecat(void)
},
{ &hf_ecat_reg_alctrl_errack,
{"Error Ack", "ecat.reg.alctrl.errack",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x10, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0010, NULL, HFILL }
},
{ &hf_ecat_reg_alctrl_id,
{"Id", "ecat.reg.alctrl.id",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x20, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0020, NULL, HFILL }
},
{ &hf_ecat_reg_alstatus,
{"AL Status (0x130)", "ecat.reg.alstatus",
@ -2604,15 +2604,15 @@ void proto_register_ecat(void)
},
{ &hf_ecat_reg_alstatus_status,
{"Al Status", "ecat.reg.alstatus.status",
FT_UINT16, BASE_HEX, VALS(vals_esc_reg_120), 0x0f, NULL, HFILL }
FT_UINT16, BASE_HEX, VALS(vals_esc_reg_120), 0x000f, NULL, HFILL }
},
{ &hf_ecat_reg_alstatus_err,
{"Error", "ecat.reg.alstatus.err",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x10, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0010, NULL, HFILL }
},
{ &hf_ecat_reg_alstatus_id,
{"Id", "ecat.reg.alstatus.id",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x20, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0020, NULL, HFILL }
},
{ &hf_ecat_reg_alstatuscode,
{"AL Status Code (0x134)", "ecat.reg.alstatuscode",
@ -2720,23 +2720,23 @@ void proto_register_ecat(void)
},
{ &hf_ecat_reg_pdiL_latchin,
{"Latch input", "ecat.reg.irqmask.pdiL.latchin",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x02, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0002, NULL, HFILL }
},
{ &hf_ecat_reg_pdiL_sync0,
{"SYNC 0", "ecat.reg.irqmask.pdiL.sync0",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x04, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0004, NULL, HFILL }
},
{ &hf_ecat_reg_pdiL_sync1,
{"SYNC 1", "ecat.reg.irqmask.pdiL.sync1",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x08, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0008, NULL, HFILL }
},
{ &hf_ecat_reg_pdiL_smchg,
{"SM changed", "ecat.reg.irqmask.pdiL.smchg",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x10, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0010, NULL, HFILL }
},
{ &hf_ecat_reg_pdiL_eepromcmdpen,
{"EEPROM command pending", "ecat.reg.irqmask.pdiL.eepromcmdpen",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x20, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0020, NULL, HFILL }
},
{ &hf_ecat_reg_pdiL_sm0,
{"SM 0", "ecat.reg.irqmask.pdiL.sm0",
@ -2828,27 +2828,27 @@ void proto_register_ecat(void)
},
{ &hf_ecat_reg_pdi1_alctrl,
{"AL Ctrl", "ecat.reg.irq.pdi1.alctrl",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x1, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0001, NULL, HFILL }
},
{ &hf_ecat_reg_pdi1_latchin,
{"Latch input", "ecat.reg.irq.pdi1.latchin",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x02, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0002, NULL, HFILL }
},
{ &hf_ecat_reg_pdi1_sync0,
{"SYNC 0", "ecat.reg.irq.pdi1.sync0",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x04, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0004, NULL, HFILL }
},
{ &hf_ecat_reg_pdi1_sync1,
{"SYNC 1", "ecat.reg.irq.pdi1.sync1",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x08, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0008, NULL, HFILL }
},
{ &hf_ecat_reg_pdi1_smchg,
{"SM changed", "ecat.reg.irq.pdi1.smchg",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x10, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0010, NULL, HFILL }
},
{ &hf_ecat_reg_pdi1_eepromcmdpen,
{"EEPROM command pending", "ecat.reg.irq.pdi1.eepromcmdpen",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x20, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0020, NULL, HFILL }
},
{ &hf_ecat_reg_pdi1_sm0,
{"SM 0", "ecat.reg.irq.pdi1.sm0",
@ -3099,6 +3099,9 @@ void proto_register_ecat(void)
{"Phy MIO Ctrl/Status (0x510)", "ecat.reg.mio.ctrlstat",
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }
},
/* TODO: check these masks (ecat_esc_reg_510) against spec.
* In particular hf_ecat_reg_mio_ctrlstat_offsphy is non-contiguous and overlaps wracc1 */
{ &hf_ecat_reg_mio_ctrlstat_wracc1,
{"Write access", "ecat.reg.mio.ctrlstat.wracc1",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0001, NULL, HFILL }
@ -3123,6 +3126,7 @@ void proto_register_ecat(void)
{"Busy", "ecat.reg.mio.ctrlstat.busy",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x8000, NULL, HFILL }
},
{ &hf_ecat_reg_mio_addr,
{"Phy MIO Address (0x512)", "ecat.reg.mio.addr",
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }
@ -3373,19 +3377,19 @@ void proto_register_ecat(void)
},
{ &hf_ecat_reg_syncman_enable,
{"Enable", "ecat.syncman.enable",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x1, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0001, NULL, HFILL }
},
{ &hf_ecat_reg_syncman_repeatreq,
{"Repeat request", "ecat.syncman.repeatreq",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x02, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0002, NULL, HFILL }
},
{ &hf_ecat_reg_syncman_latchsmchg_ecat,
{"Latch SyncMan Change ECAT", "ecat.syncman.latchsmchg.ecat",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x40, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0040, NULL, HFILL }
},
{ &hf_ecat_reg_syncman_latchsmchg_pdi,
{"Latch SyncMan Change PDI", "ecat.syncman.latchsmchg.pdi",
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x80, NULL, HFILL }
FT_BOOLEAN, 16, TFS(&tfs_local_true_false), 0x0080, NULL, HFILL }
},
{ &hf_ecat_reg_syncman_deactivate,
{"Deactivate", "ecat.syncman.deactivate",

7
plugins/epan/gryphon/packet-gryphon.c
View File

@ -2032,6 +2032,7 @@ cmd_sched(tvbuff_t *tvb, int offset, proto_tree *pt)
tree1 = proto_item_add_subtree (item1, ett_gryphon_flags);
proto_tree_add_item(tree1, hf_gryphon_sched_skip_transmit_period, tvb, offset, 2, ENC_BIG_ENDIAN);
if (i == 1) {
/* N.B. Same bit as skip_transmit_period..? */
proto_tree_add_item(tree1, hf_gryphon_sched_skip_sleep, tvb, offset, 2, ENC_BIG_ENDIAN);
}
@ -4652,7 +4653,7 @@ proto_register_gryphon(void)
{ "Flags", "gryphon.sched.flags", FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_gryphon_sched_flags_scheduler,
{ "Scheduler", "gryphon.sched.flags.scheduler", FT_BOOLEAN, 32, TFS(&critical_normal), 0x01,
{ "Scheduler", "gryphon.sched.flags.scheduler", FT_BOOLEAN, 32, TFS(&critical_normal), 0x00000001,
NULL, HFILL }},
{ &hf_gryphon_sched_sleep,
{ "Sleep (milliseconds)", "gryphon.sched.sleep", FT_UINT32, BASE_DEC, NULL, 0x0,
@ -4667,10 +4668,10 @@ proto_register_gryphon(void)
{ "Flags", "gryphon.sched.transmit_flags", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_gryphon_sched_skip_transmit_period,
{ "Last transmit period", "gryphon.sched.skip_transmit_period", FT_BOOLEAN, 16, TFS(&skip_not_skip), 0x01,
{ "Last transmit period", "gryphon.sched.skip_transmit_period", FT_BOOLEAN, 16, TFS(&skip_not_skip), 0x0001,
NULL, HFILL }},
{ &hf_gryphon_sched_skip_sleep,
{ "Last transmit period", "gryphon.sched.skip_transmit_period", FT_BOOLEAN, 16, TFS(&skip_not_skip), 0x01,
{ "Last transmit period", "gryphon.sched.skip_transmit_period", FT_BOOLEAN, 16, TFS(&skip_not_skip), 0x0001,
NULL, HFILL }},
{ &hf_gryphon_sched_channel,
{ "Channel", "gryphon.sched.channel", FT_UINT8, BASE_DEC, NULL, 0x0,

28
plugins/epan/profinet/packet-dcerpc-pn-io.c
View File

@ -14597,12 +14597,12 @@ proto_register_pn_io (void)
},
{ &hf_pn_io_sr_properties_InputValidOnBackupAR_with_SRProperties_Mode_0,
{ "InputValidOnBackupAR", "pn_io.sr_properties.InputValidOnBackupAR",
FT_BOOLEAN, 32, TFS(&tfs_pn_io_sr_properties_BackupAR_with_SRProperties_Mode_0), 0x01,
FT_BOOLEAN, 32, TFS(&tfs_pn_io_sr_properties_BackupAR_with_SRProperties_Mode_0), 0x00000001,
NULL, HFILL }
},
{ &hf_pn_io_sr_properties_InputValidOnBackupAR_with_SRProperties_Mode_1,
{ "InputValidOnBackupAR", "pn_io.sr_properties.InputValidOnBackupAR",
FT_BOOLEAN, 32, TFS(&tfs_pn_io_sr_properties_BackupAR_with_SRProperties_Mode_1), 0x01,
FT_BOOLEAN, 32, TFS(&tfs_pn_io_sr_properties_BackupAR_with_SRProperties_Mode_1), 0x00000001,
NULL, HFILL }
},
{ &hf_pn_io_sr_properties_Reserved_1,
@ -14677,7 +14677,7 @@ proto_register_pn_io (void)
},
{ &hf_pn_io_iocr_properties_reserved_3,
{ "Reserved3", "pn_io.iocr_properties.reserved3",
FT_UINT32, BASE_HEX, NULL, 0xF000000,
FT_UINT32, BASE_HEX, NULL, 0x0F000000,
NULL, HFILL }
},
{ &hf_pn_io_iocr_properties_fast_forwarding_mac_adr,
@ -14702,17 +14702,17 @@ proto_register_pn_io (void)
},
{ &hf_pn_io_DistributedWatchDogFactor,
{ "SFIOCRProperties.DistributedWatchDogFactor", "pn_io.SFIOCRProperties.DistributedWatchDogFactor",
FT_UINT32, BASE_HEX, NULL, 0x0FF,
FT_UINT32, BASE_HEX, NULL, 0x000000FF,
NULL, HFILL }
},
{ &hf_pn_io_RestartFactorForDistributedWD,
{ "SFIOCRProperties.RestartFactorForDistributedWD", "pn_io.SFIOCRProperties.RestartFactorForDistributedWD",
FT_UINT32, BASE_HEX, NULL, 0xff00,
FT_UINT32, BASE_HEX, NULL, 0x0000ff00,
NULL, HFILL }
},
{ &hf_pn_io_SFIOCRProperties_DFPmode,
{ "SFIOCRProperties.DFPmode", "pn_io.SFIOCRProperties.DFPmode",
FT_UINT32, BASE_HEX, NULL, 0xFF0000,
FT_UINT32, BASE_HEX, NULL, 0x00FF0000,
NULL, HFILL }
},
{ &hf_pn_io_SFIOCRProperties_reserved_1,
@ -15112,7 +15112,7 @@ proto_register_pn_io (void)
},
{ &hf_pn_io_control_command_reserved_7_15,
{ "ControlBlockProperties.reserved", "pn_io.control_properties_reserved_7_15",
FT_UINT16, BASE_HEX, NULL, 0x0FF80,
FT_UINT16, BASE_HEX, NULL, 0xFF80,
NULL, HFILL }
},
{ &hf_pn_io_control_block_properties,
@ -16543,12 +16543,12 @@ proto_register_pn_io (void)
},
{ &hf_pn_io_tx_phase_assignment_begin_value,
{ "AssignedValueForReservedBegin", "pn_io.tx_phase_assignment_begin_value",
FT_UINT16, BASE_DEC, NULL, 0x0F,
FT_UINT16, BASE_DEC, NULL, 0x000F,
NULL, HFILL }
},
{ &hf_pn_io_tx_phase_assignment_orange_begin,
{ "AssignedValueForOrangeBegin", "pn_io.tx_phase_assignment_orange_begin",
FT_UINT16, BASE_DEC, NULL, 0x0F0,
FT_UINT16, BASE_DEC, NULL, 0x00F0,
NULL, HFILL }
},
{ &hf_pn_io_tx_phase_assignment_end_reserved,
@ -16558,7 +16558,7 @@ proto_register_pn_io (void)
},
{ &hf_pn_io_tx_phase_assignment_reserved,
{ "Reserved should be 0", "pn_io.tx_phase_assignment_reserved",
FT_UINT16, BASE_DEC, NULL, 0x0F000,
FT_UINT16, BASE_DEC, NULL, 0xF000,
NULL, HFILL }
},
{ &hf_pn_ir_rx_phase_assignment,
@ -16921,12 +16921,12 @@ proto_register_pn_io (void)
},
{ &hf_pn_io_mrp_check_reserved_1,
{ "MRP_Check.reserved_1", "pn_io.mrp_check_reserved_1",
FT_UINT32, BASE_HEX, NULL, 0x0FFFFFC,
FT_UINT32, BASE_HEX, NULL, 0xFFFFFC,
NULL, HFILL }
},
{ &hf_pn_io_mrp_check_reserved_2,
{ "MRP_Check.reserved_2", "pn_io.mrp_check_reserved_2",
FT_UINT32, BASE_HEX, NULL, 0x0FF000000,
FT_UINT32, BASE_HEX, NULL, 0xFF000000,
NULL, HFILL }
},
{ &hf_pn_io_mrp_rtmode,
@ -17238,12 +17238,12 @@ proto_register_pn_io (void)
},
{ &hf_pn_io_rs_alarm_info_reserved_8_15,
{ "RSAlarmInfo.Reserved2", "pn_io.rs_alarm_info_reserved_8_15",
FT_UINT16, BASE_HEX, NULL, 0x0FF00,
FT_UINT16, BASE_HEX, NULL, 0xFF00,
NULL, HFILL }
},
{ &hf_pn_io_rs_alarm_info_reserved_0_7,
{ "RSAlarmInfo.Reserved1", "pn_io.rs_alarm_info_reserved_0_7",
FT_UINT16, BASE_HEX, NULL, 0x000FF,
FT_UINT16, BASE_HEX, NULL, 0x00FF,
NULL, HFILL }
},
{ &hf_pn_io_rs_alarm_info,

2
plugins/epan/profinet/packet-pn-ptcp.c
View File

@ -933,7 +933,7 @@ proto_register_pn_ptcp (void)
{ &hf_pn_ptcp_tl_length,
{ "TypeLength.Length", "pn_ptcp.tl_length",
FT_UINT16, BASE_DEC, 0x0, 0x1FF,
FT_UINT16, BASE_DEC, 0x0, 0x01FF,
NULL, HFILL }},
{ &hf_pn_ptcp_tl_type,

3
tools/check_typed_item_calls.py
View File

@ -273,7 +273,8 @@ known_non_contiguous_fields = { 'wlan.fixed.capabilities.cfpoll.sta',
'v120.lli', # non-contiguous field (http://www.acacia-net.com/wwwcla/protocol/v120_l2.htm)
'stun.type.class',
'bssgp.csg_id', 'tiff.t6.unused', 'artnet.ip_prog_reply.unused',
'telnet.auth.mod.enc', 'osc.message.midi.bender', 'btle.data_header.rfu'
'telnet.auth.mod.enc', 'osc.message.midi.bender', 'btle.data_header.rfu',
'stun.type.method' # figure 3 in rfc 5389
}
##################################################################################################