diff options
Diffstat (limited to 'epan/dissectors/packet-gvsp.c')
| -rw-r--r-- | epan/dissectors/packet-gvsp.c | 681 |
1 files changed, 361 insertions, 320 deletions
diff --git a/epan/dissectors/packet-gvsp.c b/epan/dissectors/packet-gvsp.c index 706cf499f3..98bc7e76e5 100644 --- a/epan/dissectors/packet-gvsp.c +++ b/epan/dissectors/packet-gvsp.c @@ -462,37 +462,37 @@ typedef struct _gvsp_packet_info /*Define the gvsp proto */ -static int proto_gvsp = -1; +static int proto_gvsp; /*static int global_gvsp_port = 20202;*/ static dissector_handle_t gvsp_handle; /* Define the tree for gvsp */ -static int ett_gvsp = -1; -static int ett_gvsp_flags = -1; -static int ett_gvsp_header = -1; -static int ett_gvsp_payload = -1; -static int ett_gvsp_trailer = -1; -static int ett_gvsp_pixelformat = -1; -static int ett_gvsp_fieldinfo = -1; -static int ett_gvsp_cs = -1; -static int ett_gvsp_sc_zone_direction = -1; -static int ett_gvsp_zoneinfo = -1; -static int ett_gvsp_zoneinfo_multipart = -1; -static int ett_gvsp_partinfo_leader = -1; -static int ett_gvsp_partinfo_trailer = -1; -static int ett_gvsp_gendc_leader_flags = -1; -static int ett_gvsp_gendc_payload_data_flags = -1; -static int ett_gvsp_gendc_payload_flow_flags = -1; -static int ett_gvsp_gendc_container_descriptor = -1; -static int ett_gvsp_gendc_container_header_flags = -1; -static int ett_gvsp_gendc_container_header_variable_fields = -1; -static int ett_gvsp_gendc_container_header_component_offsets = -1; -static int ett_gvsp_gendc_component_header = -1; -static int ett_gvsp_gendc_part_offsets = -1; -static int ett_gvsp_gendc_part_header = -1; -static int ett_gvsp_gendc_component_header_flags = -1; -static int ett_gvsp_gendc_part_header_flags = -1; +static int ett_gvsp; +static int ett_gvsp_flags; +static int ett_gvsp_header; +static int ett_gvsp_payload; +static int ett_gvsp_trailer; +static int ett_gvsp_pixelformat; +static int ett_gvsp_fieldinfo; +static int ett_gvsp_cs; +static int ett_gvsp_sc_zone_direction; +static int ett_gvsp_zoneinfo; +static int ett_gvsp_zoneinfo_multipart; +static int ett_gvsp_partinfo_leader; +static int ett_gvsp_partinfo_trailer; +static int ett_gvsp_gendc_leader_flags; +static int ett_gvsp_gendc_payload_data_flags; +static int ett_gvsp_gendc_payload_flow_flags; +static int ett_gvsp_gendc_container_descriptor; +static int ett_gvsp_gendc_container_header_flags; +static int ett_gvsp_gendc_container_header_variable_fields; +static int ett_gvsp_gendc_container_header_component_offsets; +static int ett_gvsp_gendc_component_header; +static int ett_gvsp_gendc_part_offsets; +static int ett_gvsp_gendc_part_header; +static int ett_gvsp_gendc_component_header_flags; +static int ett_gvsp_gendc_part_header_flags; static const value_string statusnames[] = { { GEV_STATUS_SUCCESS, "GEV_STATUS_SUCCESS" }, @@ -927,171 +927,174 @@ static const val64_string gendc_component_typeid_values[] = { { 0, NULL } }; -static int hf_gvsp_status = -1; -static int hf_gvsp_blockid16 = -1; -static int hf_gvsp_flags = -1; -static int hf_gvsp_flagdevicespecific0 = -1; -static int hf_gvsp_flagdevicespecific1 = -1; -static int hf_gvsp_flagdevicespecific2 = -1; -static int hf_gvsp_flagdevicespecific3 = -1; -static int hf_gvsp_flagdevicespecific4 = -1; -static int hf_gvsp_flagdevicespecific5 = -1; -static int hf_gvsp_flagdevicespecific6 = -1; -static int hf_gvsp_flagdevicespecific7 = -1; -static int hf_gvsp_flagresendrangeerror = -1; -static int hf_gvsp_flagpreviousblockdropped = -1; -static int hf_gvsp_flagpacketresend = -1; -static int hf_gvsp_format = -1; -static int hf_gvsp_packetid24 = -1; -static int hf_gvsp_blockid64 = -1; -static int hf_gvsp_packetid32 = -1; -static int hf_gvsp_payloadtype = -1; -static int hf_gvsp_payloaddata = -1; -static int hf_gvsp_timestamp = -1; -static int hf_gvsp_pixelformat = -1; -static int hf_gvsp_sizex = -1; -static int hf_gvsp_sizey = -1; -static int hf_gvsp_offsetx = -1; -static int hf_gvsp_offsety = -1; -static int hf_gvsp_paddingx = -1; -static int hf_gvsp_paddingy = -1; -static int hf_gvsp_payloaddatasize = -1; -static int hf_gvsp_pixelcolor = -1; -static int hf_gvsp_pixeloccupy = -1; -static int hf_gvsp_pixelid = -1; -static int hf_gvsp_filename = -1; -static int hf_gvsp_payloadlength = -1; -static int hf_gvsp_fieldinfo = -1; -static int hf_gvsp_fieldid = -1; -static int hf_gvsp_fieldcount = -1; -static int hf_gvsp_genericflags = -1; -static int hf_gvsp_timestamptickfrequency = -1; -static int hf_gvsp_dataformat = -1; -static int hf_gvsp_packetizationmode = -1; -static int hf_gvsp_packetsize = -1; -static int hf_gvsp_profileidc = -1; -static int hf_gvsp_cs = -1; -static int hf_gvsp_cs0 = -1; -static int hf_gvsp_cs1 = -1; -static int hf_gvsp_cs2 = -1; -static int hf_gvsp_cs3 = -1; -static int hf_gvsp_levelidc = -1; -static int hf_gvsp_sropinterleavingdepth = -1; -static int hf_gvsp_sropmaxdondiff = -1; -static int hf_gvsp_sropdeintbufreq = -1; -static int hf_gvsp_sropinitbuftime = -1; -static int hf_gvsp_add_zones = -1; -static int hf_gvsp_zoneinfo = -1; -static int hf_gvsp_zoneid = -1; -static int hf_gvsp_endofzone = -1; -static int hf_gvsp_addressoffset = -1; -static int hf_gvsp_sc_zone_direction = -1; -static int hf_gvsp_sc_zone0_direction = -1; -static int hf_gvsp_sc_zone1_direction = -1; -static int hf_gvsp_sc_zone2_direction = -1; -static int hf_gvsp_sc_zone3_direction = -1; -static int hf_gvsp_sc_zone4_direction = -1; -static int hf_gvsp_sc_zone5_direction = -1; -static int hf_gvsp_sc_zone6_direction = -1; -static int hf_gvsp_sc_zone7_direction = -1; -static int hf_gvsp_sc_zone8_direction = -1; -static int hf_gvsp_sc_zone9_direction = -1; -static int hf_gvsp_sc_zone10_direction = -1; -static int hf_gvsp_sc_zone11_direction = -1; -static int hf_gvsp_sc_zone12_direction = -1; -static int hf_gvsp_sc_zone13_direction = -1; -static int hf_gvsp_sc_zone14_direction = -1; -static int hf_gvsp_sc_zone15_direction = -1; -static int hf_gvsp_sc_zone16_direction = -1; -static int hf_gvsp_sc_zone17_direction = -1; -static int hf_gvsp_sc_zone18_direction = -1; -static int hf_gvsp_sc_zone19_direction = -1; -static int hf_gvsp_sc_zone20_direction = -1; -static int hf_gvsp_sc_zone21_direction = -1; -static int hf_gvsp_sc_zone22_direction = -1; -static int hf_gvsp_sc_zone23_direction = -1; -static int hf_gvsp_sc_zone24_direction = -1; -static int hf_gvsp_sc_zone25_direction = -1; -static int hf_gvsp_sc_zone26_direction = -1; -static int hf_gvsp_sc_zone27_direction = -1; -static int hf_gvsp_sc_zone28_direction = -1; -static int hf_gvsp_sc_zone29_direction = -1; -static int hf_gvsp_sc_zone30_direction = -1; -static int hf_gvsp_sc_zone31_direction = -1; -static int hf_gvsp_numparts = -1; -static int hf_gvsp_multipart_data_type = -1; -static int hf_gvsp_partlength = -1; -static int hf_gvsp_multi_part_source_id = -1; -static int hf_gvsp_data_purpose_id = -1; -static int hf_gvsp_region_id = -1; -static int hf_gvsp_endofpart = -1; -static int hf_gvsp_add_zones_multipart = -1; -static int hf_gvsp_zoneinfo_multipart = -1; -static int hf_gvsp_multi_part_part_id = -1; -static int hf_gvsp_data_type_specific = -1; -static int hf_gvsp_chunk_data_payload_length_hex = -1; -static int hf_gvsp_chunk_layout_id_hex = -1; +static int hf_gvsp_status; +static int hf_gvsp_blockid16; +static int hf_gvsp_flags; +static int hf_gvsp_flagdevicespecific0; +static int hf_gvsp_flagdevicespecific1; +static int hf_gvsp_flagdevicespecific2; +static int hf_gvsp_flagdevicespecific3; +static int hf_gvsp_flagdevicespecific4; +static int hf_gvsp_flagdevicespecific5; +static int hf_gvsp_flagdevicespecific6; +static int hf_gvsp_flagdevicespecific7; +static int hf_gvsp_flagresendrangeerror; +static int hf_gvsp_flagpreviousblockdropped; +static int hf_gvsp_flagpacketresend; +static int hf_gvsp_format; +static int hf_gvsp_packetid24; +static int hf_gvsp_blockid64; +static int hf_gvsp_packetid32; +static int hf_gvsp_payloadtype; +static int hf_gvsp_payloaddata; +static int hf_gvsp_timestamp; +static int hf_gvsp_pixelformat; +static int hf_gvsp_sizex; +static int hf_gvsp_sizey; +static int hf_gvsp_offsetx; +static int hf_gvsp_offsety; +static int hf_gvsp_paddingx; +static int hf_gvsp_paddingy; +static int hf_gvsp_payloaddatasize; +static int hf_gvsp_pixelcolor; +static int hf_gvsp_pixeloccupy; +static int hf_gvsp_pixelid; +static int hf_gvsp_filename; +static int hf_gvsp_payloadlength; +static int hf_gvsp_fieldinfo; +static int hf_gvsp_fieldid; +static int hf_gvsp_fieldcount; +static int hf_gvsp_genericflags; +static int hf_gvsp_timestamptickfrequency; +static int hf_gvsp_dataformat; +static int hf_gvsp_packetizationmode; +static int hf_gvsp_packetsize; +static int hf_gvsp_profileidc; +static int hf_gvsp_cs; +static int hf_gvsp_cs0; +static int hf_gvsp_cs1; +static int hf_gvsp_cs2; +static int hf_gvsp_cs3; +static int hf_gvsp_levelidc; +static int hf_gvsp_sropinterleavingdepth; +static int hf_gvsp_sropmaxdondiff; +static int hf_gvsp_sropdeintbufreq; +static int hf_gvsp_sropinitbuftime; +static int hf_gvsp_add_zones; +static int hf_gvsp_zoneinfo; +static int hf_gvsp_zoneid; +static int hf_gvsp_endofzone; +static int hf_gvsp_addressoffset; +static int hf_gvsp_sc_zone_direction; +static int hf_gvsp_sc_zone0_direction; +static int hf_gvsp_sc_zone1_direction; +static int hf_gvsp_sc_zone2_direction; +static int hf_gvsp_sc_zone3_direction; +static int hf_gvsp_sc_zone4_direction; +static int hf_gvsp_sc_zone5_direction; +static int hf_gvsp_sc_zone6_direction; +static int hf_gvsp_sc_zone7_direction; +static int hf_gvsp_sc_zone8_direction; +static int hf_gvsp_sc_zone9_direction; +static int hf_gvsp_sc_zone10_direction; +static int hf_gvsp_sc_zone11_direction; +static int hf_gvsp_sc_zone12_direction; +static int hf_gvsp_sc_zone13_direction; +static int hf_gvsp_sc_zone14_direction; +static int hf_gvsp_sc_zone15_direction; +static int hf_gvsp_sc_zone16_direction; +static int hf_gvsp_sc_zone17_direction; +static int hf_gvsp_sc_zone18_direction; +static int hf_gvsp_sc_zone19_direction; +static int hf_gvsp_sc_zone20_direction; +static int hf_gvsp_sc_zone21_direction; +static int hf_gvsp_sc_zone22_direction; +static int hf_gvsp_sc_zone23_direction; +static int hf_gvsp_sc_zone24_direction; +static int hf_gvsp_sc_zone25_direction; +static int hf_gvsp_sc_zone26_direction; +static int hf_gvsp_sc_zone27_direction; +static int hf_gvsp_sc_zone28_direction; +static int hf_gvsp_sc_zone29_direction; +static int hf_gvsp_sc_zone30_direction; +static int hf_gvsp_sc_zone31_direction; +static int hf_gvsp_numparts; +static int hf_gvsp_multipart_data_type; +static int hf_gvsp_partlength; +static int hf_gvsp_multi_part_source_id; +static int hf_gvsp_data_purpose_id; +static int hf_gvsp_region_id; +static int hf_gvsp_endofpart; +static int hf_gvsp_add_zones_multipart; +static int hf_gvsp_zoneinfo_multipart; +static int hf_gvsp_multi_part_part_id; +static int hf_gvsp_data_type_specific; +static int hf_gvsp_chunk_data_payload_length_hex; +static int hf_gvsp_chunk_layout_id_hex; /* Added for 2.2 support */ -static int hf_gvsp_gendc_leader_descriptor_size_v2_2 = -1; -static int hf_gvsp_gendc_leader_flags_v2_2 = -1; -static int hf_gvsp_gendc_leader_flags_preliminary_descriptor_v2_2 = -1; -static int hf_gvsp_gendc_leader_flags_reserved_v2_2 = -1; -static int hf_gvsp_gendc_payload_data_size_v2_2 = -1; -static int hf_gvsp_gendc_payload_data_destination_offset_v2_2 = -1; -static int hf_gvsp_gendc_payload_data_flags_v2_2 = -1; -static int hf_gvsp_gendc_payload_data_flag_descriptor_flags_v2_2 = -1; -static int hf_gvsp_gendc_payload_data_flag_start_of_descriptor_data_v2_2 = -1; -static int hf_gvsp_gendc_payload_data_flag_end_of_descriptor_data_v2_2 = -1; -static int hf_gvsp_gendc_payload_data_flags_reserved_v2_2 = -1; -static int hf_gvsp_gendc_payload_flow_flags_v2_2 = -1; -static int hf_gvsp_gendc_payload_flow_flag_first_packet_v2_2 = -1; -static int hf_gvsp_gendc_payload_flow_flag_last_packet_v2_2 = -1; -static int hf_gvsp_gendc_payload_flow_id_v2_2 = -1; -static int hf_gvsp_gendc_container_header_signature_v2_2 = -1; -static int hf_gvsp_gendc_container_header_version_major_v2_2 = -1; -static int hf_gvsp_gendc_container_header_version_minor_v2_2 = -1; -static int hf_gvsp_gendc_container_header_version_sub_minor_v2_2 = -1; -static int hf_gvsp_gendc_container_header_type_v2_2 = -1; -static int hf_gvsp_gendc_container_header_flags_v2_2 = -1; -static int hf_gvsp_gendc_container_header_flags_timestamp_ptp_v2_2 = -1; -static int hf_gvsp_gendc_container_header_flags_component_invalid_v2_2 = -1; -static int hf_gvsp_gendc_container_header_flags_reserved_v2_2 = -1; -static int hf_gvsp_gendc_container_header_size_v2_2 = -1; -static int hf_gvsp_gendc_container_header_id_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_data_size_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_size_x_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_size_y_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_region_offset_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_format_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_timestamp_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_component_count_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_component_invalid_v2_2 = -1; -static int hf_gvsp_gendc_container_header_variable_fields_reserved_v2_2 = -1; -static int hf_gvsp_gendc_container_header_data_size_v2_2 = -1; -static int hf_gvsp_gendc_container_header_data_offset_v2_2 = -1; -static int hf_gvsp_gendc_container_header_descriptor_size_v2_2 = -1; -static int hf_gvsp_gendc_container_header_component_count_v2_2 = -1; -static int hf_gvsp_gendc_container_header_component_offset_v2_2 = -1; -static int hf_gvsp_gendc_component_header_flags_v2_2 = -1; -static int hf_gvsp_gendc_component_header_flags_invalid_v2_2 = -1; -static int hf_gvsp_gendc_component_header_flags_reserved_v2_2 = -1; -static int hf_gvsp_gendc_component_header_group_id_v2_2 = -1; -static int hf_gvsp_gendc_component_header_source_id_v2_2 = -1; -static int hf_gvsp_gendc_component_header_region_id_v2_2 = -1; -static int hf_gvsp_gendc_component_header_type_id_v2_2 = -1; -static int hf_gvsp_gendc_component_header_part_count_v2_2 = -1; -static int hf_gvsp_gendc_component_header_part_offset_v2_2 = -1; -static int hf_gvsp_gendc_part_header_flags_xml_reserved1_v2_2 = -1; -static int hf_gvsp_gendc_part_header_flags_xml_zip_v2_2 = -1; -static int hf_gvsp_gendc_part_header_flags_xml_chunk_v2_2 = -1; -static int hf_gvsp_gendc_part_header_flags_xml_reserved2_v2_2 = -1; -static int hf_gvsp_gendc_part_header_flags_v2_2 = -1; -static int hf_gvsp_gendc_part_header_flow_offset_v2_2 = -1; -static int hf_gvsp_gendc_part_header_type_specific_info_v2_2 = -1; -static int hf_gvsp_gendc_part_header_1D_size_v2_2 = -1; -static int hf_gvsp_gendc_part_header_1D_padding_v2_2 = -1; +static int hf_gvsp_gendc_leader_descriptor_size_v2_2; +static int hf_gvsp_gendc_leader_flags_v2_2; +static int hf_gvsp_gendc_leader_flags_preliminary_descriptor_v2_2; +static int hf_gvsp_gendc_leader_flags_reserved_v2_2; +static int hf_gvsp_gendc_payload_data_size_v2_2; +static int hf_gvsp_gendc_payload_data_destination_offset_v2_2; +static int hf_gvsp_gendc_payload_data_flags_v2_2; +static int hf_gvsp_gendc_payload_data_flag_descriptor_flags_v2_2; +static int hf_gvsp_gendc_payload_data_flag_start_of_descriptor_data_v2_2; +static int hf_gvsp_gendc_payload_data_flag_end_of_descriptor_data_v2_2; +static int hf_gvsp_gendc_payload_data_flags_reserved_v2_2; +static int hf_gvsp_gendc_payload_flow_flags_v2_2; +static int hf_gvsp_gendc_payload_flow_flag_first_packet_v2_2; +static int hf_gvsp_gendc_payload_flow_flag_last_packet_v2_2; +static int hf_gvsp_gendc_payload_flow_id_v2_2; +static int hf_gvsp_gendc_header_size_v2_2; +static int hf_gvsp_gendc_header_type_v2_2; +static int hf_gvsp_gendc_header_reserved_1_byte_v2_2; +static int hf_gvsp_gendc_header_reserved_2_bytes_v2_2; +static int hf_gvsp_gendc_header_reserved_4_bytes_v2_2; +static int hf_gvsp_gendc_container_header_signature_v2_2; +static int hf_gvsp_gendc_container_header_version_major_v2_2; +static int hf_gvsp_gendc_container_header_version_minor_v2_2; +static int hf_gvsp_gendc_container_header_version_sub_minor_v2_2; +static int hf_gvsp_gendc_container_header_flags_v2_2; +static int hf_gvsp_gendc_container_header_flags_timestamp_ptp_v2_2; +static int hf_gvsp_gendc_container_header_flags_component_invalid_v2_2; +static int hf_gvsp_gendc_container_header_flags_reserved_v2_2; +static int hf_gvsp_gendc_container_header_id_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_data_size_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_size_x_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_size_y_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_region_offset_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_format_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_timestamp_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_component_count_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_component_invalid_v2_2; +static int hf_gvsp_gendc_container_header_variable_fields_reserved_v2_2; +static int hf_gvsp_gendc_container_header_data_size_v2_2; +static int hf_gvsp_gendc_container_header_data_offset_v2_2; +static int hf_gvsp_gendc_container_header_descriptor_size_v2_2; +static int hf_gvsp_gendc_container_header_component_count_v2_2; +static int hf_gvsp_gendc_container_header_component_offset_v2_2; +static int hf_gvsp_gendc_component_header_flags_v2_2; +static int hf_gvsp_gendc_component_header_flags_invalid_v2_2; +static int hf_gvsp_gendc_component_header_flags_reserved_v2_2; +static int hf_gvsp_gendc_component_header_group_id_v2_2; +static int hf_gvsp_gendc_component_header_source_id_v2_2; +static int hf_gvsp_gendc_component_header_region_id_v2_2; +static int hf_gvsp_gendc_component_header_type_id_v2_2; +static int hf_gvsp_gendc_component_header_part_count_v2_2; +static int hf_gvsp_gendc_component_header_part_offset_v2_2; +static int hf_gvsp_gendc_part_header_flags_xml_reserved1_v2_2; +static int hf_gvsp_gendc_part_header_flags_xml_zip_v2_2; +static int hf_gvsp_gendc_part_header_flags_xml_chunk_v2_2; +static int hf_gvsp_gendc_part_header_flags_xml_reserved2_v2_2; +static int hf_gvsp_gendc_part_header_flags_v2_2; +static int hf_gvsp_gendc_part_header_flow_offset_v2_2; +static int hf_gvsp_gendc_part_header_type_specific_info_v2_2; +static int hf_gvsp_gendc_part_header_1D_size_v2_2; +static int hf_gvsp_gendc_part_header_1D_padding_v2_2; static int * const pixelformat_fields[] = { &hf_gvsp_pixelcolor, @@ -1415,7 +1418,7 @@ static gint dissect_file_leader(proto_tree *gvsp_tree, tvbuff_t *tvb, packet_inf /* Filename */ file_length = tvb_strsize(tvb, offset + 20); - proto_tree_add_item(gvsp_tree, hf_gvsp_filename, tvb, offset + 20, file_length, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvsp_tree, hf_gvsp_filename, tvb, offset + 20, file_length, ENC_ASCII); if (20 + file_length > G_MAXINT) return -1; @@ -1912,7 +1915,7 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p proto_tree* gvsp_gendc_container_header_component_offsets_tree = 0; /* GenDC container header signature */ - proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_signature_v2_2, tvb, offset + 16, 4, ENC_ASCII|ENC_NA); + proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_signature_v2_2, tvb, offset + 16, 4, ENC_ASCII); /* GenDC container header major version */ proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_version_major_v2_2, tvb, offset + 20, 1, ENC_LITTLE_ENDIAN); @@ -1923,15 +1926,18 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p /* GenDC container header sub minor version */ proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_version_sub_minor_v2_2, tvb, offset + 22, 1, ENC_LITTLE_ENDIAN); + /* GenDC 1 reserved byte */ + proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_header_reserved_1_byte_v2_2, tvb, offset + 23, 1, ENC_LITTLE_ENDIAN); + /* GenDC container header type */ - proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_type_v2_2, tvb, offset + 24, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_header_type_v2_2, tvb, offset + 24, 2, ENC_LITTLE_ENDIAN); /* GenDC container header flags */ proto_tree_add_bitmask(gvsp_gendc_container_descriptor_tree, tvb, offset + 26, hf_gvsp_gendc_container_header_flags_v2_2, ett_gvsp_gendc_container_header_flags, gendc_container_header_flags_fields, ENC_LITTLE_ENDIAN); /* GenDC container header size */ - proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_size_v2_2, tvb, offset + 28, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_header_size_v2_2, tvb, offset + 28, 4, ENC_LITTLE_ENDIAN); /* GenDC container header id */ proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_id_v2_2, tvb, offset + 32, 8, ENC_LITTLE_ENDIAN); @@ -1940,6 +1946,12 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p proto_tree_add_bitmask(gvsp_gendc_container_descriptor_tree, tvb, offset + 40, hf_gvsp_gendc_container_header_variable_fields_v2_2, ett_gvsp_gendc_container_header_variable_fields, gendc_container_header_variable_fields_fields, ENC_LITTLE_ENDIAN); + /* GenDC 2 reserved bytes */ + proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_header_reserved_2_bytes_v2_2, tvb, offset + 42, 2, ENC_LITTLE_ENDIAN); + + /* GenDC 4 reserved bytes */ + proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_header_reserved_4_bytes_v2_2, tvb, offset + 44, 4, ENC_LITTLE_ENDIAN); + /* GenDC container header data size */ proto_tree_add_item(gvsp_gendc_container_descriptor_tree, hf_gvsp_gendc_container_header_data_size_v2_2, tvb, offset + 48, 8, ENC_LITTLE_ENDIAN); @@ -1983,14 +1995,17 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p */ /* GenDC component header type */ - proto_tree_add_item(gvsp_gendc_component_header_tree, hf_gvsp_gendc_container_header_type_v2_2, tvb, component_offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(gvsp_gendc_component_header_tree, hf_gvsp_gendc_header_type_v2_2, tvb, component_offset, 2, ENC_LITTLE_ENDIAN); /* GenDC component header flags */ proto_tree_add_bitmask(gvsp_gendc_component_header_tree, tvb, component_offset + 2, hf_gvsp_gendc_component_header_flags_v2_2, ett_gvsp_gendc_component_header_flags, gendc_component_header_flags_fields, ENC_LITTLE_ENDIAN); /* GenDC component header size */ - proto_tree_add_item(gvsp_gendc_component_header_tree, hf_gvsp_gendc_container_header_size_v2_2, tvb, component_offset + 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(gvsp_gendc_component_header_tree, hf_gvsp_gendc_header_size_v2_2, tvb, component_offset + 4, 4, ENC_LITTLE_ENDIAN); + + /* GenDC 2 reserved bytes */ + proto_tree_add_item(gvsp_gendc_component_header_tree, hf_gvsp_gendc_header_reserved_2_bytes_v2_2, tvb, component_offset + 8, 2, ENC_LITTLE_ENDIAN); /* GenDC component header group id */ proto_tree_add_item(gvsp_gendc_component_header_tree, hf_gvsp_gendc_component_header_group_id_v2_2, tvb, component_offset + 10, 2, ENC_LITTLE_ENDIAN); @@ -2017,6 +2032,9 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p proto_tree_add_bitmask(gvsp_gendc_component_header_tree, tvb, component_offset + 40, hf_gvsp_pixelformat, ett_gvsp_pixelformat, pixelformat_fields, ENC_LITTLE_ENDIAN); + /* GenDC 2 reserved bytes */ + proto_tree_add_item(gvsp_gendc_component_header_tree, hf_gvsp_gendc_header_reserved_2_bytes_v2_2, tvb, component_offset + 44, 2, ENC_LITTLE_ENDIAN); + /* GenDC component header part count */ proto_tree_add_item(gvsp_gendc_component_header_tree, hf_gvsp_gendc_component_header_part_count_v2_2, tvb, component_offset + 46, 2, ENC_LITTLE_ENDIAN); @@ -2045,7 +2063,7 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p */ /* GenDC part header type */ - proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_container_header_type_v2_2, tvb, part_offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_header_type_v2_2, tvb, part_offset, 2, ENC_LITTLE_ENDIAN); /* GenDC part header flags */ if( part_type == GENDC_HEADER_TYPE_PART_XML ) @@ -2059,11 +2077,14 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p } /* GenDC part header size */ - proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_container_header_size_v2_2, tvb, part_offset + 4, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_header_size_v2_2, tvb, part_offset + 4, 4, ENC_LITTLE_ENDIAN); /* GenDC part header format */ proto_tree_add_bitmask(gvsp_gendc_part_header_tree, tvb, part_offset + 8, hf_gvsp_pixelformat, ett_gvsp_pixelformat, pixelformat_fields, ENC_LITTLE_ENDIAN); + /* GenDC 2 reserved bytes */ + proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_header_reserved_2_bytes_v2_2, tvb, part_offset + 12, 2, ENC_LITTLE_ENDIAN); + /* Flow ID */ proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_payload_flow_id_v2_2, tvb, part_offset + 14, 2, ENC_LITTLE_ENDIAN); @@ -2080,7 +2101,6 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p { case GENDC_HEADER_TYPE_PART_CHUNK: case GENDC_HEADER_TYPE_PART_XML: - break; case GENDC_HEADER_TYPE_PART_1D: /* GenDC part header size */ proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_part_header_1D_size_v2_2, tvb, part_offset + 40, 8, ENC_LITTLE_ENDIAN); @@ -2088,6 +2108,9 @@ static void dissect_packet_payload_gendc(proto_tree *gvsp_tree, tvbuff_t *tvb, p /* GenDC part header padding */ proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_part_header_1D_padding_v2_2, tvb, part_offset + 48, 4, ENC_LITTLE_ENDIAN); + /* GenDC 4 reserved bytes */ + proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_header_reserved_4_bytes_v2_2, tvb, part_offset + 52, 4, ENC_LITTLE_ENDIAN); + /* GenDC part header type specific */ proto_tree_add_item(gvsp_gendc_part_header_tree, hf_gvsp_gendc_part_header_type_specific_info_v2_2, tvb, part_offset + 56, 8, ENC_LITTLE_ENDIAN); break; @@ -2431,7 +2454,7 @@ static int dissect_gvsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi /* At this point offset is pointing to end of packet */ - col_append_fstr(pinfo->cinfo, COL_INFO, "[Block ID: %" G_GINT64_MODIFIER "u Packet ID: %d] ", (guint64)info.blockid, info.packetid); + col_append_fstr(pinfo->cinfo, COL_INFO, "[Block ID: %" PRIu64 " Packet ID: %d] ", (guint64)info.blockid, info.packetid); if (info.flag_resendrangeerror != 0) { @@ -2573,625 +2596,625 @@ void proto_register_gvsp(void) static hf_register_info hfgvsp[] = { - {& hf_gvsp_status, + {&hf_gvsp_status, { "Status", "gvsp.status", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &statusnames_ext, 0x0, NULL, HFILL }}, - {& hf_gvsp_blockid16, + {&hf_gvsp_blockid16, { "Block ID (16 bits)", "gvsp.blockid16", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_flags, + {&hf_gvsp_flags, { "Flags", "gvsp.flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_flagdevicespecific0, + {&hf_gvsp_flagdevicespecific0, { "Flag Device Specific 0", "gvsp.flag.devicespecific0", FT_UINT16, BASE_HEX, NULL, 0x8000, NULL, HFILL }}, - {& hf_gvsp_flagdevicespecific1, + {&hf_gvsp_flagdevicespecific1, { "Flag Device Specific 1", "gvsp.flag.devicespecific1", FT_UINT16, BASE_HEX, NULL, 0x4000, NULL, HFILL }}, - {& hf_gvsp_flagdevicespecific2, + {&hf_gvsp_flagdevicespecific2, { "Flag Device Specific 2", "gvsp.flag.devicespecific2", FT_UINT16, BASE_HEX, NULL, 0x2000, NULL, HFILL }}, - {& hf_gvsp_flagdevicespecific3, + {&hf_gvsp_flagdevicespecific3, { "Flag Device Specific 3", "gvsp.flag.devicespecific3", FT_UINT16, BASE_HEX, NULL, 0x1000, NULL, HFILL }}, - {& hf_gvsp_flagdevicespecific4, + {&hf_gvsp_flagdevicespecific4, { "Flag Device Specific 4", "gvsp.flag.devicespecific4", FT_UINT16, BASE_HEX, NULL, 0x0800, NULL, HFILL }}, - {& hf_gvsp_flagdevicespecific5, + {&hf_gvsp_flagdevicespecific5, { "Flag Device Specific 5", "gvsp.flag.devicespecific5", FT_UINT16, BASE_HEX, NULL, 0x0400, NULL, HFILL }}, - {& hf_gvsp_flagdevicespecific6, + {&hf_gvsp_flagdevicespecific6, { "Flag Device Specific 6", "gvsp.flag.devicespecific6", FT_UINT16, BASE_HEX, NULL, 0x0200, NULL, HFILL }}, - {& hf_gvsp_flagdevicespecific7, + {&hf_gvsp_flagdevicespecific7, { "Flag Device Specific 7", "gvsp.flag.devicespecific7", FT_UINT16, BASE_HEX, NULL, 0x0100, NULL, HFILL }}, - {& hf_gvsp_flagresendrangeerror, + {&hf_gvsp_flagresendrangeerror, { "Flag Resend Range Error", "gvsp.flag.resendrangeerror", FT_UINT16, BASE_HEX, NULL, 0x0004, NULL, HFILL }}, - {& hf_gvsp_flagpreviousblockdropped, + {&hf_gvsp_flagpreviousblockdropped, { "Flag Previous Block Dropped", "gvsp.flag.previousblockdropped", FT_UINT16, BASE_HEX, NULL, 0x0002, NULL, HFILL }}, - {& hf_gvsp_flagpacketresend, + {&hf_gvsp_flagpacketresend, { "Flag Packet Resend", "gvsp.flag.packetresend", FT_UINT16, BASE_HEX, NULL, 0x0001, NULL, HFILL }}, - {& hf_gvsp_format, + {&hf_gvsp_format, { "Format", "gvsp.format", FT_UINT8, BASE_HEX, VALS(formatnames), 0, NULL, HFILL }}, - {& hf_gvsp_packetid24, + {&hf_gvsp_packetid24, { "Packet ID (24 bits)", "gvsp.packetid24", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_blockid64, + {&hf_gvsp_blockid64, { "Block ID (64 bits v2.0)", "gvsp.blockid64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_packetid32, + {&hf_gvsp_packetid32, { "Packet ID (32 bits v2.0)", "gvsp.packetid32", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_payloadtype, + {&hf_gvsp_payloadtype, { "Payload Type", "gvsp.payloadtype", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &payloadtypenames_ext, 0x0, NULL, HFILL }}, - {& hf_gvsp_payloaddata, + {&hf_gvsp_payloaddata, { "Payload Data", "gvsp.payloaddata", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_timestamp, + {&hf_gvsp_timestamp, { "Timestamp", "gvsp.timestamp", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_pixelformat, + {&hf_gvsp_pixelformat, { "Pixel Format", "gvsp.pixel", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &pixeltypenames_ext, 0x0, NULL, HFILL }}, - {& hf_gvsp_sizex, + {&hf_gvsp_sizex, { "Size X", "gvsp.sizex", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_sizey, + {&hf_gvsp_sizey, { "Size Y", "gvsp.sizey", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_offsetx, + {&hf_gvsp_offsetx, { "Offset X", "gvsp.offsetx", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_offsety, + {&hf_gvsp_offsety, { "Offset Y", "gvsp.offsety", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_paddingx, + {&hf_gvsp_paddingx, { "Padding X", "gvsp.paddingx", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_paddingy, + {&hf_gvsp_paddingy, { "Padding Y", "gvsp.paddingy", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_payloaddatasize, + {&hf_gvsp_payloaddatasize, { "Payload Data Size", "gvsp.payloaddatasize", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_pixelcolor, + {&hf_gvsp_pixelcolor, { "Monochrome or Color", "gvsp.pixel.color", FT_UINT32, BASE_HEX, VALS(colornames), 0xFF000000, NULL, HFILL }}, - {& hf_gvsp_pixeloccupy, + {&hf_gvsp_pixeloccupy, { "Occupy Bits", "gvsp.pixel.occupy", FT_UINT32, BASE_DEC, NULL, 0x00FF0000, NULL, HFILL }}, - {& hf_gvsp_pixelid, + {&hf_gvsp_pixelid, { "ID", "gvsp.pixel.id", FT_UINT32, BASE_HEX, NULL, 0x0000FFFF, NULL, HFILL }}, - {& hf_gvsp_filename, - { "ID", "gvsp.filename", + {&hf_gvsp_filename, + { "Filename", "gvsp.filename", FT_STRINGZ, BASE_NONE, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_payloadlength, + {&hf_gvsp_payloadlength, { "Payload Length", "gvsp.payloadlength", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_fieldinfo, + {&hf_gvsp_fieldinfo, { "Field Info", "gvsp.fieldinfo", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_fieldid, + {&hf_gvsp_fieldid, { "Field ID", "gvsp.fieldid", FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL }}, - {& hf_gvsp_fieldcount, + {&hf_gvsp_fieldcount, { "Field Count", "gvsp.fieldcount", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }}, - {& hf_gvsp_genericflags, + {&hf_gvsp_genericflags, { "Generic Flag", "gvsp.genericflag", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_timestamptickfrequency , + {&hf_gvsp_timestamptickfrequency , { "Timestamp Tick Frequency", "gvsp.timestamptickfrequency", FT_UINT64, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_dataformat, + {&hf_gvsp_dataformat, { "Data Format", "gvsp.dataformat", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_packetizationmode, + {&hf_gvsp_packetizationmode, { "packetization_mode", "gvsp.packetizationmode", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_packetsize, + {&hf_gvsp_packetsize, { "packet_size", "gvsp.packetsize", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_profileidc, + {&hf_gvsp_profileidc, { "profile_idc", "gvsp.profileidc", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_cs, + {&hf_gvsp_cs, { "cs", "gvsp.cs", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_cs0, + {&hf_gvsp_cs0, { "cs0", "gvsp.cs0", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL }}, - {& hf_gvsp_cs1, + {&hf_gvsp_cs1, { "cs1", "gvsp.cs1", FT_UINT8, BASE_HEX, NULL, 0x40, NULL, HFILL }}, - {& hf_gvsp_cs2, + {&hf_gvsp_cs2, { "cs2", "gvsp.cs2", FT_UINT8, BASE_HEX, NULL, 0x20, NULL, HFILL }}, - {& hf_gvsp_cs3, + {&hf_gvsp_cs3, { "cs3", "gvsp.cs3", FT_UINT8, BASE_HEX, NULL, 0x10, NULL, HFILL }}, - {& hf_gvsp_levelidc, + {&hf_gvsp_levelidc, { "level_idc", "gvsp.levelidc", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_sropinterleavingdepth, + {&hf_gvsp_sropinterleavingdepth, { "srop_interleaving_depth", "gvsp.sropinterleavingdepth", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_sropmaxdondiff, + {&hf_gvsp_sropmaxdondiff, { "srop_max_don_diff", "gvsp.sropmaxdondiff", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_sropdeintbufreq, + {&hf_gvsp_sropdeintbufreq, { "srop_deint_buf_req", "gvsp.sropdeintbufreq", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_sropinitbuftime, + {&hf_gvsp_sropinitbuftime, { "srop_init_buf_time", "gvsp.sropinitbuftime", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_add_zones, + {&hf_gvsp_add_zones, { "Additional Zones (Multi-Zone)", "gvsp.addzones", FT_UINT8, BASE_HEX, NULL, 0x1F, NULL, HFILL }}, - {& hf_gvsp_zoneinfo, + {&hf_gvsp_zoneinfo, { "Zone Info (Multi-Zone)", "gvsp.multizoneinfo", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_zoneid, + {&hf_gvsp_zoneid, { "Zone ID", "gvsp.zoneid", FT_UINT8, BASE_HEX, NULL, 0x3E, NULL, HFILL }}, - {& hf_gvsp_endofzone, + {&hf_gvsp_endofzone, { "End of Zone", "gvsp.endofzone", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, - {& hf_gvsp_addressoffset, + {&hf_gvsp_addressoffset, { "Address Offset", "gvsp.addressoffset", FT_UINT64, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_sc_zone_direction, + {&hf_gvsp_sc_zone_direction, { "Zone Directions Mask", "gvsp.zonedirection", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_sc_zone0_direction, + {&hf_gvsp_sc_zone0_direction, { "Zone 0 Direction", "gvsp.zone0direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x80000000, NULL, HFILL }}, - {& hf_gvsp_sc_zone1_direction, + {&hf_gvsp_sc_zone1_direction, { "Zone 1 Direction", "gvsp.zone1direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x40000000, NULL, HFILL }}, - {& hf_gvsp_sc_zone2_direction, + {&hf_gvsp_sc_zone2_direction, { "Zone 2 Direction", "gvsp.zone2direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x20000000, NULL, HFILL }}, - {& hf_gvsp_sc_zone3_direction, + {&hf_gvsp_sc_zone3_direction, { "Zone 3 Direction", "gvsp.zone3direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x10000000, NULL, HFILL }}, - {& hf_gvsp_sc_zone4_direction, + {&hf_gvsp_sc_zone4_direction, { "Zone 4 Direction", "gvsp.zone4direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x08000000, NULL, HFILL }}, - {& hf_gvsp_sc_zone5_direction, + {&hf_gvsp_sc_zone5_direction, { "Zone 5 Direction", "gvsp.zone5direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x04000000, NULL, HFILL }}, - {& hf_gvsp_sc_zone6_direction, + {&hf_gvsp_sc_zone6_direction, { "Zone 6 Direction", "gvsp.zone6direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x02000000, NULL, HFILL }}, - {& hf_gvsp_sc_zone7_direction, + {&hf_gvsp_sc_zone7_direction, { "Zone 7 Direction", "gvsp.zone7direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x01000000, NULL, HFILL }}, - {& hf_gvsp_sc_zone8_direction, + {&hf_gvsp_sc_zone8_direction, { "Zone 8 Direction", "gvsp.zone8direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00800000, NULL, HFILL }}, - {& hf_gvsp_sc_zone9_direction, + {&hf_gvsp_sc_zone9_direction, { "Zone 9 Direction", "gvsp.zone9direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00400000, NULL, HFILL }}, - {& hf_gvsp_sc_zone10_direction, + {&hf_gvsp_sc_zone10_direction, { "Zone 10 Direction", "gvsp.zone10direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00200000, NULL, HFILL }}, - {& hf_gvsp_sc_zone11_direction, - { "Zone 11 Direction", "gvsp.zone1direction", + {&hf_gvsp_sc_zone11_direction, + { "Zone 11 Direction", "gvsp.zone11direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00100000, NULL, HFILL }}, - {& hf_gvsp_sc_zone12_direction, + {&hf_gvsp_sc_zone12_direction, { "Zone 12 Direction", "gvsp.zone12direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00080000, NULL, HFILL }}, - {& hf_gvsp_sc_zone13_direction, + {&hf_gvsp_sc_zone13_direction, { "Zone 13 Direction", "gvsp.zone13direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00040000, NULL, HFILL }}, - {& hf_gvsp_sc_zone14_direction, + {&hf_gvsp_sc_zone14_direction, { "Zone 14 Direction", "gvsp.zone14direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00020000, NULL, HFILL }}, - {& hf_gvsp_sc_zone15_direction, + {&hf_gvsp_sc_zone15_direction, { "Zone 15 Direction", "gvsp.zone15direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00010000, NULL, HFILL }}, - {& hf_gvsp_sc_zone16_direction, + {&hf_gvsp_sc_zone16_direction, { "Zone 16 Direction", "gvsp.zone16direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00008000, NULL, HFILL }}, - {& hf_gvsp_sc_zone17_direction, + {&hf_gvsp_sc_zone17_direction, { "Zone 17 Direction", "gvsp.zone17direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00004000, NULL, HFILL }}, - {& hf_gvsp_sc_zone18_direction, + {&hf_gvsp_sc_zone18_direction, { "Zone 18 Direction", "gvsp.zone18direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00002000, NULL, HFILL }}, - {& hf_gvsp_sc_zone19_direction, + {&hf_gvsp_sc_zone19_direction, { "Zone 19 Direction", "gvsp.zone19direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00001000, NULL, HFILL }}, - {& hf_gvsp_sc_zone20_direction, + {&hf_gvsp_sc_zone20_direction, { "Zone 20 Direction", "gvsp.zone20direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000800, NULL, HFILL }}, - {& hf_gvsp_sc_zone21_direction, + {&hf_gvsp_sc_zone21_direction, { "Zone 21 Direction", "gvsp.zone21direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000400, NULL, HFILL }}, - {& hf_gvsp_sc_zone22_direction, + {&hf_gvsp_sc_zone22_direction, { "Zone 22 Direction", "gvsp.zone22direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000200, NULL, HFILL }}, - {& hf_gvsp_sc_zone23_direction, + {&hf_gvsp_sc_zone23_direction, { "Zone 23 Direction", "gvsp.zone23direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000100, NULL, HFILL }}, - {& hf_gvsp_sc_zone24_direction, + {&hf_gvsp_sc_zone24_direction, { "Zone 24 Direction", "gvsp.zone24direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000080, NULL, HFILL }}, - {& hf_gvsp_sc_zone25_direction, + {&hf_gvsp_sc_zone25_direction, { "Zone 25 Direction", "gvsp.zone25direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000040, NULL, HFILL }}, - {& hf_gvsp_sc_zone26_direction, + {&hf_gvsp_sc_zone26_direction, { "Zone 26 Direction", "gvsp.zone26direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000020, NULL, HFILL }}, - {& hf_gvsp_sc_zone27_direction, + {&hf_gvsp_sc_zone27_direction, { "Zone 27 Direction", "gvsp.zone27direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000010, NULL, HFILL }}, - {& hf_gvsp_sc_zone28_direction, + {&hf_gvsp_sc_zone28_direction, { "Zone 28 Direction", "gvsp.zone28direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000008, NULL, HFILL }}, - {& hf_gvsp_sc_zone29_direction, + {&hf_gvsp_sc_zone29_direction, { "Zone 29 Direction", "gvsp.zone29direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000004, NULL, HFILL }}, - {& hf_gvsp_sc_zone30_direction, + {&hf_gvsp_sc_zone30_direction, { "Zone 30 Direction", "gvsp.zone30direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000002, NULL, HFILL }}, - {& hf_gvsp_sc_zone31_direction, + {&hf_gvsp_sc_zone31_direction, { "Zone 31 Direction", "gvsp.zone31direction", FT_BOOLEAN, 32, TFS(&zonedirectionnames), 0x00000001, NULL, HFILL }}, - {& hf_gvsp_numparts, + {&hf_gvsp_numparts, { "Multi-part number of parts", "gvsp.numparts", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_multipart_data_type, + {&hf_gvsp_multipart_data_type, { "Data Type", "gvsp.multipartdatatype", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &multipartdatatypenames_ext, 0, NULL, HFILL }}, - {& hf_gvsp_partlength, + {&hf_gvsp_partlength, { "Part Length", "gvsp.partlength", FT_UINT64, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_multi_part_source_id, + {&hf_gvsp_multi_part_source_id, { "Source ID", "gvsp.sourceid", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_data_purpose_id, + {&hf_gvsp_data_purpose_id, { "Data Purpose ID", "gvsp.datapurposeid", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_region_id, + {&hf_gvsp_region_id, { "Region ID", "gvsp.regionid", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_data_type_specific, + {&hf_gvsp_data_type_specific, { "Data Type Specific", "gvsp.datatypespecific", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_endofpart, + {&hf_gvsp_endofpart, { "End of Part", "gvsp.endofpart", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }}, - {& hf_gvsp_add_zones_multipart, + {&hf_gvsp_add_zones_multipart, { "Additional Zones (Multi-Part)", "gvsp.multipartaddzones", FT_UINT8, BASE_HEX, NULL, 0x1F, NULL, HFILL }}, - {& hf_gvsp_zoneinfo_multipart, + {&hf_gvsp_zoneinfo_multipart, { "Zone Info (Multi-Part)", "gvsp.multipartzoneinfo", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_multi_part_part_id, + {&hf_gvsp_multi_part_part_id, { "Part ID", "gvsp.partid", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, - {& hf_gvsp_chunk_data_payload_length_hex, + {&hf_gvsp_chunk_data_payload_length_hex, { "Chunk Data Payload Length", "gvsp.chunkdatapayloadlengthhex", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, - {& hf_gvsp_chunk_layout_id_hex, + {&hf_gvsp_chunk_layout_id_hex, { "Chunk Layout ID", "gvsp.chunklayoutidhex", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL @@ -3288,6 +3311,36 @@ void proto_register_gvsp(void) NULL, HFILL } }, + { &hf_gvsp_gendc_header_type_v2_2, + { "Header Type", "gvsp.gendc.header.type", + FT_UINT16, BASE_HEX, VALS(gendc_header_type_values), 0x0, + NULL, HFILL + } }, + + { &hf_gvsp_gendc_header_size_v2_2, + { "Size", "gvsp.gendc.header.size", + FT_UINT32, BASE_HEX_DEC, NULL, 0x0, + NULL, HFILL + } }, + + { &hf_gvsp_gendc_header_reserved_1_byte_v2_2, + { "Reserved (1 Byte)", "gvsp.gendc.header.reserved1", + FT_UINT8, BASE_HEX, NULL, 0x0, + NULL, HFILL + } }, + + { &hf_gvsp_gendc_header_reserved_2_bytes_v2_2, + { "Reserved (2 Bytes)", "gvsp.gendc.header.reserved2", + FT_UINT16, BASE_HEX, NULL, 0x0, + NULL, HFILL + } }, + + { &hf_gvsp_gendc_header_reserved_4_bytes_v2_2, + { "Reserved (4 Bytes)", "gvsp.gendc.header.reserved4", + FT_UINT32, BASE_HEX, NULL, 0x0, + NULL, HFILL + } }, + { &hf_gvsp_gendc_container_header_signature_v2_2, { "Signature", "gvsp.gendc.container.header.signature", FT_STRING, BASE_NONE, NULL, 0x0, @@ -3312,12 +3365,6 @@ void proto_register_gvsp(void) NULL, HFILL } }, - { &hf_gvsp_gendc_container_header_type_v2_2, - { "Header Type", "gvsp.gendc.container.header.type", - FT_UINT16, BASE_HEX, VALS(gendc_header_type_values), 0x0, - NULL, HFILL - } }, - { &hf_gvsp_gendc_container_header_flags_v2_2, { "Flags", "gvsp.gendc.container.header.flags", FT_UINT16, BASE_HEX, NULL, 0x0, @@ -3342,12 +3389,6 @@ void proto_register_gvsp(void) NULL, HFILL } }, - { &hf_gvsp_gendc_container_header_size_v2_2, - { "Size", "gvsp.gendc.container.header.size", - FT_UINT32, BASE_HEX_DEC, NULL, 0x0, - NULL, HFILL - } }, - { &hf_gvsp_gendc_container_header_id_v2_2, { "ID", "gvsp.gendc.container.header.id", FT_UINT64, BASE_HEX_DEC, NULL, 0x0, @@ -3523,7 +3564,7 @@ void proto_register_gvsp(void) } }, { &hf_gvsp_gendc_part_header_flags_v2_2, - { "Reserved", "gvsp.gendc.part.header.flags", + { "Flags", "gvsp.gendc.part.header.flags", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, @@ -3541,13 +3582,13 @@ void proto_register_gvsp(void) } }, { &hf_gvsp_gendc_part_header_1D_size_v2_2, - { "Size", "gvsp.gendc.part.header.1d.size", + { "Size (1D Data)", "gvsp.gendc.part.header.1d.size", FT_UINT64, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_gvsp_gendc_part_header_1D_padding_v2_2, - { "Size", "gvsp.gendc.part.header.1d.padding", + { "Padding (1D Data)", "gvsp.gendc.part.header.1d.padding", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL } }, |