osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Comment out cases of unused hf array entries found by checkhf. 

svn path=/trunk/; revision=47302
This commit is contained in:
Bill Meier 2013-01-26 18:54:53 +00:00
parent 33df8647d5
commit 0960e508e4
66 changed files with 1616 additions and 1268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-ncp-nmas.c
View File

@ -35,8 +35,8 @@
static gint ett_nmas = -1;
static int proto_nmas = -1;
static int hf_func = -1;
static int hf_subfunc = -1;
/* static int hf_func = -1; */
/* static int hf_subfunc = -1; */
static int hf_ping_version = -1;
static int hf_ping_flags = -1;
static int hf_frag_handle = -1;
@ -48,7 +48,7 @@ static int hf_nmas_version = -1;
static int hf_msg_version = -1;
static int hf_session_ident = -1;
static int hf_msg_verb = -1;
static int hf_attribute = -1;
/* static int hf_attribute = -1; */
static int hf_clearance = -1;
static int hf_login_sequence = -1;
static int hf_opaque = -1;
@ -652,13 +652,17 @@ void
proto_register_nmas(void)
{
static hf_register_info hf_nmas[] = {
/**
{ &hf_func,
{ "Function", "nmas.func", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
**/
/**
{ &hf_subfunc,
{ "Subfunction", "nmas.subfunc", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_ping_version,
{ "Ping Version", "nmas.ping_version", FT_UINT32, BASE_HEX, NULL, 0x0,
@ -707,9 +711,11 @@ proto_register_nmas(void)
{ "Message Verb", "nmas.msg_verb", FT_UINT8, BASE_HEX, VALS(nmas_msgverb_enum), 0x0,
NULL, HFILL }},
/**
{ &hf_attribute,
{ "Attribute Type", "nmas.attribute", FT_UINT32, BASE_DEC, VALS(nmas_attribute_enum), 0x0,
NULL, HFILL }},
**/
{ &hf_clearance,
{ "Requested Clearance", "nmas.clearance",

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

@ -94,7 +94,7 @@ static int hf_ncp_completion_code = -1;
static int hf_ncp_connection_status = -1;
static int hf_ncp_slot = -1;
static int hf_ncp_control_code = -1;
static int hf_ncp_fragment_handle = -1;
/* static int hf_ncp_fragment_handle = -1; */
static int hf_lip_echo = -1;
static int hf_ncp_burst_command = -1;
static int hf_ncp_burst_file_handle = -1;
@ -1022,10 +1022,12 @@ proto_register_ncp(void)
{ "Control Code", "ncp.control_code",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
/**
{ &hf_ncp_fragment_handle,
{ "Fragment Handle", "ncp.fragger_hndl",
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_lip_echo,
{ "Large Internet Packet Echo", "ncp.lip_echo",
FT_STRING, BASE_NONE, NULL, 0x0,

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

@ -137,10 +137,10 @@ static int hf_ndmp_execute_cdb_flags_data_out = -1;
static int hf_ndmp_execute_cdb_timeout = -1;
static int hf_ndmp_execute_cdb_datain_len = -1;
static int hf_ndmp_execute_cdb_cdb_len = -1;
static int hf_ndmp_execute_cdb_dataout = -1;
/* static int hf_ndmp_execute_cdb_dataout = -1; */
static int hf_ndmp_execute_cdb_status = -1;
static int hf_ndmp_execute_cdb_dataout_len = -1;
static int hf_ndmp_execute_cdb_datain = -1;
/* static int hf_ndmp_execute_cdb_datain = -1; */
static int hf_ndmp_execute_cdb_sns_len = -1;
static int hf_ndmp_tape_invalid_file_num = -1;
static int hf_ndmp_tape_invalid_soft_errors = -1;
@ -3869,9 +3869,11 @@ proto_register_ndmp(void)
"CDB length", "ndmp.execute_cdb.cdb_len", FT_UINT32, BASE_DEC,
NULL, 0, "Length of CDB", HFILL }},
/**
{ &hf_ndmp_execute_cdb_dataout, {
"Data out", "ndmp.execute_cdb.dataout", FT_BYTES, BASE_NONE,
NULL, 0, "Data to be transferred to the SCSI device", HFILL }},
**/
{ &hf_ndmp_execute_cdb_status, {
"Status", "ndmp.execute_cdb.status", FT_UINT8, BASE_DEC,
@ -3881,9 +3883,11 @@ proto_register_ndmp(void)
"Data out length", "ndmp.execute_cdb.dataout_len", FT_UINT32, BASE_DEC,
NULL, 0, "Number of bytes transferred to the device", HFILL }},
/**
{ &hf_ndmp_execute_cdb_datain, {
"Data in", "ndmp.execute_cdb.datain", FT_BYTES, BASE_NONE,
NULL, 0, "Data transferred from the SCSI device", HFILL }},
**/
{ &hf_ndmp_execute_cdb_sns_len, {
"Sense data length", "ndmp.execute_cdb.sns_len", FT_UINT32, BASE_DEC,

40
epan/dissectors/packet-ndps.c
View File

@ -80,11 +80,11 @@ static int hf_ndps_length = -1;
static int hf_ndps_xid = -1;
static int hf_ndps_packet_type = -1;
static int hf_ndps_rpc_version = -1;
static int hf_ndps_error = -1;
/* static int hf_ndps_error = -1; */
static int hf_ndps_num_objects = -1;
static int hf_ndps_num_attributes = -1;
static int hf_ndps_sbuffer = -1;
static int hf_ndps_rbuffer = -1;
/* static int hf_ndps_sbuffer = -1; */
/* static int hf_ndps_rbuffer = -1; */
static int hf_ndps_user_name = -1;
static int hf_ndps_broker_name = -1;
static int hf_ndps_num_results = -1;
@ -200,7 +200,7 @@ static int hf_ndps_item_ptr = -1;
static int hf_ndps_len = -1;
static int hf_ndps_limit_enc = -1;
static int hf_ndps_delivery_add_count = -1;
static int hf_ndps_qualified_name2 = -1;
/* static int hf_ndps_qualified_name2 = -1; */
static int hf_ndps_delivery_add_type = -1;
static int hf_ndps_criterion_type = -1;
static int hf_ndps_num_ignored_attributes = -1;
@ -230,8 +230,8 @@ static int hf_ndps_attrs_arg = -1;
static int hf_ndps_context_len = -1;
static int hf_ndps_context = -1;
static int hf_ndps_filter = -1;
static int hf_ndps_item_filter = -1;
static int hf_ndps_substring_match = -1;
/* static int hf_ndps_item_filter = -1; */
/* static int hf_ndps_substring_match = -1; */
static int hf_ndps_time_limit = -1;
static int hf_ndps_count_limit = -1;
static int hf_ndps_operator = -1;
@ -254,7 +254,7 @@ static int hf_font_type = -1;
static int hf_printer_id = -1;
static int hf_ndps_font_name = -1;
static int hf_ndps_return_code = -1;
static int hf_ndps_banner_count = -1;
/* static int hf_ndps_banner_count = -1; */
static int hf_ndps_banner_name = -1;
static int hf_ndps_font_type_count = -1;
static int hf_font_type_name = -1;
@ -276,7 +276,7 @@ static int hf_res_type = -1;
static int hf_file_timestamp = -1;
static int hf_sub_complete = -1;
static int hf_doc_content = -1;
static int hf_ndps_doc_name = -1;
/* static int hf_ndps_doc_name = -1; */
static int hf_print_arg = -1;
static int hf_local_id = -1;
static int hf_ndps_included_doc_len = -1;
@ -309,7 +309,7 @@ static int hf_info_int16 = -1;
static int hf_info_int32 = -1;
static int hf_info_boolean = -1;
static int hf_info_string = -1;
static int hf_info_bytes = -1;
/* static int hf_info_bytes = -1; */
static int hf_ndps_list_local_servers_type = -1;
static int hf_ndps_registry_name = -1;
static int hf_ndps_client_server_type = -1;
@ -335,7 +335,7 @@ static int hf_ndps_object_ids_13 = -1;
static int hf_ndps_object_ids_14 = -1;
static int hf_ndps_object_ids_15 = -1;
static int hf_ndps_object_ids_16 = -1;
static int hf_ndps_attribute_time = -1;
/* static int hf_ndps_attribute_time = -1; */
static int hf_print_security = -1;
static int hf_notify_time_interval = -1;
static int hf_notify_sequence_number = -1;
@ -8353,10 +8353,12 @@ proto_register_ndps(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
/**
{ &hf_ndps_error,
{ "NDPS Error", "spx.ndps_error",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_ndps_other_error_string,
{ "Extended Error String", "ndps.ext_err_string",
@ -8403,15 +8405,19 @@ proto_register_ndps(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
/**
{ &hf_ndps_sbuffer,
{ "Server", "ndps.sbuffer",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
**/
/**
{ &hf_ndps_rbuffer,
{ "Connection", "ndps.rbuffer",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_ndps_user_name,
{ "Trustee Name", "ndps.user_name",
@ -8598,10 +8604,12 @@ proto_register_ndps(void)
FT_UINT32, BASE_HEX, VALS(qualified_name_enum), 0x0,
NULL, HFILL }},
/**
{ &hf_ndps_qualified_name2,
{ "Qualified Name Type", "ndps.qual_name_type2",
FT_UINT32, BASE_HEX, VALS(qualified_name_enum2), 0x0,
NULL, HFILL }},
**/
{ &hf_ndps_item_count,
{ "Number of Items", "ndps.item_count",
@ -9138,15 +9146,19 @@ proto_register_ndps(void)
FT_UINT32, BASE_HEX, VALS(ndps_filter_enum), 0x0,
NULL, HFILL }},
/**
{ &hf_ndps_item_filter,
{ "Filter Item Operation", "ndps.filter_item",
FT_UINT32, BASE_HEX, VALS(ndps_filter_item_enum), 0x0,
NULL, HFILL }},
**/
/**
{ &hf_ndps_substring_match,
{ "Substring Match", "ndps.substring_match",
FT_UINT32, BASE_HEX, VALS(ndps_match_criteria_enum), 0x0,
NULL, HFILL }},
**/
{ &hf_ndps_time_limit,
{ "Time Limit", "ndps.time_limit",
@ -9258,10 +9270,12 @@ proto_register_ndps(void)
FT_UINT32, BASE_HEX, VALS(ndps_error_types), 0x0,
NULL, HFILL }},
/**
{ &hf_ndps_banner_count,
{ "Number of Banners", "ndps.banner_count",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_ndps_banner_name,
{ "Banner Name", "ndps.banner_name",
@ -9409,10 +9423,12 @@ proto_register_ndps(void)
FT_UINT32, BASE_DEC, VALS(ndps_doc_content_enum), 0x0,
NULL, HFILL }},
/**
{ &hf_ndps_doc_name,
{ "Document Name", "ndps.doc_name",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_local_id,
{ "Local ID", "ndps.local_id",
@ -9569,10 +9585,12 @@ proto_register_ndps(void)
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/**
{ &hf_info_bytes,
{ "Byte Value", "ndps.info_bytes",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_ndps_list_local_servers_type,
{ "Server Type", "ndps.list_local_server_type",
@ -9699,10 +9717,12 @@ proto_register_ndps(void)
FT_NONE, BASE_NONE, NULL,
0x0, NULL, HFILL }},
/**
{ &hf_ndps_attribute_time,
{ "Time", "ndps.attribute_time",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_print_security,
{ "Printer Security", "ndps.print_security",

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

@ -102,7 +102,7 @@ static int hf_netb_termination_indicator = -1;
static int hf_netb_num_data_bytes_accepted = -1;
static int hf_netb_local_ses_no = -1;
static int hf_netb_remote_ses_no = -1;
static int hf_netb_data1 = -1;
/* static int hf_netb_data1 = -1; */
static int hf_netb_data2 = -1;
static int hf_netb_data2_frame = -1;
static int hf_netb_data2_user = -1;
@ -1355,20 +1355,22 @@ void proto_register_netbios(void)
{ "Remote Session No.", "netbios.remote_session", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
/**
{ &hf_netb_data1,
{ "DATA1 value", "netbios.data1", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_netb_data2,
{ "DATA2 value", "netbios.data2", FT_UINT16, BASE_HEX, NULL, 0x0,
NULL, HFILL }},
{ &hf_netb_data2_frame,
{ "Data length exceeds maximum frame size", "netbios.data2.frame", FT_BOOLEAN, 16,
{ "Data length exceeds maximum frame size", "netbios.data2.frame", FT_BOOLEAN, 16,
TFS(&tfs_yes_no), 0x8000, NULL, HFILL }},
{ &hf_netb_data2_user,
{ "Data length exceeds user's buffer", "netbios.data2.user", FT_BOOLEAN, 16,
{ "Data length exceeds user's buffer", "netbios.data2.user", FT_BOOLEAN, 16,
TFS(&tfs_yes_no), 0x4000, NULL, HFILL }},
{ &hf_netb_data2_status,

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

@ -1339,7 +1339,7 @@ static int hf_cflow_transport_rtp_jitter_max_string = -1; /* ID: 3
static int hf_cflow_transport_rtp_payload_type = -1; /* ID: 37041 */
static int hf_cflow_transport_rtp_payload_type_string = -1; /* ID: 37041 */
static int hf_cflow_transport_bytes_out_of_order = -1; /* ID: 37071 */
static int hf_cflow_transport_packets_out_of_order = -1; /* ID: 37074 */
/* static int hf_cflow_transport_packets_out_of_order = -1; */ /* ID: 37074 */
static int hf_cflow_transport_packets_out_of_order_string = -1; /* ID: 37074 */
static int hf_cflow_transport_tcp_window_size_min = -1; /* ID: 37083 */
static int hf_cflow_transport_tcp_window_size_min_string = -1; /* ID: 37083 */
@ -7449,12 +7449,14 @@ proto_register_netflow(void)
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
/**
{&hf_cflow_transport_packets_out_of_order,
{"Transport Packets Out of Order",
"cflow.transport_packets_out_of_order",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}
},
**/
{&hf_cflow_transport_packets_out_of_order_string,
{"Transport Packets Out of Order",
"cflow.transport_packets_out_of_order",

92
epan/dissectors/packet-nfs.c
View File

@ -64,7 +64,7 @@ static int hf_nfs_procedure_v2 = -1;
static int hf_nfs_procedure_v3 = -1;
static int hf_nfs_procedure_v4 = -1;
static int hf_nfs_fh_length = -1;
static int hf_nfs_impl_id4_len = -1;
/* static int hf_nfs_impl_id4_len = -1; */
static int hf_nfs_fh_hash = -1;
static int hf_nfs_fh_fhandle_data = -1;
static int hf_nfs_fh_mount_fileid = -1;
@ -110,8 +110,8 @@ static int hf_nfs_fh_xfn_len = -1;
static int hf_nfs_fh_xfn_inode = -1;
static int hf_nfs_fh_xfn_generation = -1;
static int hf_nfs_fh_dentry = -1;
static int hf_nfs_fh_dev = -1;
static int hf_nfs_fh_xdev = -1;
/* static int hf_nfs_fh_dev = -1; */
/* static int hf_nfs_fh_xdev = -1; */
static int hf_nfs_fh_dirinode = -1;
static int hf_nfs_fh_pinode = -1;
static int hf_nfs_fh_hp_len = -1;
@ -236,7 +236,7 @@ static int hf_nfs_dtime = -1;
static int hf_nfs_dtime_sec = -1;
static int hf_nfs_dtime_nsec = -1;
static int hf_nfs_fattr_type = -1;
/* static int hf_nfs_fattr_type = -1; */
static int hf_nfs_fattr_nlink = -1;
static int hf_nfs_fattr_uid = -1;
static int hf_nfs_fattr_gid = -1;
@ -252,7 +252,7 @@ static int hf_nfs_fattr3_uid = -1;
static int hf_nfs_fattr3_gid = -1;
static int hf_nfs_fattr3_size = -1;
static int hf_nfs_fattr3_used = -1;
static int hf_nfs_fattr3_rdev = -1;
/* static int hf_nfs_fattr3_rdev = -1; */
static int hf_nfs_fattr3_fsid = -1;
static int hf_nfs_fattr3_fileid = -1;
static int hf_nfs_wcc_attr_size = -1;
@ -306,7 +306,7 @@ static int hf_nfs_tag4 = -1;
static int hf_nfs_ops_count4 = -1;
static int hf_nfs_component4 = -1;
static int hf_nfs_clientid4 = -1;
static int hf_nfs_ace4 = -1;
/* static int hf_nfs_ace4 = -1; */
static int hf_nfs_recall = -1;
static int hf_nfs_open_claim_type4 = -1;
static int hf_nfs_opentype4 = -1;
@ -370,7 +370,7 @@ static int hf_nfs_server = -1;
static int hf_nfs_fslocation4 = -1;
static int hf_nfs_stable_how4 = -1;
static int hf_nfs_dirlist4_eof = -1;
static int hf_nfs_stateid4 = -1;
/* static int hf_nfs_stateid4 = -1; */
static int hf_nfs_offset4 = -1;
static int hf_nfs_specdata1 = -1;
static int hf_nfs_specdata2 = -1;
@ -388,8 +388,8 @@ static int hf_nfs_nfstime4_nseconds = -1;
static int hf_nfs_fsid4_major = -1;
static int hf_nfs_fsid4_minor = -1;
static int hf_nfs_acetype4 = -1;
static int hf_nfs_aceflag4 = -1;
static int hf_nfs_acemask4 = -1;
/* static int hf_nfs_aceflag4 = -1; */
/* static int hf_nfs_acemask4 = -1; */
static int hf_nfs_delegate_type = -1;
static int hf_nfs_secinfo_flavor = -1;
static int hf_nfs_secinfo_arr4 = -1;
@ -400,7 +400,7 @@ static int hf_nfs_verifier4 = -1;
static int hf_nfs_cookie4 = -1;
static int hf_nfs_cookieverf4 = -1;
static int hf_nfs_cb_program = -1;
static int hf_nfs_cb_location = -1;
/* static int hf_nfs_cb_location = -1; */
static int hf_nfs_recall4 = -1;
static int hf_nfs_filesize = -1;
static int hf_nfs_count4 = -1;
@ -408,7 +408,7 @@ static int hf_nfs_count4_dircount = -1;
static int hf_nfs_count4_maxcount = -1;
static int hf_nfs_minorversion = -1;
static int hf_nfs_open_owner4 = -1;
static int hf_nfs_lock_owner4 = -1;
/* static int hf_nfs_lock_owner4 = -1; */
static int hf_nfs_new_lock_owner = -1;
static int hf_nfs_sec_oid4 = -1;
static int hf_nfs_qop4 = -1;
@ -431,9 +431,9 @@ static int hf_nfs_length4_minlength = -1;
static int hf_nfs_layouttype4 = -1;
static int hf_nfs_layoutreturn_type4 = -1;
static int hf_nfs_iomode4 = -1;
static int hf_nfs_stripetype4 = -1;
static int hf_nfs_mdscommit4 = -1;
static int hf_nfs_stripeunit4 = -1;
/* static int hf_nfs_stripetype4 = -1; */
/* static int hf_nfs_mdscommit4 = -1; */
/* static int hf_nfs_stripeunit4 = -1; */
static int hf_nfs_newtime4 = -1;
static int hf_nfs_newoffset4 = -1;
static int hf_nfs_layout_avail4 = -1;
@ -443,8 +443,8 @@ static int hf_nfs_deviceid4 = -1;
static int hf_nfs_devicenum4 = -1;
static int hf_nfs_deviceidx4 = -1;
static int hf_nfs_layout4 = -1;
static int hf_nfs_stripedevs4 = -1;
static int hf_nfs_devaddr4 = -1;
/* static int hf_nfs_stripedevs4 = -1; */
/* static int hf_nfs_devaddr4 = -1; */
static int hf_nfs_return_on_close4 = -1;
static int hf_nfs_slotid4 = -1;
static int hf_nfs_high_slotid4 = -1;
@ -453,9 +453,9 @@ static int hf_nfs_serverscope4 = -1;
static int hf_nfs_minorid4 = -1;
static int hf_nfs_majorid4 = -1;
static int hf_nfs_padsize4 = -1;
static int hf_nfs_cbrenforce4 = -1;
static int hf_nfs_hashalg4 = -1;
static int hf_nfs_ssvlen4 = -1;
/* static int hf_nfs_cbrenforce4 = -1; */
/* static int hf_nfs_hashalg4 = -1; */
/* static int hf_nfs_ssvlen4 = -1; */
static int hf_nfs_maxreqsize4 = -1;
static int hf_nfs_maxrespsize4 = -1;
static int hf_nfs_maxrespsizecached4 = -1;
@ -493,10 +493,10 @@ static int hf_nfs_create_session_flags_persist = -1;
static int hf_nfs_create_session_flags_conn_back_chan = -1;
static int hf_nfs_create_session_flags_conn_rdma = -1;
static int hf_nfs_cachethis4 = -1;
static int hf_nfs_util4 = -1;
static int hf_nfs_first_stripe_idx4 = -1;
static int hf_nfs_layout_count = -1;
static int hf_nfs_pattern_offset = -1;
/* static int hf_nfs_util4 = -1; */
/* static int hf_nfs_first_stripe_idx4 = -1; */
/* static int hf_nfs_layout_count = -1; */
/* static int hf_nfs_pattern_offset = -1; */
static int hf_nfs_notification_bitmap4 = -1;
static int hf_nfs_lrs_present = -1;
static int hf_nfs_nfl_util = -1;
@ -10644,9 +10644,11 @@ proto_register_nfs(void)
{ &hf_nfs_procedure_v4, {
"V4 Procedure", "nfs.procedure_v4", FT_UINT32, BASE_DEC,
VALS(nfsv4_proc_vals), 0, NULL, HFILL }},
/**
{ &hf_nfs_impl_id4_len, {
"Implementation ID length", "nfs.impl_id4.length", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_fh_length, {
"length", "nfs.fh.length", FT_UINT32, BASE_DEC,
NULL, 0, "file handle length", HFILL }},
@ -10782,12 +10784,16 @@ proto_register_nfs(void)
{ &hf_nfs_fh_dentry, {
"dentry", "nfs.fh.dentry", FT_UINT32, BASE_HEX,
NULL, 0, "dentry (cookie)", HFILL }},
/**
{ &hf_nfs_fh_dev, {
"device", "nfs.fh.dev", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
/**
{ &hf_nfs_fh_xdev, {
"exported device", "nfs.fh.xdev", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_fh_dirinode, {
"directory inode", "nfs.fh.dirinode", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
@ -11044,9 +11050,11 @@ proto_register_nfs(void)
"case_preserving", "nfs.pathconf.case_preserving", FT_BOOLEAN, BASE_NONE,
TFS(&tfs_yes_no), 0x0, "file name cases are preserved", HFILL }},
/**
{ &hf_nfs_fattr_type, {
"type", "nfs.fattr.type", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_fattr_nlink, {
"nlink", "nfs.fattr.nlink", FT_UINT32, BASE_DEC,
@ -11108,9 +11116,11 @@ proto_register_nfs(void)
"used", "nfs.fattr3.used", FT_UINT64, BASE_DEC,
NULL, 0, NULL, HFILL }},
/**
{ &hf_nfs_fattr3_rdev, {
"rdev", "nfs.fattr3.rdev", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_fattr3_fsid, {
"fsid", "nfs.fattr3.fsid", FT_UINT64, BASE_HEX_DEC,
@ -11214,9 +11224,11 @@ proto_register_nfs(void)
"clientid", "nfs.clientid", FT_UINT64, BASE_HEX,
NULL, 0, "Client ID", HFILL }},
/**
{ &hf_nfs_ace4, {
"ace", "nfs.ace", FT_STRING, BASE_NONE,
NULL, 0, "Access Control Entry", HFILL }},
**/
{ &hf_nfs_recall, {
"Recall", "nfs.recall", FT_BOOLEAN, BASE_NONE,
@ -11374,9 +11386,11 @@ proto_register_nfs(void)
"eof", "nfs.dirlist4.eof", FT_BOOLEAN, BASE_NONE,
TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
/**
{ &hf_nfs_stateid4, {
"stateid", "nfs.stateid4", FT_UINT64, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_offset4, {
"offset", "nfs.offset4", FT_UINT64, BASE_DEC,
@ -11446,13 +11460,17 @@ proto_register_nfs(void)
"acetype", "nfs.acetype4", FT_UINT32, BASE_DEC,
VALS(names_acetype4), 0, NULL, HFILL }},
/**
{ &hf_nfs_aceflag4, {
"aceflag", "nfs.aceflag4", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
/**
{ &hf_nfs_acemask4, {
"acemask", "nfs.acemask4", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_fattr4_size, {
"size", "nfs.fattr4.size", FT_UINT64, BASE_DEC,
@ -11586,9 +11604,11 @@ proto_register_nfs(void)
"cookieverf", "nfs.cookieverf4", FT_UINT64, BASE_DEC,
NULL, 0, NULL, HFILL }},
/**
{ &hf_nfs_cb_location, {
"cb_location", "nfs.cb_location", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_cb_program, {
"cb_program", "nfs.cb_program", FT_UINT32, BASE_HEX,
@ -11682,9 +11702,11 @@ proto_register_nfs(void)
"owner", "nfs.open_owner4", FT_BYTES, BASE_NONE,
NULL, 0, NULL, HFILL }},
/**
{ &hf_nfs_lock_owner4, {
"owner", "nfs.lock_owner4", FT_BYTES, BASE_NONE,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_createmode4, {
"Create Mode", "nfs.createmode4", FT_UINT32, BASE_DEC,
@ -11874,25 +11896,35 @@ proto_register_nfs(void)
"IO mode", "nfs.iomode", FT_UINT32, BASE_DEC,
VALS(iomode_names), 0, NULL, HFILL }},
/**
{ &hf_nfs_stripetype4, {
"stripe type", "nfs.stripetype", FT_UINT32, BASE_DEC,
VALS(stripetype_names), 0, NULL, HFILL }},
**/
/**
{ &hf_nfs_stripeunit4, {
"stripe unit", "nfs.stripeunit", FT_UINT64, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
/**
{ &hf_nfs_util4, {
"util", "nfs.util", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
/**
{ &hf_nfs_first_stripe_idx4, {
"first stripe index", "nfs.stripeindex", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
/**
{ &hf_nfs_pattern_offset, {
"layout pattern offset", "nfs.patternoffset", FT_UINT64, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_notification_bitmap4, {
"notification bitmap", "nfs.notificationbitmap", FT_UINT32, BASE_DEC,
@ -11914,9 +11946,11 @@ proto_register_nfs(void)
"layout available?", "nfs.layoutavail", FT_BOOLEAN, BASE_NONE,
TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
/**
{ &hf_nfs_mdscommit4, {
"MDS commit?", "nfs.mdscommit", FT_BOOLEAN, BASE_NONE,
TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
**/
{ &hf_nfs_layoutupdate4, {
"layout update", "nfs.layoutupdate", FT_BYTES, BASE_NONE,
@ -11938,18 +11972,24 @@ proto_register_nfs(void)
"layout", "nfs.layout", FT_BYTES, BASE_NONE,
NULL, 0, NULL, HFILL }},
/**
{ &hf_nfs_layout_count, {
"layout", "nfs.layoutcount", FT_UINT32, BASE_DEC,
NULL, 0, "layout count", HFILL }},
**/
/**
{ &hf_nfs_stripedevs4, {
"stripe devs", "nfs.stripedevs", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
/**
{ &hf_nfs_devaddr4, {
"device addr", "nfs.devaddr", FT_BYTES, BASE_NONE,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_return_on_close4, {
"return on close?", "nfs.retclose4", FT_BOOLEAN, BASE_NONE,
@ -11990,17 +12030,23 @@ proto_register_nfs(void)
"hdr pad size", "nfs.padsize4", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
/**
{ &hf_nfs_cbrenforce4, {
"binding enforce?", "nfs.cbrenforce4", FT_BOOLEAN, BASE_NONE,
TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
**/
/**
{ &hf_nfs_hashalg4, {
"hash alg", "nfs.hashalg4", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
/**
{ &hf_nfs_ssvlen4, {
"ssv len", "nfs.ssvlen4", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_nfs_maxreqsize4, {
"max req size", "nfs.maxreqsize4", FT_UINT32, BASE_DEC,

33
epan/dissectors/packet-nhrp.c
View File

@ -82,9 +82,8 @@ static int hf_nhrp_flag_U2 = -1;
static int hf_nhrp_flag_S = -1;
static int hf_nhrp_flag_NAT = -1;
static int hf_nhrp_src_nbma_addr = -1;
#if 0
static int hf_nhrp_src_nbma_saddr = -1; /* TBD: Not used */
#endif
/* static int hf_nhrp_src_nbma_saddr = -1; */ /* TBD: Not used */
static int hf_nhrp_src_prot_addr = -1;
static int hf_nhrp_dst_prot_addr = -1;
static int hf_nhrp_request_id = -1;
@ -103,21 +102,15 @@ static int hf_nhrp_cli_saddr_tl_len = -1;
static int hf_nhrp_cli_prot_len = -1;
static int hf_nhrp_pref = -1;
static int hf_nhrp_client_nbma_addr = -1;
#if 0
static int hf_nhrp_client_nbma_saddr = -1; /* TBD: Not used */
#endif
/* static int hf_nhrp_client_nbma_saddr = -1; */ /* TBD: Not used */
static int hf_nhrp_client_prot_addr = -1;
static int hf_nhrp_ext_C = -1;
static int hf_nhrp_ext_type = -1;
static int hf_nhrp_ext_len = -1;
#if 0
static int hf_nhrp_ext_value = -1; /* TBD: Not used */
#endif
/* static int hf_nhrp_ext_value = -1; */ /* TBD: Not used */
static int hf_nhrp_error_code = -1;
static int hf_nhrp_error_offset = -1;
#if 0
static int hf_nhrp_error_packet = -1; /* TBD: Not used */
#endif
/* static int hf_nhrp_error_packet = -1; */ /* TBD: Not used */
static int hf_nhrp_auth_ext_reserved = -1;
static int hf_nhrp_auth_ext_spi = -1;
@ -1184,13 +1177,13 @@ proto_register_nhrp(void)
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
#if 0
/**
{ &hf_nhrp_src_nbma_saddr,
{ "Source NBMA Sub Address", "nhrp.src.nbma.saddr",
FT_UINT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
#endif
**/
{ &hf_nhrp_src_prot_addr,
{ "Source Protocol Address", "nhrp.src.prot.addr",
FT_IPv4, BASE_NONE, NULL, 0x0,
@ -1272,13 +1265,13 @@ proto_register_nhrp(void)
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
#if 0
/**
{ &hf_nhrp_client_nbma_saddr,
{ "Client NBMA Sub Address", "nhrp.client.nbma.saddr",
FT_UINT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
#endif
**/
{ &hf_nhrp_client_prot_addr,
{ "Client Protocol Address", "nhrp.client.prot.addr",
FT_IPv4, BASE_NONE, NULL, 0x0,
@ -1300,13 +1293,13 @@ proto_register_nhrp(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
#if 0
/**
{ &hf_nhrp_ext_value,
{ "Extension Value", "nhrp.ext.val",
FT_UINT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
#endif
**/
{ &hf_nhrp_error_code,
{ "Error Code", "nhrp.err.code",
@ -1318,13 +1311,13 @@ proto_register_nhrp(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
#if 0
/**
{ &hf_nhrp_error_packet,
{ "Errored Packet", "nhrp.err.pkt",
FT_UINT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
#endif
**/
{ &hf_nhrp_auth_ext_reserved,
{ "Reserved", "nhrp.auth_ext.reserved",
FT_UINT16, BASE_DEC, NULL, 0x0,

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

@ -85,7 +85,7 @@ static int hf_nisplus_entry = -1;
static int hf_nisplus_entry_type = -1;
static int hf_nisplus_entry_cols = -1;
static int hf_nisplus_entry_col = -1;
static int hf_nisplus_entry_flags = -1;
/* static int hf_nisplus_entry_flags = -1; */
static int hf_nisplus_entry_val = -1;
static int hf_nisplus_entry_mask = -1;
static int hf_nisplus_entry_mask_binary = -1;
@ -1561,9 +1561,11 @@ proto_register_nis(void)
"column", "nisplus.entry.col", FT_NONE, BASE_NONE,
NULL, 0, "Entry Column", HFILL }},
/**
{ &hf_nisplus_entry_flags, {
"flags", "nisplus.entry.flags", FT_UINT32, BASE_HEX,
NULL, 0, "Entry Col Flags", HFILL }},
**/
{ &hf_nisplus_entry_val, {
"val", "nisplus.entry.val", FT_STRING, BASE_NONE,

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

@ -47,8 +47,8 @@ static int hf_nsip_ns_vci = -1;
static int hf_nsip_pdu_type = -1;
static int hf_nsip_bvci = -1;
static int hf_nsip_nsei = -1;
static int hf_nsip_ip4_elements = -1;
static int hf_nsip_ip6_elements = -1;
/* static int hf_nsip_ip4_elements = -1; */
/* static int hf_nsip_ip6_elements = -1; */
static int hf_nsip_max_num_ns_vc = -1;
static int hf_nsip_num_ip4_endpoints = -1;
static int hf_nsip_num_ip6_endpoints = -1;
@ -63,8 +63,8 @@ static int hf_nsip_control_bits_r = -1;
static int hf_nsip_control_bits_c = -1;
static int hf_nsip_control_bits_spare = -1;
static int hf_nsip_transaction_id = -1;
static int hf_nsip_ip_element_ip_address_ipv4 = -1;
static int hf_nsip_ip_element_ip_address_ipv6 = -1;
/* static int hf_nsip_ip_element_ip_address_ipv4 = -1; */
/* static int hf_nsip_ip_element_ip_address_ipv6 = -1; */
static int hf_nsip_ip_element_udp_port = -1;
static int hf_nsip_ip_element_signalling_weight = -1;
static int hf_nsip_ip_element_data_weight = -1;
@ -1050,16 +1050,20 @@ proto_register_nsip(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
"Network Service Entity Identifier", HFILL }
},
/**
{ &hf_nsip_ip4_elements,
{ "IP4 elements", "nsip.ip4_elements",
FT_NONE, BASE_NONE, NULL, 0x0,
"List of IP4 elements", HFILL }
},
**/
/**
{ &hf_nsip_ip6_elements,
{ "IP6 elements", "nsip.ip6_elements",
FT_NONE, BASE_NONE, NULL, 0x0,
"List of IP6 elements", HFILL }
},
**/
{ &hf_nsip_max_num_ns_vc,
{ "Maximum number of NS-VCs", "nsip.max_num_ns_vc",
FT_UINT16, BASE_DEC, NULL, 0x0,
@ -1130,16 +1134,20 @@ proto_register_nsip(void)
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
/**
{ &hf_nsip_ip_element_ip_address_ipv4,
{ "IP Address", "nsip.ip_element.ipv4_address",
FT_IPv4, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
**/
/**
{ &hf_nsip_ip_element_ip_address_ipv6,
{ "IP Address", "nsip.ip_element.ipv6_address",
FT_IPv6, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
**/
{ &hf_nsip_ip_element_udp_port,
{ "UDP Port", "nsip.ip_element.udp_port",
FT_UINT16, BASE_DEC, NULL, 0x0,

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

@ -79,7 +79,7 @@ static int hf_nsrp_ifnum = -1;
/* Dada defined for HA Message */
static int hf_nsrp_msglen = -1;
static int hf_nsrp_encflag = -1;
static int hf_nsrp_notused = -1;
/* static int hf_nsrp_notused = -1; */
static int hf_nsrp_total_size = -1;
@ -430,11 +430,13 @@ proto_register_nsrp(void)
FT_UINT8, BASE_DEC, VALS(nsrp_encflag_vals), 0,
"NSRP ENCRYPT FLAG", HFILL }
},
/**
{ &hf_nsrp_notused,
{ "Not Used", "nsrp.notused",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
**/
{ &hf_nsrp_total_size,
{ "Total Size", "nsrp.totalsize",
FT_UINT32, BASE_DEC, NULL, 0,

28
epan/dissectors/packet-ntlmssp.c
View File

@ -170,13 +170,13 @@ static int hf_ntlmssp_negotiate_flags_10000000 = -1;
static int hf_ntlmssp_negotiate_flags_20000000 = -1;
static int hf_ntlmssp_negotiate_flags_40000000 = -1;
static int hf_ntlmssp_negotiate_flags_80000000 = -1;
static int hf_ntlmssp_negotiate_workstation_strlen = -1;
static int hf_ntlmssp_negotiate_workstation_maxlen = -1;
static int hf_ntlmssp_negotiate_workstation_buffer = -1;
/* static int hf_ntlmssp_negotiate_workstation_strlen = -1; */
/* static int hf_ntlmssp_negotiate_workstation_maxlen = -1; */
/* static int hf_ntlmssp_negotiate_workstation_buffer = -1; */
static int hf_ntlmssp_negotiate_workstation = -1;
static int hf_ntlmssp_negotiate_domain_strlen = -1;
static int hf_ntlmssp_negotiate_domain_maxlen = -1;
static int hf_ntlmssp_negotiate_domain_buffer = -1;
/* static int hf_ntlmssp_negotiate_domain_strlen = -1; */
/* static int hf_ntlmssp_negotiate_domain_maxlen = -1; */
/* static int hf_ntlmssp_negotiate_domain_buffer = -1; */
static int hf_ntlmssp_negotiate_domain = -1;
static int hf_ntlmssp_ntlm_server_challenge = -1;
static int hf_ntlmssp_ntlm_client_challenge = -1;
@ -243,7 +243,7 @@ static int hf_ntlmssp_verf_randompad = -1;
static int hf_ntlmssp_verf_hmacmd5 = -1;
static int hf_ntlmssp_verf_crc32 = -1;
static int hf_ntlmssp_verf_sequence = -1;
static int hf_ntlmssp_decrypted_payload = -1;
/* static int hf_ntlmssp_decrypted_payload = -1; */
static int hf_ntlmssp_ntlmv2_response = -1;
static int hf_ntlmssp_ntlmv2_response_hmac = -1;
@ -2901,41 +2901,53 @@ proto_register_ntlmssp(void)
FT_BOOLEAN, 32, TFS (&tfs_set_notset), NTLMSSP_NEGOTIATE_56,
"56-bit encryption is supported", HFILL }
},
/**
{ &hf_ntlmssp_negotiate_workstation_strlen,
{ "Calling workstation name length", "ntlmssp.negotiate.callingworkstation.strlen",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
**/
/**
{ &hf_ntlmssp_negotiate_workstation_maxlen,
{ "Calling workstation name max length", "ntlmssp.negotiate.callingworkstation.maxlen",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
**/
/**
{ &hf_ntlmssp_negotiate_workstation_buffer,
{ "Calling workstation name buffer", "ntlmssp.negotiate.callingworkstation.buffer",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
**/
{ &hf_ntlmssp_negotiate_workstation,
{ "Calling workstation name", "ntlmssp.negotiate.callingworkstation",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
/**
{ &hf_ntlmssp_negotiate_domain_strlen,
{ "Calling workstation domain length", "ntlmssp.negotiate.domain.strlen",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
**/
/**
{ &hf_ntlmssp_negotiate_domain_maxlen,
{ "Calling workstation domain max length", "ntlmssp.negotiate.domain.maxlen",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
**/
/**
{ &hf_ntlmssp_negotiate_domain_buffer,
{ "Calling workstation domain buffer", "ntlmssp.negotiate.domain.buffer",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
**/
{ &hf_ntlmssp_negotiate_domain,
{ "Calling workstation domain", "ntlmssp.negotiate.domain",
FT_STRING, BASE_NONE, NULL, 0x0,
@ -3224,11 +3236,13 @@ proto_register_ntlmssp(void)
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
/**
{ &hf_ntlmssp_decrypted_payload,
{ "NTLM Decrypted Payload", "ntlmssp.decrypted_payload",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
**/
{ &hf_ntlmssp_verf_randompad,
{ "Random Pad", "ntlmssp.verf.randompad",
FT_UINT32, BASE_HEX, NULL, 0x0,

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

@ -78,7 +78,7 @@ static int hf_olsr_interface_addr = -1;
static int hf_olsr_netmask = -1;
static int hf_olsr_network_addr = -1;
static int hf_olsr_neighbor6 = -1;
/* static int hf_olsr_neighbor6 = -1; */
static int hf_olsr_origin6_addr = -1;
static int hf_olsr_neighbor6_addr = -1;
static int hf_olsr_interface6_addr = -1;
@ -825,12 +825,14 @@ void proto_register_olsr(void) {
}
},
/**
{ &hf_olsr_neighbor6,
{ "Neighbor Address", "olsr.neighbor6",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL
}
},
**/
{ &hf_olsr_origin6_addr,
{ "Originator Address", "olsr.origin6_addr",

20
epan/dissectors/packet-opensafety.c
View File

@ -356,7 +356,7 @@ static int hf_oss_msg_network = -1;
static int hf_oss_msg_sender = -1;
static int hf_oss_msg_receiver = -1;
static int hf_oss_length= -1;
static int hf_oss_data = -1;
/* static int hf_oss_data = -1; */
static int hf_oss_crc = -1;
static int hf_oss_crc_valid = -1;
@ -374,18 +374,18 @@ static int hf_oss_snmt_error_code = -1;
static int hf_oss_ssdo_server = -1;
static int hf_oss_ssdo_client = -1;
static int hf_oss_ssdo_sano = -1;
/* static int hf_oss_ssdo_sano = -1; */
static int hf_oss_ssdo_sacmd = -1;
static int hf_oss_ssdo_sod_index = -1;
static int hf_oss_ssdo_sod_subindex = -1;
static int hf_oss_ssdo_payload = -1;
static int hf_oss_ssdo_payload_size = -1;
static int hf_oss_ssdo_segment_size = -1;
static int hf_oss_ssdo_inhibit_time = -1;
/* static int hf_oss_ssdo_segment_size = -1; */
/* static int hf_oss_ssdo_inhibit_time = -1; */
static int hf_oss_ssdo_abort_code = -1;
static int hf_oss_ssdo_sacmd_access_type = -1;
static int hf_oss_ssdo_sacmd_reserved = -1;
/* static int hf_oss_ssdo_sacmd_reserved = -1; */
static int hf_oss_ssdo_sacmd_abort_transfer = -1;
static int hf_oss_ssdo_sacmd_segmentation = -1;
static int hf_oss_ssdo_sacmd_toggle = -1;
@ -1734,9 +1734,11 @@ proto_register_opensafety(void)
{ &hf_oss_length,
{ "Length", "opensafety.length",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
/**
{ &hf_oss_data,
{ "Data", "opensafety.data",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } },
**/
{ &hf_oss_crc,
{ "CRC", "opensafety.crc.data",
FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } },
@ -1784,9 +1786,11 @@ proto_register_opensafety(void)
{ &hf_oss_ssdo_client,
{ "SSDO Client", "opensafety.ssdo.client",
FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } },
/**
{ &hf_oss_ssdo_sano,
{ "SOD Access Request Number", "opensafety.ssdo.sano",
FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } },
**/
{ &hf_oss_ssdo_sacmd,
{ "SOD Access Command", "opensafety.ssdo.sacmd",
FT_UINT8, BASE_HEX, VALS(ssdo_sacmd_values), 0x0, NULL, HFILL } },
@ -1802,12 +1806,16 @@ proto_register_opensafety(void)
{ &hf_oss_ssdo_payload_size,
{ "SOD Payload Size", "opensafety.ssdo.payloadsize",
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
/**
{ &hf_oss_ssdo_segment_size,
{ "SOD Segment Size", "opensafety.ssdo.segmentsize",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
**/
/**
{ &hf_oss_ssdo_inhibit_time,
{ "Inhibit Time", "opensafety.ssdo.inhibittime",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
**/
{ &hf_oss_ssdo_abort_code,
{ "Abort Code", "opensafety.ssdo.abortcode", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
@ -1815,9 +1823,11 @@ proto_register_opensafety(void)
{ &hf_oss_ssdo_sacmd_access_type,
{ "Access Type", "opensafety.ssdo.sacmd.access",
FT_BOOLEAN, 8, TFS(&opensafety_sacmd_acc), OPENSAFETY_SSDO_SACMD_ACC, NULL, HFILL } },
/**
{ &hf_oss_ssdo_sacmd_reserved,
{ "Reserved", "opensafety.ssdo.sacmd.reserved",
FT_BOOLEAN, 8, TFS(&opensafety_sacmd_res), OPENSAFETY_SSDO_SACMD_RES, NULL, HFILL } },
**/
{ &hf_oss_ssdo_sacmd_abort_transfer,
{ "Abort Transfer", "opensafety.ssdo.sacmd.abort_transfer",
FT_BOOLEAN, 8, TFS(&opensafety_sacmd_abrt), OPENSAFETY_SSDO_SACMD_ABRT, NULL, HFILL } },

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

@ -72,7 +72,7 @@ static int hf_per_single_ASN1_type = -1; /* T_single_ASN1_type */
static int hf_per_octet_aligned = -1; /* T_octet_aligned */
static int hf_per_arbitrary = -1; /* T_arbitrary */
static int hf_per_integer_length = -1; /* Show integer length if "show internal per fields" */
static int hf_per_debug_pos = -1;
/* static int hf_per_debug_pos = -1; */
static gint ett_per_open_type = -1;
static gint ett_per_containing = -1;
@ -2543,10 +2543,12 @@ proto_register_per(void)
{ "integer length", "per.integer_length",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
/**
{ &hf_per_debug_pos,
{ "Current bit offset", "per.debug_pos",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL }},
**/
};
static gint *ett[] =
{

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

@ -161,8 +161,8 @@ static int hf_pgm_spm_pathafi = -1;
static int hf_pgm_spm_res = -1;
static int hf_pgm_spm_path = -1;
static int hf_pgm_spm_path6 = -1;
static int hf_pgm_data_sqn = -1;
static int hf_pgm_data_trail = -1;
/* static int hf_pgm_data_sqn = -1; */
/* static int hf_pgm_data_trail = -1; */
static int hf_pgm_nak_sqn = -1;
static int hf_pgm_nak_srcafi = -1;
static int hf_pgm_nak_srcres = -1;
@ -1158,12 +1158,16 @@ proto_register_pgm(void)
{ &hf_pgm_spm_path6,
{ "Path NLA", "pgm.spm.path", FT_IPv6, BASE_NONE,
NULL, 0x0, NULL, HFILL }},
/**
{ &hf_pgm_data_sqn,
{ "Data Packet Sequence Number", "pgm.data.sqn", FT_UINT32, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
**/
/**
{ &hf_pgm_data_trail,
{ "Trailing Edge Sequence Number", "pgm.data.trail", FT_UINT32, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
**/
{ &hf_pgm_nak_sqn,
{ "Requested Sequence Number", "pgm.nak.sqn", FT_UINT32, BASE_HEX,
NULL, 0x0, NULL, HFILL }},

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

@ -485,11 +485,11 @@ void proto_register_ppcap(void)
{ &hf_ppcap_address_type,
{ "Address Type", "ppcap.address_type", FT_UINT16,
BASE_DEC, VALS(address_type_values), 0x00 , NULL, HFILL}},
#if 0
/**
{ &hf_ppcap_source_address_type,
{ "Source Address Type", "ppcap.source_address_type", FT_UINT16,
BASE_DEC, VALS(address_type_values), 0x00 , NULL, HFILL}},
#endif
**/
{ &hf_ppcap_ssn,
{ "SSN", "ppcap.ssn", FT_UINT16,
BASE_DEC, NULL, 0x00, NULL, HFILL}},
@ -508,11 +508,11 @@ void proto_register_ppcap(void)
{ &hf_ppcap_destreserved,
{ "Reserved", "ppcap.destreserved", FT_UINT16,
BASE_DEC, NULL, 0x00, NULL, HFILL}},
#if 0
/**
{ &hf_ppcap_destination_address_type,
{ "Destination Address Type", "ppcap.destination_address_type", FT_UINT16,
BASE_DEC, VALS(address_type_values), 0x00, NULL, HFILL}},
#endif
**/
{ &hf_ppcap_ssn1,
{ "SSN", "ppcap.ssn1", FT_UINT8,
BASE_DEC, NULL, 0x00, NULL, HFILL}},

4
epan/dissectors/packet-ppi-gps.c
View File

@ -80,7 +80,7 @@ static int hf_ppi_gps_lat = -1;
static int hf_ppi_gps_alt = -1;
static int hf_ppi_gps_alt_gnd = -1;
static int hf_ppi_gps_gpstime = -1;
static int hf_ppi_gps_fractime = -1;
/* static int hf_ppi_gps_fractime = -1; */
static int hf_ppi_gps_eph = -1;
static int hf_ppi_gps_epv = -1;
static int hf_ppi_gps_ept = -1;
@ -533,10 +533,12 @@ proto_register_ppi_gps(void) {
{ "GPSTimestamp", "ppi_gps.gpstime",
FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0x0,
"GPSTimestamp packet was received at", HFILL } },
/**
{ &hf_ppi_gps_fractime,
{ "fractional Timestamp", "ppi_gps.fractime",
FT_DOUBLE, BASE_NONE, NULL, 0x0,
"fractional GPSTimestamp packet was received at", HFILL } },
**/
{ &hf_ppi_gps_eph,
{ "Horizontal Error (m)", "ppi_gps.eph",
FT_DOUBLE, BASE_NONE, NULL, 0x0,

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

@ -273,7 +273,7 @@ static int hf_80211n_mac_phy_evm3 = -1;
/* 802.11n-Extensions A-MPDU fragments */
static int hf_ampdu_reassembled_in = -1;
static int hf_ampdu_segments = -1;
/* static int hf_ampdu_segments = -1; */
static int hf_ampdu_segment = -1;
static int hf_ampdu_count = -1;
@ -1259,9 +1259,11 @@ proto_register_ppi(void)
{ &hf_ampdu_segment,
{ "A-MPDU", "ppi.80211n-mac.ampdu",
FT_FRAMENUM, BASE_NONE, NULL, 0x0, "802.11n Aggregated MAC Protocol Data Unit (A-MPDU)", HFILL }},
/**
{ &hf_ampdu_segments,
{ "Reassembled A-MPDU", "ppi.80211n-mac.ampdu.reassembled",
FT_NONE, BASE_NONE, NULL, 0x0, "Reassembled Aggregated MAC Protocol Data Unit (A-MPDU)", HFILL }},
**/
{ &hf_ampdu_reassembled_in,
{ "Reassembled A-MPDU in frame", "ppi.80211n-mac.ampdu.reassembled_in",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,

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

@ -101,8 +101,8 @@ static gint hf_pppoed_tag_generic_error = -1;
/* Session protocol fields */
static gint hf_pppoes_tags = -1;
static gint hf_pppoes_tag = -1;
static gint hf_pppoes_tag_credits = -1;
/* static gint hf_pppoes_tag = -1; */
/* static gint hf_pppoes_tag_credits = -1; */
static gint hf_pppoes_tag_credits_fcn = -1;
static gint hf_pppoes_tag_credits_bcn = -1;
@ -1214,16 +1214,20 @@ void proto_register_pppoes(void)
NULL, 0x0, NULL, HFILL
}
},
/**
{ &hf_pppoes_tag,
{ "Tag", "pppoes.tag", FT_UINT16, BASE_HEX,
VALS(tag_vals), 0x0, NULL, HFILL
}
},
**/
/**
{ &hf_pppoes_tag_credits,
{ "Credits", "pppoes.tags.credits", FT_BYTES, BASE_NONE,
NULL, 0x0, NULL, HFILL
}
},
**/
{ &hf_pppoes_tag_credits_fcn,
{ "FCN", "pppoes.tags.credits.fcn", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL

44
epan/dissectors/packet-ptp.c
View File

@ -540,7 +540,7 @@ static int hf_ptp_mm_boundaryhops = -1;
static int hf_ptp_mm_managementmessagekey = -1;
static int hf_ptp_mm_parameterlength = -1;
/*parameterlength > 0*/
static int hf_ptp_mm_messageparameters = -1;
/* static int hf_ptp_mm_messageparameters = -1; */
/*ptp_mm_clock_identity (parameterlength = 64)*/
static int hf_ptp_mm_clock_identity_clockcommunicationtechnology = -1;
static int hf_ptp_mm_clock_identity_clockuuidfield = -1;
@ -638,7 +638,7 @@ static int hf_ptp_mm_global_time_data_set_epochnumber = -1;
static int hf_ptp_mm_update_global_time_properties_currentutcoffset = -1;
static int hf_ptp_mm_update_global_time_properties_leap59 = -1;
static int hf_ptp_mm_update_global_time_properties_leap61 = -1;
static int hf_ptp_mm_update_global_time_properties_epochnumber = -1;
/* static int hf_ptp_mm_update_global_time_properties_epochnumber = -1; */
/*ptp_mm_get_foreign_data_set (parameterlength = 4)*/
static int hf_ptp_mm_get_foreign_data_set_recordkey = -1;
@ -1252,7 +1252,7 @@ static int hf_ptp_v2_logmessageperiod = -1;
/*Fields for PTP_Announce (=an) messages*/
static int hf_ptp_v2_an_origintimestamp = -1; /*Field for seconds & nanoseconds*/
/* static int hf_ptp_v2_an_origintimestamp = -1; */ /*Field for seconds & nanoseconds*/
static int hf_ptp_v2_an_origintimestamp_seconds = -1;
static int hf_ptp_v2_an_origintimestamp_nanoseconds = -1;
static int hf_ptp_v2_an_origincurrentutcoffset = -1;
@ -1291,13 +1291,13 @@ static int hf_ptp_v2_an_tlv_pathsequence = -1;
static int hf_ptp_v2_an_tlv_data = -1;
/*Fields for PTP_Sync AND PTP_DelayRequest (=sdr) messages*/
static int hf_ptp_v2_sdr_origintimestamp = -1; /*Field for seconds & nanoseconds*/
/* static int hf_ptp_v2_sdr_origintimestamp = -1; */ /*Field for seconds & nanoseconds*/
static int hf_ptp_v2_sdr_origintimestamp_seconds = -1;
static int hf_ptp_v2_sdr_origintimestamp_nanoseconds = -1;
/*Fields for PTP_Follow_Up (=fu) messages*/
static int hf_ptp_v2_fu_preciseorigintimestamp = -1; /*Field for seconds & nanoseconds*/
/* static int hf_ptp_v2_fu_preciseorigintimestamp = -1; */ /*Field for seconds & nanoseconds*/
static int hf_ptp_v2_fu_preciseorigintimestamp_seconds = -1;
static int hf_ptp_v2_fu_preciseorigintimestamp_nanoseconds = -1;
/* Fields for the Follow_Up Information TLV */
@ -1311,7 +1311,7 @@ static int hf_ptp_as_fu_tlv_last_gm_phase_change = -1;
static int hf_ptp_as_fu_tlv_scaled_last_gm_phase_change = -1;
/*Fields for PTP_DelayResponse (=dr) messages*/
static int hf_ptp_v2_dr_receivetimestamp = -1; /*Field for seconds & nanoseconds*/
/* static int hf_ptp_v2_dr_receivetimestamp = -1; */ /*Field for seconds & nanoseconds*/
static int hf_ptp_v2_dr_receivetimestamp_seconds = -1;
static int hf_ptp_v2_dr_receivetimestamp_nanoseconds = -1;
static int hf_ptp_v2_dr_requestingportidentity = -1;
@ -1319,13 +1319,13 @@ static int hf_ptp_v2_dr_requestingsourceportid = -1;
/*Fields for PTP_PDelayRequest (=pdrq) messages*/
static int hf_ptp_v2_pdrq_origintimestamp = -1; /*Field for seconds & nanoseconds*/
/* static int hf_ptp_v2_pdrq_origintimestamp = -1; */ /*Field for seconds & nanoseconds*/
static int hf_ptp_v2_pdrq_origintimestamp_seconds = -1;
static int hf_ptp_v2_pdrq_origintimestamp_nanoseconds = -1;
/*Fields for PTP_PDelayResponse (=pdrs) messages*/
static int hf_ptp_v2_pdrs_requestreceipttimestamp = -1; /*Field for seconds & nanoseconds*/
/* static int hf_ptp_v2_pdrs_requestreceipttimestamp = -1; */ /*Field for seconds & nanoseconds*/
static int hf_ptp_v2_pdrs_requestreceipttimestamp_seconds = -1;
static int hf_ptp_v2_pdrs_requestreceipttimestamp_nanoseconds = -1;
static int hf_ptp_v2_pdrs_requestingportidentity = -1;
@ -1333,7 +1333,7 @@ static int hf_ptp_v2_pdrs_requestingsourceportid = -1;
/*Fields for PTP_PDelayResponseFollowUp (=pdfu) messages*/
static int hf_ptp_v2_pdfu_responseorigintimestamp = -1; /*Field for seconds & nanoseconds*/
/* static int hf_ptp_v2_pdfu_responseorigintimestamp = -1; */ /*Field for seconds & nanoseconds*/
static int hf_ptp_v2_pdfu_responseorigintimestamp_seconds = -1;
static int hf_ptp_v2_pdfu_responseorigintimestamp_nanoseconds = -1;
static int hf_ptp_v2_pdfu_requestingportidentity = -1;
@ -1396,12 +1396,12 @@ static int hf_ptp_v2_mm_profileIdentity = -1;
static int hf_ptp_v2_mm_pad = -1;
static int hf_ptp_v2_mm_numberOfFaultRecords = -1;
static int hf_ptp_v2_mm_faultRecord = -1;
/* static int hf_ptp_v2_mm_faultRecord = -1; */
static int hf_ptp_v2_mm_initializationKey = -1;
static int hf_ptp_v2_mm_severityCode = -1;
static int hf_ptp_v2_mm_faultRecordLength = -1;
static int hf_ptp_v2_mm_faultTime = -1;
/* static int hf_ptp_v2_mm_faultTime = -1; */
static int hf_ptp_v2_mm_faultTime_s = -1;
static int hf_ptp_v2_mm_faultTime_ns = -1;
static int hf_ptp_v2_mm_faultValue = -1;
@ -4103,11 +4103,13 @@ proto_register_ptp(void)
NULL, HFILL }
},
/*parameterlength > 0*/
/**
{ &hf_ptp_mm_messageparameters,
{ "messageParameters", "ptp.mm.messageparameters",
FT_BYTES, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
/*ptp_mm_clock_identity (parameterlength = 64)*/
{ &hf_ptp_mm_clock_identity_clockcommunicationtechnology,
{ "clockCommunicationTechnology", "ptp.mm.clock.identity.clockcommunicationtechnology",
@ -4509,11 +4511,13 @@ proto_register_ptp(void)
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
/**
{ &hf_ptp_mm_update_global_time_properties_epochnumber,
{ "epochNumber", "ptp.mm.update.global.time.properties.epochnumber",
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
**/
/*ptp_mm_get_foreign_data_set (parameterlength = 4)*/
{ &hf_ptp_mm_get_foreign_data_set_recordkey,
{ "recordKey", "ptp.mm.get.foreign.data.set.recordkey",
@ -4717,11 +4721,13 @@ proto_register_ptp(void)
},
/*Fields for PTP_Announce (=an) messages*/
/**
{ &hf_ptp_v2_an_origintimestamp,
{ "originTimestamp", "ptp.v2.an.origintimestamp",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
{ &hf_ptp_v2_an_origintimestamp_seconds,
{ "originTimestamp (seconds)", "ptp.v2.an.origintimestamp.seconds",
FT_UINT64, BASE_DEC, NULL, 0x00,
@ -4872,11 +4878,13 @@ proto_register_ptp(void)
},
/*Fields for PTP_Sync AND PTP_DelayRequest (=sdr) messages*/
/**
{ &hf_ptp_v2_sdr_origintimestamp,
{ "originTimestamp", "ptp.v2.sdr.origintimestamp",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
{ &hf_ptp_v2_sdr_origintimestamp_seconds,
{ "originTimestamp (seconds)", "ptp.v2.sdr.origintimestamp.seconds",
FT_UINT64, BASE_DEC, NULL, 0x00,
@ -4889,11 +4897,13 @@ proto_register_ptp(void)
},
/*Fields for PTP_Follow_Up (=fu) messages*/
/**
{ &hf_ptp_v2_fu_preciseorigintimestamp,
{ "preciseOriginTimestamp", "ptp.v2.fu.preciseorigintimestamp",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
{ &hf_ptp_v2_fu_preciseorigintimestamp_seconds,
{ "preciseOriginTimestamp (seconds)", "ptp.v2.fu.preciseorigintimestamp.seconds",
FT_UINT64, BASE_DEC, NULL, 0x00,
@ -4947,11 +4957,13 @@ proto_register_ptp(void)
},
/*Fields for PTP_DelayResponse (=dr) messages*/
/**
{ &hf_ptp_v2_dr_receivetimestamp,
{ "receiveTimestamp", "ptp.v2.dr.receivetimestamp",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
{ &hf_ptp_v2_dr_receivetimestamp_seconds,
{ "receiveTimestamp (seconds)", "ptp.v2.dr.receivetimestamp.seconds",
FT_UINT64, BASE_DEC, NULL, 0x00,
@ -4974,11 +4986,13 @@ proto_register_ptp(void)
},
/*Fields for PTP_PDelayRequest (=pdrq) messages*/
/**
{ &hf_ptp_v2_pdrq_origintimestamp,
{ "originTimestamp", "ptp.v2.pdrq.origintimestamp",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
{ &hf_ptp_v2_pdrq_origintimestamp_seconds,
{ "originTimestamp (seconds)", "ptp.v2.pdrq.origintimestamp.seconds",
FT_UINT64, BASE_DEC, NULL, 0x00,
@ -4991,11 +5005,13 @@ proto_register_ptp(void)
},
/*Fields for PTP_PDelayResponse (=pdrs) messages*/
/**
{ &hf_ptp_v2_pdrs_requestreceipttimestamp,
{ "requestreceiptTimestamp", "ptp.v2.pdrs.requestreceipttimestamp",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
{ &hf_ptp_v2_pdrs_requestreceipttimestamp_seconds,
{ "requestreceiptTimestamp (seconds)", "ptp.v2.pdrs.requestreceipttimestamp.seconds",
FT_UINT64, BASE_DEC, NULL, 0x00,
@ -5018,11 +5034,13 @@ proto_register_ptp(void)
},
/*Fields for PTP_PDelayResponseFollowUp (=pdfu) messages*/
/**
{ &hf_ptp_v2_pdfu_responseorigintimestamp,
{ "responseOriginTimestamp", "ptp.v2.pdfu.responseorigintimestamp",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
{ &hf_ptp_v2_pdfu_responseorigintimestamp_seconds,
{ "responseOriginTimestamp (seconds)", "ptp.v2.pdfu.responseorigintimestamp.seconds",
FT_UINT64, BASE_DEC, NULL, 0x00,
@ -5286,11 +5304,13 @@ proto_register_ptp(void)
FT_UINT16, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
/**
{ &hf_ptp_v2_mm_faultRecord,
{ "fault record", "ptp.v2.mm.faultRecord",
FT_BYTES, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
{ &hf_ptp_v2_mm_faultRecordLength,
{ "fault record length", "ptp.v2.mm.faultRecordLength",
FT_UINT16, BASE_DEC, NULL, 0x00,
@ -5331,11 +5351,13 @@ proto_register_ptp(void)
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL }
},
/**
{ &hf_ptp_v2_mm_faultTime,
{ "Fault time", "ptp.v2.mm.faultTime",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
**/
{ &hf_ptp_v2_mm_faultTime_s,
{ "Fault time (seconds)", "ptp.v2.mm.faultTime.seconds",
FT_UINT64, BASE_DEC, NULL, 0x00,

20
epan/dissectors/packet-pvfs2.c
View File

@ -63,12 +63,12 @@ static int hf_pvfs_magic_nr = -1;
static int hf_pvfs_mode = -1;
static int hf_pvfs_tag = -1;
static int hf_pvfs_size = -1;
static int hf_pvfs_release_number = -1;
/* static int hf_pvfs_release_number = -1; */
static int hf_pvfs_encoding = -1;
static int hf_pvfs_server_op = -1;
static int hf_pvfs_handle = -1;
/* static int hf_pvfs_handle = -1; */
static int hf_pvfs_fs_id = -1;
static int hf_pvfs_attrmask = -1;
/* static int hf_pvfs_attrmask = -1; */
static int hf_pvfs_attr = -1;
static int hf_pvfs_ds_type = -1;
static int hf_pvfs_error = -1;
@ -90,7 +90,7 @@ static int hf_pvfs_parent_mtime_nsec = -1;
static int hf_pvfs_parent_ctime = -1;
static int hf_pvfs_parent_ctime_sec = -1;
static int hf_pvfs_parent_ctime_nsec = -1;
static int hf_pvfs_dirent_count = -1;
/* static int hf_pvfs_dirent_count = -1; */
static int hf_pvfs_directory_version = -1;
static int hf_pvfs_path = -1;
static int hf_pvfs_total_completed = -1;
@ -100,7 +100,7 @@ static int hf_pvfs_io_type = -1;
static int hf_pvfs_flowproto_type = -1;
static int hf_pvfs_server_param = -1;
static int hf_pvfs_prev_value = -1;
static int hf_pvfs_ram_free_bytes = -1;
/* static int hf_pvfs_ram_free_bytes = -1; */
static int hf_pvfs_bytes_available = -1;
static int hf_pvfs_bytes_total = -1;
static int hf_pvfs_ram_bytes_total = -1;
@ -3251,9 +3251,11 @@ proto_register_pvfs(void)
{ "Size", "pvfs.size", FT_UINT64, BASE_DEC,
NULL, 0, NULL, HFILL }},
/**
{ &hf_pvfs_release_number,
{ "Release Number", "pvfs.release_number", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_pvfs_encoding,
{ "Encoding", "pvfs.encoding", FT_UINT32, BASE_DEC,
@ -3263,17 +3265,21 @@ proto_register_pvfs(void)
{ "Server Operation", "pvfs.server_op", FT_UINT32, BASE_DEC,
VALS(names_pvfs_server_op), 0, NULL, HFILL }},
/**
{ &hf_pvfs_handle,
{ "Handle", "pvfs.handle", FT_BYTES, BASE_NONE,
NULL, 0, NULL, HFILL }},
**/
{ &hf_pvfs_fs_id,
{ "fs_id", "pvfs.fs_id", FT_UINT32, BASE_HEX,
NULL, 0, "File System ID", HFILL }},
/**
{ &hf_pvfs_attrmask,
{ "attrmask", "pvfs.attrmask", FT_UINT32, BASE_HEX,
NULL, 0, "Attribute Mask", HFILL }},
**/
{ &hf_pvfs_attr,
{ "attr", "pvfs.attribute", FT_UINT32, BASE_HEX,
@ -3359,9 +3365,11 @@ proto_register_pvfs(void)
{ "microseconds", "pvfs.parent_ctime.usec", FT_UINT32, BASE_DEC,
NULL, 0, "Creation Time (microseconds)", HFILL }},
/**
{ &hf_pvfs_dirent_count,
{ "Dir Entry Count", "pvfs.dirent_count", FT_UINT64, BASE_DEC,
NULL, 0, "Directory Entry Count", HFILL }},
**/
{ &hf_pvfs_directory_version,
{ "Directory Version", "pvfs.directory_version", FT_UINT64, BASE_HEX,
@ -3399,9 +3407,11 @@ proto_register_pvfs(void)
{ "Previous Value", "pvfs.prev_value", FT_UINT64, BASE_DEC,
NULL, 0, NULL, HFILL }},
/**
{ &hf_pvfs_ram_free_bytes,
{ "RAM Free Bytes", "pvfs.ram.free_bytes", FT_UINT64, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_pvfs_bytes_available,
{ "Bytes Available", "pvfs.bytes_available", FT_UINT64, BASE_DEC,

4
epan/dissectors/packet-pw-hdlc.c
View File

@ -50,7 +50,7 @@ static gint proto_pw_hdlc_nocw_hdlc_ppp = -1;
static gint ett_pw_hdlc = -1;
static int hf_pw_hdlc = -1;
/* static int hf_pw_hdlc = -1; */
static int hf_pw_hdlc_address_field = -1;
static int hf_pw_hdlc_address = -1;
static int hf_pw_hdlc_cr_bit = -1;
@ -182,12 +182,14 @@ static void dissect_pw_hdlc_nocw_hdlc_ppp( tvbuff_t * tvb, packet_info * pinfo,
void proto_register_pw_hdlc(void)
{
static hf_register_info hf[] = {
/**
{
&hf_pw_hdlc,
{
"PW HDLC", "pw_hdlc", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL
}
},
**/
{
&hf_pw_hdlc_address_field,
{

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

@ -48,9 +48,9 @@ static int hf_q933_extension_ind = -1;
static int hf_q933_calling_party_number = -1;
static int hf_q933_called_party_number = -1;
static int hf_q933_connected_number = -1;
static int hf_q933_redirecting_number = -1;
static int hf_q933_screening_ind = -1;
static int hf_q933_presentation_ind = -1;
/* static int hf_q933_redirecting_number = -1; */
static int hf_q933_screening_ind = -1;
static int hf_q933_presentation_ind = -1;
static int hf_q933_report_type = -1;
static int hf_q933_link_verf_txseq = -1;
static int hf_q933_link_verf_rxseq = -1;
@ -2243,9 +2243,11 @@ proto_register_q933(void)
{ "Connected party number digits", "q933.connected_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/**
{ &hf_q933_redirecting_number,
{ "Redirecting party number digits", "q933.redirecting_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_q933_report_type,
{ "Report type", "q933.report_type", FT_UINT8, BASE_DEC, VALS(q933_report_type_vals), 0x0,
NULL, HFILL }},

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

@ -242,8 +242,8 @@ static int hf_rdp_Pad2 = -1;
static int hf_rdp_Pad3 = -1;
/* BitmapCache Persistent List Entry */
static int hf_rdp_Key1 = -1;
static int hf_rdp_Key2 = -1;
/* static int hf_rdp_Key1 = -1; */
/* static int hf_rdp_Key2 = -1; */
/* FontList */
#if 0
@ -266,10 +266,10 @@ static int hf_rdp_lengthCapability = -1;
static int hf_rdp_capabilityData = -1;
static int hf_rdp_sessionId = -1;
static int hf_rdp_unknownData = -1;
/* static int hf_rdp_unknownData = -1; */
static int hf_rdp_notYetImplemented = -1;
static int hf_rdp_encrypted = -1;
static int hf_rdp_compressed = -1;
/* static int hf_rdp_compressed = -1; */
static int hf_rdp_channelDefArray = -1;
static int hf_rdp_channelDef = -1;
@ -2470,14 +2470,18 @@ proto_register_rdp(void) {
{ "Pad3", "rdp.Pad3",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }},
/**
{ &hf_rdp_Key1,
{ "Key1", "rdp.Key1",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL }},
**/
/**
{ &hf_rdp_Key2,
{ "Key2", "rdp.Key2",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL }},
**/
{ &hf_rdp_originatorId,
{ "originatorId", "rdp.OriginatorId",
FT_UINT32, BASE_DEC, NULL, 0,
@ -2518,10 +2522,12 @@ proto_register_rdp(void) {
{ "capabilityData", "rdp.capabilityData",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
/**
{ &hf_rdp_unknownData,
{ "unknownData", "rdp.unknownData",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
**/
{ &hf_rdp_notYetImplemented,
{ "notYetImplemented", "rdp.notYetImplemented",
FT_NONE, BASE_NONE, NULL, 0,
@ -2530,10 +2536,12 @@ proto_register_rdp(void) {
{ "encryptedData", "rdp.encryptedData",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
/**
{ &hf_rdp_compressed,
{ "compressedData", "rdp.compressedData",
FT_NONE, BASE_NONE, NULL, 0,
NULL, HFILL }},
**/
{ &hf_rdp_sessionId,
{ "sessionId", "rdp.sessionId",
FT_UINT32, BASE_HEX, NULL, 0,

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

@ -87,11 +87,11 @@ static gint hf_rdt_stre_stream_id = -1;
static gint hf_rdt_stre_packet_sent = -1;
static gint hf_rdt_stre_ext_flag = -1;
static gint hf_rdt_rtt_request_flags = -1;
static gint hf_rdt_rtt_response_flags = -1;
static gint hf_rdt_congestion_flags = -1;
/* static gint hf_rdt_rtt_request_flags = -1; */
/* static gint hf_rdt_rtt_response_flags = -1; */
/* static gint hf_rdt_congestion_flags = -1; */
static gint hf_rdt_report_flags = -1;
static gint hf_rdt_tirq_flags = -1;
/* static gint hf_rdt_tirq_flags = -1; */
static gint hf_rdt_tirp_flags = -1;
static gint hf_rdt_bw_probing_flags = -1;
@ -1520,6 +1520,7 @@ void proto_register_rdt(void)
NULL, HFILL
}
},
/**
{
&hf_rdt_rtt_request_flags,
{
@ -1532,6 +1533,8 @@ void proto_register_rdt(void)
NULL, HFILL
}
},
**/
/**
{
&hf_rdt_rtt_response_flags,
{
@ -1544,6 +1547,8 @@ void proto_register_rdt(void)
NULL, HFILL
}
},
**/
/**
{
&hf_rdt_congestion_flags,
{
@ -1556,6 +1561,7 @@ void proto_register_rdt(void)
NULL, HFILL
}
},
**/
{
&hf_rdt_report_flags,
{
@ -1568,6 +1574,7 @@ void proto_register_rdt(void)
NULL, HFILL
}
},
/**
{
&hf_rdt_tirq_flags,
{
@ -1580,6 +1587,7 @@ void proto_register_rdt(void)
NULL, HFILL
}
},
**/
{
&hf_rdt_tirp_flags,
{

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

@ -96,7 +96,7 @@ static int hf_rohc_rtp_id = -1;
static int hf_rohc_rtp_df = -1;
static int hf_rohc_rtp_rnd = -1;
static int hf_rohc_rtp_nbo = -1;
static int hf_rohc_rtp_checksum = -1;
/* static int hf_rohc_rtp_checksum = -1; */
static int hf_rohc_dynamic_udp_checksum = -1;
static int hf_rohc_dynamic_rtp =-1;
static int hf_rohc_rtp_v = -1;
@ -2092,12 +2092,14 @@ proto_register_rohc(void)
"Whether the IP-ID is in Network Byte Order" , HFILL
}
},
/**
{ &hf_rohc_rtp_checksum,
{ "Checksum","rohc.rtp.checksum",
FT_UINT16, BASE_HEX, NULL, 0x0,
NULL , HFILL
}
},
**/
{ &hf_rohc_dynamic_udp_checksum,
{ "UDP Checksum", "rohc.dynamic.udp.checksum",
FT_UINT16, BASE_HEX, NULL, 0x0,

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

@ -92,7 +92,7 @@ static int hf_roofnet_flags = -1;
static int hf_roofnet_data_length = -1;
static int hf_roofnet_query_dst = -1;
static int hf_roofnet_seq = -1;
static int hf_roofnet_links = -1;
/* static int hf_roofnet_links = -1; */
static int hf_roofnet_link_src = -1;
static int hf_roofnet_link_forward = -1;
static int hf_roofnet_link_rev = -1;
@ -294,10 +294,12 @@ void proto_register_roofnet(void)
FT_UINT32, BASE_DEC, NULL, 0x0, "Roofnet Sequential Number", HFILL }
},
/**
{ &hf_roofnet_links,
{ "Links", "roofnet.links",
FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
},
**/
{ &hf_roofnet_link_src,
{ "Source IP", "roofnet.link.src",

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

@ -404,7 +404,7 @@ static int hf_rtcp_ssrc_high_cycles = -1;
static int hf_rtcp_ssrc_jitter = -1;
static int hf_rtcp_ssrc_lsr = -1;
static int hf_rtcp_ssrc_dlsr = -1;
static int hf_rtcp_ssrc_csrc = -1;
/* static int hf_rtcp_ssrc_csrc = -1; */
static int hf_rtcp_sdes_type = -1;
static int hf_rtcp_sdes_length = -1;
static int hf_rtcp_sdes_text = -1;
@ -3386,6 +3386,7 @@ proto_register_rtcp(void)
NULL, HFILL
}
},
/**
{
&hf_rtcp_ssrc_csrc,
{
@ -3398,6 +3399,7 @@ proto_register_rtcp(void)
NULL, HFILL
}
},
**/
{
&hf_rtcp_sdes_type,
{

10
epan/dissectors/packet-rtmpt.c
View File

@ -308,7 +308,7 @@ static int hf_amf_header_count = -1;
static int hf_amf_header_name = -1;
static int hf_amf_header_must_understand = -1;
static int hf_amf_header_length = -1;
static int hf_amf_header_value_type = -1;
/* static int hf_amf_header_value_type = -1; */
static int hf_amf_message_count = -1;
static int hf_amf_message_target_uri = -1;
static int hf_amf_message_response_uri = -1;
@ -324,7 +324,7 @@ static int hf_amf_string = -1;
static int hf_amf_string_reference = -1;
static int hf_amf_object_reference = -1;
static int hf_amf_date = -1;
static int hf_amf_longstringlength = -1;
/* static int hf_amf_longstringlength = -1; */
static int hf_amf_longstring = -1;
static int hf_amf_xml_doc = -1;
static int hf_amf_xmllength = -1;
@ -2723,9 +2723,11 @@ proto_register_amf(void)
{ "Length", "amf.header.length", FT_UINT32, BASE_DEC,
NULL, 0x0, NULL, HFILL }},
/**
{ &hf_amf_header_value_type,
{ "Value type", "amf.header.value_type", FT_UINT32, BASE_HEX,
/*VALS(rtmpt_type_vals)*/NULL, 0x0, NULL, HFILL }},
VALS(rtmpt_type_vals), 0x0, NULL, HFILL }},
**/
{ &hf_amf_message_count,
{ "Message count", "amf.message_count", FT_UINT16, BASE_DEC,
@ -2785,9 +2787,11 @@ proto_register_amf(void)
{ "Date", "amf.date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL,
NULL, 0x0, "AMF date", HFILL }},
/**
{ &hf_amf_longstringlength,
{ "String length", "amf.longstringlength", FT_UINT32, BASE_DEC,
NULL, 0x0, "AMF long string length", HFILL }},
**/
{ &hf_amf_longstring,
{ "Long string", "amf.longstring", FT_STRING, BASE_NONE,

15
epan/dissectors/packet-rtps2.c
View File

@ -102,7 +102,7 @@ static int hf_rtps_nature_type = -1;
static int hf_rtps_guid_prefix = -1;
static int hf_rtps_host_id = -1;
static int hf_rtps_app_id = -1;
static int hf_rtps_counter = -1;
/* static int hf_rtps_counter = -1; */
static int hf_rtps_sm_id = -1;
static int hf_rtps_sm_flags = -1;
@ -110,8 +110,8 @@ static int hf_rtps_sm_octets_to_next_header = -1;
static int hf_rtps_sm_guid_prefix = -1;
static int hf_rtps_sm_host_id = -1;
static int hf_rtps_sm_app_id = -1;
static int hf_rtps_sm_instance_id = -1;
static int hf_rtps_sm_app_kind = -1;
/* static int hf_rtps_sm_instance_id = -1; */
/* static int hf_rtps_sm_app_kind = -1; */
static int hf_rtps_sm_counter = -1;
static int hf_rtps_sm_entity_id = -1;
static int hf_rtps_sm_entity_id_key = -1;
@ -9095,7 +9095,8 @@ void proto_register_rtps2(void) {
},
/* Counter ------------------------------------------------------------- */
{ &hf_rtps_counter, { /* HIDDEN */
/**
{ &hf_rtps_counter, { / * HIDDEN * /
"counter",
"rtps2.counter",
FT_UINT32,
@ -9105,7 +9106,7 @@ void proto_register_rtps2(void) {
"Sub-component 'counter' of the GuidPrefix of the RTPS packet",
HFILL }
},
**/
/* Submessage ID ------------------------------------------------------- */
{ &hf_rtps_sm_id, {
@ -9176,6 +9177,7 @@ void proto_register_rtps2(void) {
"AppId component of the rtps2.sm.guidPrefix",
HFILL }
},
/**
{ &hf_rtps_sm_instance_id, {
"instanceId",
"rtps2.sm.guidPrefix.appId.instanceId",
@ -9186,6 +9188,8 @@ void proto_register_rtps2(void) {
"instanceId component of the AppId of the rtps2.sm.guidPrefix",
HFILL }
},
**/
/**
{ &hf_rtps_sm_app_kind, {
"appKind",
"rtps2.sm.guidPrefix.appId.appKind",
@ -9196,6 +9200,7 @@ void proto_register_rtps2(void) {
"appKind component of the AppId of the rtps2.sm.guidPrefix",
HFILL }
},
**/
{ &hf_rtps_sm_counter, {
"counter",

20
epan/dissectors/packet-sasp.c
View File

@ -82,7 +82,7 @@ static int hf_sasp_gmd_cnt = -1;
/*dereg req*/
static int hf_sasp_dereg_req_sz = -1;
static int hf_dereg_req_lbflag = -1;
static int hf_dereg_req_reason = -1;
/* static int hf_dereg_req_reason = -1; */
static int hf_dereg_req_reason_flag = -1;
/*dereg reply*/
@ -100,7 +100,7 @@ static int hf_setmemstate_req_lbflag = -1;
static int hf_sasp_setmemstate_req_gmsd_cnt = -1;
/*setmemstate reply*/
static int hf_sasp_setmemstate_rep = -1;
/* static int hf_sasp_setmemstate_rep = -1; */
static int hf_sasp_setmemstate_rep_rcode = -1;
static int hf_sasp_setmemstate_rep_sz = -1;
@ -142,13 +142,13 @@ static int hf_sasp_setlbstate_req_LB_uid_len = -1;
static int hf_sasp_setlbstate_req_LB_uid = -1;
static int hf_sasp_setlbstate_req_LB_health = -1;
/*static int hf_sasp_setlbstate_req_LB_flag = -1;*/
static int hf_lbstate_flag = -1;
/* static int hf_lbstate_flag = -1; */
static int hf_sasp_pushflag = -1;
static int hf_sasp_trustflag = -1;
static int hf_sasp_nochangeflag = -1;
/*setlbstate reply*/
static int hf_sasp_setlbstate_rep = -1;
/* static int hf_sasp_setlbstate_rep = -1; */
static int hf_sasp_setlbstate_rep_rcode = -1;
static int hf_sasp_setlbstate_rep_sz = -1;
@ -167,7 +167,7 @@ static int hf_sasp_memstatedatacomp_quiesce_flag = -1;
static int hf_sasp_weight_entry_data_comp_type = -1;
static int hf_sasp_weight_entry_data_comp_sz = -1;
static int hf_sasp_weight_entry_data_comp_state = -1;
static int hf_wtstate_flag = -1;
/* static int hf_wtstate_flag = -1; */
static int hf_sasp_wed_contactsuccess_flag = -1;
static int hf_sasp_wed_quiesce_flag = -1;
static int hf_sasp_wed_registration_flag = -1;
@ -1312,10 +1312,12 @@ void proto_register_sasp(void)
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL } },
/**
{ &hf_dereg_req_reason,
{ "Dereg Req-Reason", "sasp.dereg-req.reason",
FT_UINT8, BASE_HEX, NULL, 0x0,
"SASP Dereg Req Reason", HFILL } },
**/
/* Dereg Rep */
{ &hf_sasp_dereg_rep_sz,
@ -1358,10 +1360,12 @@ void proto_register_sasp(void)
"Group Of Member State Data Count", HFILL } },
/* Set Mem State Reply */
/**
{ &hf_sasp_setmemstate_rep,
{ "Set Memstate Reply", "sasp.setmemstate-rep",
FT_UINT32, BASE_HEX, NULL, 0x0,
"SASP Set Memstate Reply", HFILL } },
**/
{ &hf_sasp_setmemstate_rep_sz,
{ "Set Memstate Rep-Size", "sasp.setmemstate-rep.size",
@ -1446,10 +1450,12 @@ void proto_register_sasp(void)
/*Set LB State Rep */
/**
{ &hf_sasp_setlbstate_rep,
{ "Set Lbstate Rep", "sasp.msg.type",
FT_UINT32, BASE_HEX, NULL, 0x0,
"SASP Set Lbstate Rep", HFILL } },
**/
{ &hf_sasp_setlbstate_rep_sz,
{ "Set Lbstate Rep-Size", "sasp.setlbstate-rep.size",
@ -1535,10 +1541,12 @@ void proto_register_sasp(void)
FT_UINT8, BASE_HEX, VALS(lbstate_healthtable), 0x0,
"SASP Set LB State Req LB Health", HFILL } },
/**
{ &hf_lbstate_flag,
{ "Flags", "sasp.flags.lbstate",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL } },
**/
{ &hf_sasp_pushflag,
{ "PUSH", "sasp.flags.push",
@ -1614,10 +1622,12 @@ void proto_register_sasp(void)
FT_UINT8, BASE_HEX, NULL, 0x0,
"SASP Wt Entry Data Comp State", HFILL } },
/**
{ &hf_wtstate_flag,
{ "Flags", "sasp.flags.wtstate",
FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL } },
**/
{ &hf_sasp_wed_contactsuccess_flag,
{ "Contact Success", "sasp.flags.contactsuccess",

20
epan/dissectors/packet-sbus.c
View File

@ -230,11 +230,11 @@ static int hf_sbus_sysinfo0_2 = -1;
static int hf_sbus_sysinfo0_3 = -1;
static int hf_sbus_sysinfo0_4 = -1;
static int hf_sbus_sysinfo0_5 = -1;
static int hf_sbus_sysinfo_length = -1;
static int hf_sbus_f_module_type = -1;
static int hf_sbus_harware_version = -1;
static int hf_sbus_hardware_modification = -1;
static int hf_sbus_various = -1;
/* static int hf_sbus_sysinfo_length = -1; */
/* static int hf_sbus_f_module_type = -1; */
/* static int hf_sbus_harware_version = -1; */
/* static int hf_sbus_hardware_modification = -1; */
/* static int hf_sbus_various = -1; */
static int hf_sbus_acknackcode = -1;
static int hf_sbus_cpu_status = -1;
static int hf_sbus_week_day = -1;
@ -2100,35 +2100,45 @@ proto_register_sbus(void)
"Availability of PGU baud switch feature", HFILL }
},
/**
{ &hf_sbus_sysinfo_length,
{ "System information length", "sbus.sysinfo_length",
FT_UINT8, BASE_HEX, NULL, 0,
"System information length in response", HFILL }
},
**/
/**
{ &hf_sbus_f_module_type,
{ "F-module type", "sbus.fmodule_type",
FT_STRING, BASE_NONE, NULL, 0,
"Module type mounted on B1/2 slot", HFILL }
},
**/
/**
{ &hf_sbus_harware_version,
{ "Hardware version", "sbus.hw_version",
FT_STRING, BASE_NONE, NULL, 0,
"Hardware version of the PCD or the module", HFILL }
},
**/
/**
{ &hf_sbus_hardware_modification,
{ "Hardware modification", "sbus.hw_modification",
FT_UINT8, BASE_DEC, NULL, 0,
"Hardware modification of the PCD or module", HFILL }
},
**/
/**
{ &hf_sbus_various,
{ "Various data", "sbus.various",
FT_NONE, BASE_NONE, NULL, 0,
"Various data contained in telegrams but nobody will search for it", HFILL }
},
**/
{ &hf_sbus_acknackcode,
{ "ACK/NAK code", "sbus.nakcode",

8
epan/dissectors/packet-scsi-sbc.c
View File

@ -67,7 +67,7 @@ static int hf_scsi_sbc_ssu_pwr_cond = -1;
static int hf_scsi_sbc_ssu_loej = -1;
static int hf_scsi_sbc_ssu_start = -1;
static int hf_scsi_sbc_bytchk = -1;
static int hf_scsi_sbc_verify_reladdr = -1;
/* static int hf_scsi_sbc_verify_reladdr = -1; */
static int hf_scsi_sbc_verify_lba = -1;
static int hf_scsi_sbc_verify_lba64 = -1;
static int hf_scsi_sbc_verify_vlen = -1;
@ -76,7 +76,7 @@ static int hf_scsi_sbc_wrverify_lba = -1;
static int hf_scsi_sbc_wrverify_xferlen = -1;
static int hf_scsi_sbc_wrverify_lba64 = -1;
static int hf_scsi_sbc_wrverify_xferlen32 = -1;
static int hf_scsi_sbc_readcapacity_flags = -1;
/* static int hf_scsi_sbc_readcapacity_flags = -1; */
static int hf_scsi_sbc_readdefdata_flags = -1;
static int hf_scsi_sbc_reassignblks_flags = -1;
static int hf_scsi_sbc_read_flags = -1;
@ -1818,9 +1818,11 @@ proto_register_scsi_sbc(void)
{ &hf_scsi_sbc_bytchk,
{"BYTCHK", "scsi_sbc.bytchk", FT_BOOLEAN, 8,
NULL, 0x02, NULL, HFILL}},
/**
{ &hf_scsi_sbc_verify_reladdr,
{"RELADDR", "scsi_sbc.verify.reladdr", FT_BOOLEAN, 8, NULL,
0x1, NULL, HFILL}},
**/
{ &hf_scsi_sbc_verify_lba,
{"LBA", "scsi_sbc.verify.lba", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
HFILL}},
@ -1845,9 +1847,11 @@ proto_register_scsi_sbc(void)
{ &hf_scsi_sbc_wrverify_xferlen32,
{"Transfer Length", "scsi_sbc.wrverify.xferlen32", FT_UINT32,
BASE_DEC, NULL, 0x0, NULL, HFILL}},
/**
{ &hf_scsi_sbc_readcapacity_flags,
{"Flags", "scsi_sbc.readcapacity.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL}},
**/
{ &hf_scsi_sbc_readdefdata_flags,
{"Flags", "scsi_sbc.readdefdata.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
HFILL}},

4
epan/dissectors/packet-scsi-smc.c
View File

@ -52,7 +52,7 @@ static int hf_scsi_smc_inv2 = -1;
static int hf_scsi_smc_range_flags = -1;
static int hf_scsi_smc_fast = -1;
static int hf_scsi_smc_range = -1;
static int hf_scsi_smc_sea = -1;
/* static int hf_scsi_smc_sea = -1; */
static int hf_scsi_smc_num_elements = -1;
static int hf_scsi_smc_invert = -1;
static int hf_scsi_smc_ea = -1;
@ -908,9 +908,11 @@ proto_register_scsi_smc(void)
{ &hf_scsi_smc_range,
{"RANGE", "scsi_smc.range", FT_BOOLEAN, 8,
NULL, 0x01, NULL, HFILL}},
/**
{ &hf_scsi_smc_sea,
{"Starting Element Address", "scsi_smc.sea", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL}},
**/
{ &hf_scsi_smc_num_elements,
{"Number of Elements", "scsi_smc.num_elements", FT_UINT16, BASE_DEC,
NULL, 0x0, NULL, HFILL}},

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

@ -102,7 +102,7 @@ static int hf_initack_chunk_number_of_outbound_streams = -1;
static int hf_initack_chunk_number_of_inbound_streams = -1;
static int hf_initack_chunk_initial_tsn = -1;
static int hf_cumulative_tsn_ack = -1;
/* static int hf_cumulative_tsn_ack = -1; */
static int hf_data_chunk_tsn = -1;
static int hf_data_chunk_stream_id = -1;
@ -143,7 +143,7 @@ static int hf_nr_sack_chunk_nr_gap_block_end = -1;
static int hf_nr_sack_chunk_nr_gap_block_start_tsn = -1;
static int hf_nr_sack_chunk_nr_gap_block_end_tsn = -1;
static int hf_nr_sack_chunk_number_tsns_nr_gap_acked = -1;
static int hf_nr_sack_chunk_duplicate_tsn = -1;
/* static int hf_nr_sack_chunk_duplicate_tsn = -1; */
static int hf_shutdown_chunk_cumulative_tsn_ack = -1;
static int hf_cookie = -1;
@ -4064,7 +4064,9 @@ proto_register_sctp(void)
{ &hf_initack_chunk_number_of_outbound_streams, { "Number of outbound streams", "sctp.initack_nr_out_streams", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_initack_chunk_number_of_inbound_streams, { "Number of inbound streams", "sctp.initack_nr_in_streams", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_initack_chunk_initial_tsn, { "Initial TSN", "sctp.initack_initial_tsn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
/**
{ &hf_cumulative_tsn_ack, { "Cumulative TSN Ack", "sctp.cumulative_tsn_ack", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
**/
{ &hf_data_chunk_tsn, { "TSN", "sctp.data_tsn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_data_chunk_stream_id, { "Stream Identifier", "sctp.data_sid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } },
{ &hf_data_chunk_stream_seq_number, { "Stream sequence number", "sctp.data_ssn", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
@ -4101,7 +4103,9 @@ proto_register_sctp(void)
{ &hf_nr_sack_chunk_nr_gap_block_end, { "End", "sctp.nr_sack_nr_gap_block_end", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_nr_sack_chunk_nr_gap_block_end_tsn, { "End TSN", "sctp.nr_sack_nr_gap_block_end_tsn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_nr_sack_chunk_number_tsns_nr_gap_acked, { "Number of TSNs in nr-gap acknowledgement blocks","sctp.nr_sack_number_of_tsns_nr_gap_acked", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
/**
{ &hf_nr_sack_chunk_duplicate_tsn, { "Duplicate TSN", "sctp.nr_sack_duplicate_tsn", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
**/
{ &hf_shutdown_chunk_cumulative_tsn_ack, { "Cumulative TSN Ack", "sctp.shutdown_cumulative_tsn_ack", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_ecne_chunk_lowest_tsn, { "Lowest TSN", "sctp.ecne_lowest_tsn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_cwr_chunk_lowest_tsn, { "Lowest TSN", "sctp.cwr_lowest_tsn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },

21
epan/dissectors/packet-sercosiii.c
View File

@ -111,11 +111,11 @@ static gint hf_siii_at_svch_info = -1;
static gint hf_siii_mdt_svch_idn = -1;
static gint hf_siii_mdt_svch_ctrl = -1;
static gint hf_siii_at_svch_stat = -1;
static gint hf_siii_svch_data_telofs_telno = -1;
static gint hf_siii_svch_data_telofs_mdt_at = -1;
static gint hf_siii_svch_data_telofs_offset = -1;
static gint hf_siii_svch_data_proccmd_proccmdexec = -1;
static gint hf_siii_svch_data_proccmd_proccmd = -1;
/* static gint hf_siii_svch_data_telofs_telno = -1; */
/* static gint hf_siii_svch_data_telofs_mdt_at = -1; */
/* static gint hf_siii_svch_data_telofs_offset = -1; */
/* static gint hf_siii_svch_data_proccmd_proccmdexec = -1; */
/* static gint hf_siii_svch_data_proccmd_proccmd = -1; */
static gint hf_siii_at_dev_status = -1;
static gint hf_siii_at_dev_status_commwarning = -1;
static gint hf_siii_at_dev_status_change_topology = -1;
@ -1379,32 +1379,41 @@ proto_register_sercosiii(void)
FT_UINT16, BASE_DEC, NULL, 0x01,
NULL, HFILL }
},
/**
{ &hf_siii_svch_data_telofs_telno,
{"Telegram Number", "siii.mdt.svch.data.telassign.telno",
FT_UINT16, BASE_DEC, NULL, 0xF000,
NULL, HFILL }
},
**/
/**
{ &hf_siii_svch_data_telofs_mdt_at,
{"Telegram Type", "siii.mdt.svch.data.telassign.mdt_at",
FT_UINT16, BASE_DEC, VALS(siii_svch_data_mdt_at_text), 0x0800,
NULL, HFILL }
},
**/
/**
{ &hf_siii_svch_data_telofs_offset,
{"Telegram Offset", "siii.mdt.svch.data.telassign.offset",
FT_UINT16, BASE_DEC, NULL, 0x07FF,
NULL, HFILL }
},
**/
/**
{ &hf_siii_svch_data_proccmd_proccmdexec,
{"Procedure Command Execution", "siii.mdt.svch.data.proccmd.interrupt",
FT_UINT16, BASE_DEC, VALS(siii_svch_data_proccmd_proccmdexec_text), 0x0002,
NULL, HFILL }
},
**/
/**
{ &hf_siii_svch_data_proccmd_proccmd,
{"Procedure Command", "siii.mdt.svch.data.proccmd.set",
FT_UINT16, BASE_DEC, VALS(siii_svch_data_proccmd_proccmd_text), 0x0001,
NULL, HFILL }
},
**/
{ &hf_siii_mst_channel,
{ "Channel", "siii.channel",
FT_UINT8, BASE_DEC, VALS(siii_mst_channel_text), 0x80,

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

@ -48,8 +48,8 @@ static int proto_ses = -1;
static int hf_ses_type = -1;
static int hf_ses_type_0 = -1;
static int hf_ses_length = -1;
static int hf_ses_version = -1;
static int hf_ses_reserved = -1;
/* static int hf_ses_version = -1; */
/* static int hf_ses_reserved = -1; */
static int hf_ses_segment_data = -1;
static int hf_ses_segments = -1;
@ -1267,6 +1267,7 @@ proto_register_ses(void)
}
},
/**
{
&hf_ses_version,
{
@ -1279,6 +1280,8 @@ proto_register_ses(void)
NULL, HFILL
}
},
**/
/**
{
&hf_ses_reserved,
{
@ -1291,6 +1294,7 @@ proto_register_ses(void)
NULL, HFILL
}
},
**/
{
&hf_called_ss_user_reference,
{

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

@ -510,13 +510,13 @@ static int hf_sflow_agent_address_v6 = -1;
static int hf_sflow_5_sub_agent_id = -1;
static int hf_sflow_5_sample_length = -1;
static int hf_sflow_5_flow_data_length = -1;
static int hf_sflow_5_counters_data_length = -1;
/* static int hf_sflow_5_counters_data_length = -1; */
static int hf_sflow_245_seqnum = -1;
static int hf_sflow_245_sysuptime = -1;
static int hf_sflow_245_numsamples = -1;
static int hf_sflow_245_header_protocol = -1;
static int hf_sflow_245_sampletype = -1;
static int hf_sflow_245_ipv4_precedence_type = -1;
/* static int hf_sflow_245_ipv4_precedence_type = -1; */
static int hf_sflow_5_flow_record_format = -1;
static int hf_sflow_5_counters_record_format = -1;
static int hf_sflow_245_header = -1;
@ -544,15 +544,15 @@ static int hf_sflow_245_dst_as_entries = -1; /* aka length */
static int hf_sflow_245_dst_as = -1;
/* extended gateway (>= version 4) */
static int hf_sflow_245_community_entries = -1;
static int hf_sflow_245_community = -1;
/* static int hf_sflow_245_community = -1; */
static int hf_sflow_245_localpref = -1;
/* generic interface counter */
static int hf_sflow_245_ifindex = -1;
static int hf_sflow_245_iftype = -1;
static int hf_sflow_245_ifspeed = -1;
static int hf_sflow_245_ifdirection = -1;
static int hf_sflow_245_ifstatus = -1;
/* static int hf_sflow_245_ifdirection = -1; */
/* static int hf_sflow_245_ifstatus = -1; */
static int hf_sflow_245_ifinoct = -1;
static int hf_sflow_245_ifinpkt = -1;
static int hf_sflow_245_ifinmcast = -1;
@ -648,7 +648,7 @@ static int hf_sflow_5_dot11QoSCFPollsReceivedCount = -1;
static int hf_sflow_5_dot11QoSCFPollsUnusedCount = -1;
static int hf_sflow_5_dot11QoSCFPollsUnusableCount = -1;
static int hf_sflow_5_dot11QoSCFPollsLostCount = -1;
static int hf_sflow_5_ieee80211_version = -1;
/* static int hf_sflow_5_ieee80211_version = -1; */
/* processor information */
@ -2795,10 +2795,12 @@ proto_register_sflow(void) {
{ "Flow data length (byte)", "sflow_5.flow_data_length",
FT_UINT32, BASE_DEC, NULL, 0x0,
"sFlow flow data length", HFILL}},
/**
{ &hf_sflow_5_counters_data_length,
{ "Counters data length (byte)", "sflow_5.counter_data_length",
FT_UINT32, BASE_DEC, NULL, 0x0,
"sFlow counters data length", HFILL}},
**/
{ &hf_sflow_245_seqnum,
{ "Sequence number", "sflow_245.sequence_number",
FT_UINT32, BASE_DEC, NULL, 0x0,
@ -2815,14 +2817,18 @@ proto_register_sflow(void) {
{ "sFlow sample type", "sflow_245.sampletype",
FT_UINT32, BASE_DEC, VALS(sflow_245_sampletype), 0x0,
"Type of sFlow sample", HFILL}},
/**
{ &hf_sflow_5_ieee80211_version,
{ "Version", "sflow_245.ieee80211_version",
FT_UINT32, BASE_DEC, VALS(sflow_5_ieee80211_versions), 0x0,
"IEEE 802.11 Version", HFILL}},
**/
/**
{ &hf_sflow_245_ipv4_precedence_type,
{ "Precedence", "sflow_245.ipv4_precedence_type",
FT_UINT8, BASE_DEC, VALS(sflow_245_ipv4_precedence_types), 0x0,
"IPv4 Precedence Type", HFILL}},
**/
{ &hf_sflow_5_flow_record_format,
{ "Format", "sflow_245.flow_record_format",
FT_UINT32, BASE_DEC, VALS(sflow_5_flow_record_type), 0x0,
@ -2924,10 +2930,12 @@ proto_register_sflow(void) {
{ "Gateway Communities", "sflow_245.communityEntries",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}},
/**
{ &hf_sflow_245_community,
{ "Gateway Community", "sflow_245.community",
FT_UINT32, BASE_DEC, NULL, 0x0,
"Gateway Communities", HFILL}},
**/
{ &hf_sflow_245_localpref,
{ "localpref", "sflow_245.localpref",
FT_UINT32, BASE_DEC, NULL, 0x0,
@ -2941,14 +2949,18 @@ proto_register_sflow(void) {
{ "Interface Speed", "sflow_245.ifspeed",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL}},
/**
{ &hf_sflow_245_ifdirection,
{ "Interface Direction", "sflow_245.ifdirection",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}},
**/
/**
{ &hf_sflow_245_ifstatus,
{ "Interface Status", "sflow_245.ifstatus",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}},
**/
{ &hf_sflow_245_ifinoct,
{ "Input Octets", "sflow_245.ifinoct",
FT_UINT64, BASE_DEC, NULL, 0x0,

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

@ -59,7 +59,7 @@ static int hf_sigcomp_udvm_instr = -1;
static int hf_udvm_multitype_bytecode = -1;
static int hf_udvm_reference_bytecode = -1;
static int hf_udvm_literal_bytecode = -1;
static int hf_udvm_operand = -1;
/* static int hf_udvm_operand = -1; */
static int hf_udvm_length = -1;
static int hf_udvm_addr_length = -1;
static int hf_udvm_destination = -1;
@ -2327,11 +2327,13 @@ proto_register_sigcomp(void)
FT_UINT8, BASE_HEX, VALS(display_lit_bytecode_vals), 0x0,
NULL, HFILL }
},
/**
{ &hf_udvm_operand,
{ "UDVM operand", "sigcomp.udvm.operand",
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
**/
{ &hf_udvm_length,
{ "%Length", "sigcomp.udvm.length",
FT_UINT16, BASE_DEC, NULL, 0x0,

12
epan/dissectors/packet-slsk.c
View File

@ -51,7 +51,7 @@ static int hf_slsk_byte = -1;
static int hf_slsk_message_length = -1;
static int hf_slsk_message_code = -1;
static int hf_slsk_client_ip = -1;
static int hf_slsk_server_ip = -1;
/* static int hf_slsk_server_ip = -1; */
static int hf_slsk_string_length = -1;
static int hf_slsk_username = -1;
static int hf_slsk_password = -1;
@ -82,7 +82,7 @@ static int hf_slsk_number_of_rooms = -1;
static int hf_slsk_filename = -1;
static int hf_slsk_directory = -1;
static int hf_slsk_size = -1;
static int hf_slsk_checksum = -1;
/* static int hf_slsk_checksum = -1; */
static int hf_slsk_code = -1;
static int hf_slsk_number_of_users = -1;
static int hf_slsk_number_of_days = -1;
@ -90,7 +90,7 @@ static int hf_slsk_transfer_direction = -1;
static int hf_slsk_user_description = -1;
static int hf_slsk_picture_exists = -1;
static int hf_slsk_picture = -1;
static int hf_slsk_user_uploads = -1;
/* static int hf_slsk_user_uploads = -1; */
static int hf_slsk_total_uploads = -1;
static int hf_slsk_queued_uploads = -1;
static int hf_slsk_slots_available = -1;
@ -2419,9 +2419,11 @@ proto_register_slsk(void)
{ &hf_slsk_client_ip,
{ "Client IP", "slsk.client.ip",
FT_IPv4, BASE_NONE, NULL, 0, "Client IP Address", HFILL } },
/**
{ &hf_slsk_server_ip,
{ "SoulSeek Server IP", "slsk.server.ip",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
**/
{ &hf_slsk_string_length,
{ "String Length", "slsk.string.length",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
@ -2512,9 +2514,11 @@ proto_register_slsk(void)
{ &hf_slsk_size,
{ "Size", "slsk.size",
FT_UINT32, BASE_DEC, NULL, 0, "File Size", HFILL } },
/**
{ &hf_slsk_checksum,
{ "Checksum", "slsk.checksum",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
**/
{ &hf_slsk_code,
{ "Code", "slsk.code",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
@ -2536,9 +2540,11 @@ proto_register_slsk(void)
{ &hf_slsk_picture,
{ "Picture", "slsk.user.picture",
FT_STRING, BASE_NONE, NULL, 0, "User Picture", HFILL } },
/**
{ &hf_slsk_user_uploads,
{ "User uploads", "slsk.uploads.user",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
**/
{ &hf_slsk_total_uploads,
{ "Total uploads allowed", "slsk.uploads.total",
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },

4
epan/dissectors/packet-smb-browse.c
View File

@ -90,7 +90,7 @@ static int hf_election_desire_flags_master = -1;
static int hf_election_desire_flags_domain_master = -1;
static int hf_election_desire_flags_wins = -1;
static int hf_election_desire_flags_nt = -1;
static int hf_election_revision = -1;
/* static int hf_election_revision = -1; */
static int hf_election_os = -1;
static int hf_election_os_wfw = -1;
static int hf_election_os_ntw = -1;
@ -1126,9 +1126,11 @@ proto_register_smb_browse(void)
{ "NT", "browser.election.desire.nt", FT_BOOLEAN, 8,
TFS(&tfs_desire_nt), 1<<DESIRE_NT, "Is this a NT server", HFILL }},
/**
{ &hf_election_revision,
{ "Election Revision", "browser.election.revision", FT_UINT16, BASE_DEC,
NULL, 0, NULL, HFILL }},
**/
{ &hf_election_os,
{ "Election OS", "browser.election.os", FT_UINT8, BASE_HEX,

12
epan/dissectors/packet-sna.c
View File

@ -129,8 +129,8 @@ static int hf_sna_nlp_opti_0e_nabsp = -1;
static int hf_sna_nlp_opti_0e_sync = -1;
static int hf_sna_nlp_opti_0e_echo = -1;
static int hf_sna_nlp_opti_0e_rseq = -1;
static int hf_sna_nlp_opti_0e_abspbeg = -1;
static int hf_sna_nlp_opti_0e_abspend = -1;
/* static int hf_sna_nlp_opti_0e_abspbeg = -1; */
/* static int hf_sna_nlp_opti_0e_abspend = -1; */
static int hf_sna_nlp_opti_0f_bits = -1;
static int hf_sna_nlp_opti_10_tcid = -1;
static int hf_sna_nlp_opti_12_sense = -1;
@ -196,7 +196,7 @@ static int hf_sna_gds_len = -1;
static int hf_sna_gds_type = -1;
static int hf_sna_gds_cont = -1;
static int hf_sna_xid = -1;
/* static int hf_sna_xid = -1; */
static int hf_sna_xid_0 = -1;
static int hf_sna_xid_id = -1;
static int hf_sna_xid_format = -1;
@ -2976,13 +2976,17 @@ proto_register_sna(void)
{ "Received Sequence Number", "sna.nlp.thdr.optional.0e.rseq",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
/**
{ &hf_sna_nlp_opti_0e_abspbeg,
{ "ABSP Begin", "sna.nlp.thdr.optional.0e.abspbeg",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
**/
/**
{ &hf_sna_nlp_opti_0e_abspend,
{ "ABSP End", "sna.nlp.thdr.optional.0e.abspend",
FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
**/
{ &hf_sna_nlp_opti_0f_bits,
{ "Client Bits", "sna.nlp.thdr.optional.0f.bits",
@ -3257,9 +3261,11 @@ proto_register_sna(void)
{ "Type of Variable", "sna.gds.type", FT_UINT16, BASE_HEX,
VALS(sna_gds_var_vals), 0x0, NULL, HFILL }},
/**
{ &hf_sna_xid,
{ "XID", "sna.xid", FT_NONE, BASE_NONE, NULL, 0x0,
"XID Frame", HFILL }},
**/
{ &hf_sna_xid_0,
{ "XID Byte 0", "sna.xid.0", FT_UINT8, BASE_HEX, NULL, 0x0,

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

@ -41,7 +41,7 @@ static int hf_spp_dst_id = -1;
static int hf_spp_seq_nr = -1;
static int hf_spp_ack_nr = -1;
static int hf_spp_all_nr = -1;
static int hf_spp_rexmt_frame = -1;
/* static int hf_spp_rexmt_frame = -1; */
static gint ett_spp = -1;
static gint ett_spp_connctrl = -1;
@ -254,10 +254,12 @@ proto_register_spp(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
/**
{ &hf_spp_rexmt_frame,
{ "Retransmitted Frame Number", "spp.rexmt_frame",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
**/
};
static gint *ett[] = {

6
epan/dissectors/packet-teamspeak2.c
View File

@ -234,7 +234,7 @@ static int hf_ts2_crc32 = -1;
static int hf_ts2_ackto = -1;
static int hf_ts2_seqnum = -1;
static int hf_ts2_protocol_string = -1;
static int hf_ts2_string = -1;
/* static int hf_ts2_string = -1; */
static int hf_ts2_registeredlogin = -1;
static int hf_ts2_name = -1;
static int hf_ts2_password = -1;
@ -435,7 +435,7 @@ static void ts2_standard_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
fragment_number = tvb_get_letohs(tvb, 18);
frag_msg = fragment_add_seq_check(tvb, 24, pinfo, type, msg_fragment_table, msg_reassembled_table, frag->frag_num, tvb_length_remaining(tvb, 24), fragment_number);
new_tvb = process_reassembled_data(tvb, 24, pinfo,"Reassembled TeamSpeak2", frag_msg, &msg_frag_items, NULL, ts2_tree);
if (frag_msg)
if (frag_msg) /* XXX: should be if (new_tvb) ?? */
{ /* Reassembled */
col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled)");
}
@ -903,12 +903,14 @@ void proto_register_ts2(void)
NULL, 0x0,
NULL, HFILL }
},
/**
{ &hf_ts2_string,
{ "String", "ts2.string",
FT_STRING, BASE_NONE,
NULL, 0x0,
NULL, HFILL }
},
**/
{ &hf_ts2_registeredlogin,
{ "Registered Login", "ts2.registeredlogin",
FT_BOOLEAN, BASE_NONE,

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

@ -123,7 +123,7 @@ static int hf_tipcv2_opt_p = -1;
static int hf_tipcv2_broadcast_ack_no = -1;
static int hf_tipcv2_link_level_ack_no = -1;
static int hf_tipcv2_link_level_seq_no = -1;
static int hf_tipcv2_bcast_seq_no = -1;
/* static int hf_tipcv2_bcast_seq_no = -1; */
static int hf_tipcv2_prev_node = -1;
static int hf_tipcv2_orig_node = -1;
static int hf_tipcv2_dest_node = -1;
@ -2655,11 +2655,13 @@ proto_register_tipc(void)
FT_UINT32, BASE_DEC, NULL, 0x0000FFFF,
NULL, HFILL }
},
/**
{ &hf_tipcv2_bcast_seq_no,
{ "Broadcast Sequence Number", "tipcv2.bcast_seq_no",
FT_UINT32, BASE_DEC, NULL, 0x0000FFFF,
NULL, HFILL }
},
**/
{ &hf_tipcv2_prev_node,
{ "Previous Node", "tipcv2.prev_node",
FT_STRING, BASE_NONE, NULL, 0x0,

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

@ -120,7 +120,7 @@ static int hf_tns_abort_data = -1;
static int hf_tns_marker = -1;
static int hf_tns_marker_type = -1;
static int hf_tns_marker_data_byte = -1;
static int hf_tns_marker_data = -1;
/* static int hf_tns_marker_data = -1; */
static int hf_tns_redirect = -1;
static int hf_tns_redirect_data_length = -1;
@ -1224,9 +1224,11 @@ void proto_register_tns(void)
{ &hf_tns_marker_data_byte, {
"Marker Data Byte", "tns.marker.databyte", FT_UINT8, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
/**
{ &hf_tns_marker_data, {
"Marker Data", "tns.marker.data", FT_UINT16, BASE_HEX,
NULL, 0x0, NULL, HFILL }},
**/
{ &hf_tns_control, {
"Control", "tns.control", FT_BOOLEAN, BASE_NONE,

12
epan/dissectors/packet-tte-pcf.c
View File

@ -41,14 +41,14 @@
/* Initialize the protocol and registered fields */
static int proto_tte_pcf = -1;
static int hf_tte_pcf = -1;
/* static int hf_tte_pcf = -1; */
static int hf_tte_pcf_ic = -1;
static int hf_tte_pcf_mn = -1;
static int hf_tte_pcf_res0 = -1;
/* static int hf_tte_pcf_res0 = -1; */
static int hf_tte_pcf_sp = -1;
static int hf_tte_pcf_sd = -1;
static int hf_tte_pcf_type = -1;
static int hf_tte_pcf_res1 = -1;
/* static int hf_tte_pcf_res1 = -1; */
static int hf_tte_pcf_tc = -1;
/* Initialize the subtree pointers */
@ -145,11 +145,13 @@ proto_register_tte_pcf(void)
{
static hf_register_info hf[] = {
/**
{ &hf_tte_pcf,
{ "Protocol Control Frame", "tte.pcf",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
**/
{ &hf_tte_pcf_ic,
{ "Integration Cycle", "tte.pcf.ic",
FT_UINT32, BASE_HEX, NULL, 0x0,
@ -160,11 +162,13 @@ proto_register_tte_pcf(void)
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
/**
{ &hf_tte_pcf_res0,
{ "Reserved 0", "tte.pcf.res0",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
**/
{ &hf_tte_pcf_sp,
{ "Sync Priority", "tte.pcf.sp",
FT_UINT8, BASE_HEX, NULL, 0x0,
@ -180,11 +184,13 @@ proto_register_tte_pcf(void)
FT_UINT8, BASE_HEX, VALS(pcf_type_str_vals), 0x0F,
NULL, HFILL }
},
/**
{ &hf_tte_pcf_res1,
{ "Reserved 1", "tte.pcf.res1",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
**/
{ &hf_tte_pcf_tc,
{ "Transparent Clock", "tte.pcf.tc",
FT_UINT64, BASE_HEX, NULL, 0x0,

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

@ -58,10 +58,10 @@ static dissector_table_t encap_dissector_table;
/* WLAN radio header felds */
/* ************************************************************************* */
static int hf_status_field = -1;
/* static int hf_status_field = -1; */
static int hf_status_msg_type = -1;
static int hf_status_pcf = -1;
static int hf_status_mac_port = -1;
/* static int hf_status_mac_port = -1; */
static int hf_status_undecrypted = -1;
static int hf_status_fcs_error = -1;
@ -439,15 +439,19 @@ proto_register_tzsp(void)
{ &hf_tzsp_encap, {
"Encapsulation", "tzsp.encap", FT_UINT16, BASE_DEC,
NULL, 0, NULL, HFILL }},
/**
{ &hf_status_field, {
"Status", "tzsp.wlan.status", FT_UINT16, BASE_HEX,
NULL, 0, NULL, HFILL }},
**/
{ &hf_status_msg_type, {
"Type", "tzsp.wlan.status.msg_type", FT_UINT8, BASE_HEX,
VALS(msg_type), 0, "Message type", HFILL }},
/**
{ &hf_status_mac_port, {
"Port", "tzsp.wlan.status.mac_port", FT_UINT8, BASE_DEC,
NULL, 0, "MAC port", HFILL }},
**/
{ &hf_status_pcf, {
"PCF", "tzsp.wlan.status.pcf", FT_BOOLEAN, BASE_NONE,
TFS (&pcf_flag), 0x0, "Point Coordination Function", HFILL }},

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

@ -122,7 +122,7 @@ static int hf_fp_edch_macis_flag = -1;
static int hf_fp_frame_seq_nr = -1;
static int hf_fp_hsdsch_pdu_block_header = -1;
static int hf_fp_hsdsch_pdu_block = -1;
/* static int hf_fp_hsdsch_pdu_block = -1; */
static int hf_fp_flush = -1;
static int hf_fp_fsn_drt_reset = -1;
static int hf_fp_drt_indicator = -1;
@ -4847,12 +4847,14 @@ void proto_register_fp(void)
"HS-DSCH type 2 PDU block header", HFILL
}
},
/**
{ &hf_fp_hsdsch_pdu_block,
{ "PDU block",
"fp.hsdsch.pdu-block", FT_STRING, BASE_NONE, NULL, 0x0,
"HS-DSCH type 2 PDU block data", HFILL
}
},
**/
{ &hf_fp_flush,
{ "Flush",
"fp.flush", FT_UINT8, BASE_DEC, 0, 0x04,

30
epan/dissectors/packet-umts_mac.c
View File

@ -48,18 +48,18 @@ static int hf_mac_ueid_type = -1;
static int hf_mac_crnti = -1;
static int hf_mac_urnti = -1;
static int hf_mac_channel = -1;
static int hf_mac_channel_str = -1;
/* static int hf_mac_channel_str = -1; */
static int hf_mac_lch_id = -1;
static int hf_mac_macdflowd_id = -1;
static int hf_mac_channel_hsdsch = -1;
/* static int hf_mac_channel_hsdsch = -1; */
static int hf_mac_trch_id = -1;
static int hf_mac_edch_type2_subframe_header = -1;
static int hf_mac_edch_type2_descriptors = -1;
static int hf_mac_edch_type2_lchid = -1;
static int hf_mac_edch_type2_length = -1;
static int hf_mac_edch_type2_flag = -1;
/* static int hf_mac_edch_type2_subframe_header = -1; */
/* static int hf_mac_edch_type2_descriptors = -1; */
/* static int hf_mac_edch_type2_lchid = -1; */
/* static int hf_mac_edch_type2_length = -1; */
/* static int hf_mac_edch_type2_flag = -1; */
static int hf_mac_edch_type2_tsn = -1;
static int hf_mac_edch_type2_ss = -1;
static int hf_mac_edch_type2_sdu = -1;
@ -1347,13 +1347,17 @@ proto_register_umts_mac(void)
FT_UINT16, BASE_DEC, VALS(mac_logical_channel_vals), 0, NULL, HFILL }
},
/**
{ &hf_mac_channel_str,
{ "Logical Channel", "mac.logical_channel",
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }
},
{ &hf_mac_channel_hsdsch,
**/
/**
{ &hf_mac_channel_hsdsch,
{ "MACd-FlowID", "mac.macd_flowid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
**/
{ &hf_mac_macdflowd_id,
{ "MACd-FlowID", "mac.macd_flowid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
@ -1363,30 +1367,38 @@ proto_register_umts_mac(void)
{ &hf_mac_trch_id,
{ "Transport Channel ID", "mac.transport_channel_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
/**
{ &hf_mac_edch_type2_descriptors,
{ "MAC-is Descriptors",
"mac.edch.type2.descriptors", FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL
}
},
**/
/**
{ &hf_mac_edch_type2_lchid,
{ "LCH-ID",
"mac.logical_channel_id", FT_UINT8, BASE_HEX, NULL, 0xf0,
NULL, HFILL
}
},
**/
/**
{ &hf_mac_edch_type2_length,
{ "Length",
"mac.edch.type2.length", FT_UINT16, BASE_DEC, NULL, 0x0ffe,
NULL, HFILL
}
},
**/
/**
{ &hf_mac_edch_type2_flag,
{ "Flag",
"mac.edch.type2.lchid", FT_UINT8, BASE_HEX, NULL, 0x01,
"Indicates if another entry follows", HFILL
}
},
**/
{ &hf_mac_edch_type2_ss,
{ "SS",
/* TODO: VALS */
@ -1412,12 +1424,14 @@ proto_register_umts_mac(void)
NULL, HFILL
}
},
/**
{ &hf_mac_edch_type2_subframe_header,
{ "Subframe header",
"mac.edch.type2.subframeheader", FT_STRING, BASE_NONE, NULL, 0x0,
"EDCH Subframe header", HFILL
}
},
**/
{ &hf_mac_is_reasmin,
{ "Reassembled in frame", "mac.is.reasmin",
FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL }

4
epan/dissectors/packet-usb-hid.c
View File

@ -74,7 +74,7 @@ static int hf_usb_hid_globalitem_pop = -1;
static int hf_usb_hid_localitem_usage = -1;
static int hf_usb_hid_localitem_usage_min = -1;
static int hf_usb_hid_localitem_usage_max = -1;
/* static int hf_usb_hid_localitem_usage_max = -1; */
static int hf_usb_hid_localitem_desig_index = -1;
static int hf_usb_hid_localitem_desig_min = -1;
static int hf_usb_hid_localitem_desig_max = -1;
@ -965,9 +965,11 @@ proto_register_usb_hid(void)
{ "Usage minimum", "usbhid.item.local.usage_min", FT_UINT8, BASE_HEX,
NULL, 0, NULL, HFILL }},
/**
{ &hf_usb_hid_localitem_usage_max,
{ "Usage maximum", "usbhid.item.local.usage_max", FT_UINT8, BASE_HEX,
NULL, 0, NULL, HFILL }},
**/
{ &hf_usb_hid_localitem_desig_index,
{ "Designator index", "usbhid.item.local.desig_index", FT_UINT8, BASE_HEX,

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

@ -67,7 +67,7 @@ static int hf_usb_request_unknown_class = -1;
static int hf_usb_value = -1;
static int hf_usb_index = -1;
static int hf_usb_length = -1;
static int hf_usb_data_len = -1;
/* static int hf_usb_data_len = -1; */
static int hf_usb_capdata = -1;
static int hf_usb_wFeatureSelector = -1;
static int hf_usb_wInterface = -1;
@ -3103,10 +3103,12 @@ proto_register_usb(void)
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
/* --------------------------------- */
/**
{ &hf_usb_data_len,
{"Application Data Length", "usb.data.length",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
**/
{ &hf_usb_capdata,
{"Leftover Capture Data", "usb.capdata",

672
epan/dissectors/packet-v52.c
View File

File diff suppressed because it is too large Load Diff

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

@ -43,7 +43,7 @@
static int proto_v5dl = -1;
static int hf_v5dl_direction = -1;
static int hf_v5dl_address = -1;
/* static int hf_v5dl_address = -1; */
static int hf_v5dl_ef = -1;
static int hf_v5dl_eah = -1;
static int hf_v5dl_cr = -1;
@ -324,9 +324,11 @@ proto_register_v5dl(void)
{ "Direction", "v5dl.direction", FT_UINT8, BASE_DEC, VALS(v5dl_direction_vals), 0x0,
NULL, HFILL }},
/**
{ &hf_v5dl_address,
{ "Address Field", "v5dl.address", FT_UINT16, BASE_HEX, NULL, 0x0,
"Address", HFILL }},
**/
{ &hf_v5dl_ef,
{ "EF", "v5dl.ef", FT_UINT16, BASE_DEC, VALS(v5dl_addr_vals), 0x0,

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

@ -67,7 +67,7 @@ static int hf_version = -1;
static int hf_reserved = -1;
static int hf_msg_class = -1;
static int hf_msg_type = -1;
static int hf_msg_type_id = -1;
/* static int hf_msg_type_id = -1; */
static int hf_msg_length = -1;
/* V5UA message header */
static int hf_link_id = -1;
@ -83,7 +83,7 @@ static int hf_dlci_sapi = -1;
static int hf_dlci_one_bit = -1;
static int hf_dlci_tei = -1;
static int hf_efa = -1;
static int hf_spare_efa = -1;
/* static int hf_spare_efa = -1; */
/* variable length parameter (msg) */
static int hf_parameter_tag = -1;
static int hf_parameter_tag_draft = -1;
@ -1516,10 +1516,12 @@ proto_register_v5ua(void)
{ "Message Type", "v5ua.msg_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL } },
/**
{ &hf_msg_type_id,
{ "Message Type ID", "v5ua.msg_type_id",
FT_UINT8, BASE_DEC, VALS(msg_class_type_values), 0x0,
NULL, HFILL } },
**/
{ &hf_msg_length,
{ "Message length", "v5ua.msg_length",
FT_UINT32, BASE_DEC, NULL, 0x0,
@ -1577,10 +1579,12 @@ proto_register_v5ua(void)
{ "Envelope Function Address","v5ua.efa",
FT_UINT16, BASE_DEC, VALS(efa_values), 0x0,
NULL, HFILL } },
/**
{ &hf_spare_efa,
{ "Envelope Function Address (spare)","v5ua.efa",
FT_UINT16, BASE_DEC, NULL, ~7,
NULL, HFILL } },
**/
{ &hf_asp_reason,
{ "Reason", "v5ua.asp_reason",
FT_UINT32, BASE_HEX, VALS(asp_reason_values), 0x0,

859
epan/dissectors/packet-vcdu.c
View File

File diff suppressed because it is too large Load Diff

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

@ -72,7 +72,7 @@ static int hf_wassp_flags = -1;
static int hf_wassp_sessionid = -1;
static int hf_wassp_length = -1;
/* tunnel data */
static int hf_data = -1;
/* static int hf_data = -1; */
/* tunnel tlvs */
static int hf_status = -1;
static int hf_ru_soft_version = -1;
@ -1068,9 +1068,11 @@ proto_register_wassp(void)
0x0, NULL, HFILL }},
/* Data: Embedded IEEE 802.11 Frame */
/**
{ &hf_data,
{ "DATA", "wassp.data", FT_NONE, BASE_NONE, NULL,
0x0, NULL, HFILL }},
**/
/* WASSP tunnel data */
{ &hf_status,

12
epan/dissectors/packet-waveagent.c
View File

@ -91,9 +91,9 @@ static int hf_waveagent_rx3pl = -1;
static int hf_waveagent_rx4pl = -1;
static int hf_waveagent_rx5pl = -1;
static int hf_waveagent_rxoospkts = -1;
static int hf_waveagent_rxmeanlatency = -1;
static int hf_waveagent_rxminlatency = -1;
static int hf_waveagent_rxmaxlatency = -1;
/* static int hf_waveagent_rxmeanlatency = -1; */
/* static int hf_waveagent_rxminlatency = -1; */
/* static int hf_waveagent_rxmaxlatency = -1; */
static int hf_waveagent_latencysum = -1;
static int hf_waveagent_latencycount = -1;
static int hf_waveagent_txflowstop = -1;
@ -1467,20 +1467,26 @@ void proto_register_waveagent(void)
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL } },
/**
{ &hf_waveagent_rxmeanlatency,
{ "Rx Mean latency", "waveagent.rxmeanlatency",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL } },
**/
/**
{ &hf_waveagent_rxminlatency,
{ "Rx Minimum latency", "waveagent.rxminlatency",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL } },
**/
/**
{ &hf_waveagent_rxmaxlatency,
{ "Rx Maximum latency", "waveagent.rxmaxlatency",
FT_UINT64, BASE_DEC, NULL, 0x0,
NULL, HFILL } },
**/
{ &hf_waveagent_jitter,
{ "Jitter (microseconds)", "waveagent.jitter",

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

@ -148,14 +148,14 @@ static int hf_wcp_alg_a = -1;
static int hf_wcp_alg_b = -1;
static int hf_wcp_alg_c = -1;
static int hf_wcp_alg_d = -1;
static int hf_wcp_rexmit = -1;
/* static int hf_wcp_rexmit = -1; */
static int hf_wcp_hist_size = -1;
static int hf_wcp_ppc = -1;
static int hf_wcp_pib = -1;
static int hf_wcp_comp_bits = -1;
static int hf_wcp_comp_marker = -1;
/* static int hf_wcp_comp_marker = -1; */
static int hf_wcp_short_len = -1;
static int hf_wcp_long_len = -1;
static int hf_wcp_short_run = -1;
@ -647,9 +647,11 @@ proto_register_wcp(void)
{ &hf_wcp_alg,
{ "Alg", "wcp.alg", FT_UINT8, BASE_DEC, NULL, 0,
"Algorithm", HFILL }},
/**
{ &hf_wcp_rexmit,
{ "Rexmit", "wcp.rexmit", FT_UINT8, BASE_DEC, NULL, 0,
"Retransmit", HFILL }},
**/
{ &hf_wcp_hist_size,
{ "History", "wcp.hist", FT_UINT8, BASE_DEC, NULL, 0,
"History Size", HFILL }},
@ -662,9 +664,11 @@ proto_register_wcp(void)
{ &hf_wcp_comp_bits,
{ "Compress Flag", "wcp.flag", FT_UINT8, BASE_HEX, NULL, 0,
"Compressed byte flag", HFILL }},
/**
{ &hf_wcp_comp_marker,
{ "Compress Marker", "wcp.mark", FT_UINT8, BASE_DEC, NULL, 0,
"Compressed marker", HFILL }},
**/
{ &hf_wcp_offset,
{ "Source offset", "wcp.off", FT_UINT16, BASE_HEX, NULL, WCP_OFFSET_MASK,
"Data source offset", HFILL }},

71
epan/dissectors/packet-wifi-p2p.c
View File

@ -231,7 +231,7 @@ static gint ett_p2p_service_tlv = -1;
static int hf_p2p_attr_type = -1;
static int hf_p2p_attr_len = -1;
static int hf_p2p_attr_capab = -1;
/* static int hf_p2p_attr_capab = -1; */
static int hf_p2p_attr_capab_device = -1;
static int hf_p2p_attr_capab_device_service_discovery = -1;
static int hf_p2p_attr_capab_device_client_discoverability = -1;
@ -255,23 +255,23 @@ static int hf_p2p_attr_status = -1;
static int hf_p2p_attr_go_intent = -1;
static int hf_p2p_attr_go_intent_tie_breaker = -1;
static int hf_p2p_attr_listen_channel = -1;
/* static int hf_p2p_attr_listen_channel = -1; */
static int hf_p2p_attr_listen_channel_country = -1;
static int hf_p2p_attr_listen_channel_oper_class = -1;
static int hf_p2p_attr_listen_channel_number = -1;
static int hf_p2p_attr_operating_channel = -1;
/* static int hf_p2p_attr_operating_channel = -1; */
static int hf_p2p_attr_operating_channel_country = -1;
static int hf_p2p_attr_operating_channel_oper_class = -1;
static int hf_p2p_attr_operating_channel_number = -1;
static int hf_p2p_attr_channel_list = -1;
/* static int hf_p2p_attr_channel_list = -1; */
static int hf_p2p_attr_channel_list_country = -1;
static int hf_p2p_attr_channel_list_oper_class = -1;
static int hf_p2p_attr_channel_list_num_chan = -1;
static int hf_p2p_attr_channel_list_chan = -1;
static int hf_p2p_attr_dev_info = -1;
/* static int hf_p2p_attr_dev_info = -1; */
static int hf_p2p_attr_dev_info_p2p_dev_addr = -1;
static int hf_p2p_attr_dev_info_pri_dev_type = -1;
static int hf_p2p_attr_dev_info_pri_dev_type_category = -1;
@ -310,7 +310,7 @@ static int hf_p2p_attr_noa_duration = -1;
static int hf_p2p_attr_noa_interval = -1;
static int hf_p2p_attr_noa_start_time = -1;
static int hf_p2p_attr_gi = -1;
/* static int hf_p2p_attr_gi = -1; */
static int hf_p2p_attr_gi_length = -1;
static int hf_p2p_attr_gi_p2p_dev_addr = -1;
static int hf_p2p_attr_gi_p2p_iface_addr = -1;
@ -320,17 +320,17 @@ static int hf_p2p_attr_gi_dev_capab_client_discoverability = -1;
static int hf_p2p_attr_gi_dev_capab_concurrent_operation = -1;
static int hf_p2p_attr_gi_dev_capab_infrastructure_managed = -1;
static int hf_p2p_attr_gi_dev_capab_limit = -1;
static int hf_p2p_attr_gi_dev_capab_invitation_procedure = -1;
/* static int hf_p2p_attr_gi_dev_capab_invitation_procedure = -1; */
static int hf_p2p_attr_gi_config_methods = -1;
static int hf_p2p_attr_gi_config_methods_usba = -1;
static int hf_p2p_attr_gi_config_methods_ethernet = -1;
static int hf_p2p_attr_gi_config_methods_label = -1;
static int hf_p2p_attr_gi_config_methods_display = -1;
static int hf_p2p_attr_gi_config_methods_ext_nfc_token = -1;
static int hf_p2p_attr_gi_config_methods_int_nfc_token = -1;
static int hf_p2p_attr_gi_config_methods_nfc_interface = -1;
static int hf_p2p_attr_gi_config_methods_pushbutton = -1;
static int hf_p2p_attr_gi_config_methods_keypad = -1;
/* static int hf_p2p_attr_gi_config_methods_usba = -1; */
/* static int hf_p2p_attr_gi_config_methods_ethernet = -1; */
/* static int hf_p2p_attr_gi_config_methods_label = -1; */
/* static int hf_p2p_attr_gi_config_methods_display = -1; */
/* static int hf_p2p_attr_gi_config_methods_ext_nfc_token = -1; */
/* static int hf_p2p_attr_gi_config_methods_int_nfc_token = -1; */
/* static int hf_p2p_attr_gi_config_methods_nfc_interface = -1; */
/* static int hf_p2p_attr_gi_config_methods_pushbutton = -1; */
/* static int hf_p2p_attr_gi_config_methods_keypad = -1; */
static int hf_p2p_attr_gi_pri_dev_type = -1;
static int hf_p2p_attr_gi_pri_dev_type_category = -1;
static int hf_p2p_attr_gi_pri_dev_type_oui = -1;
@ -1063,9 +1063,11 @@ proto_register_p2p(void)
{ "Attribute Length", "wifi_p2p.length",
FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
/**
{ &hf_p2p_attr_capab,
{ "P2P Capability", "wifi_p2p.p2p_capability",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
**/
{ &hf_p2p_attr_capab_device,
{ "Device Capability Bitmap",
"wifi_p2p.p2p_capability.device_capability",
@ -1158,9 +1160,11 @@ proto_register_p2p(void)
{ "Group Owner Intent Tie Breaker", "wifi_p2p.go_intent_tie_breaker",
FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL }},
/**
{ &hf_p2p_attr_listen_channel,
{ "Listen Channel", "wifi_p2p.listen_channel",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
**/
{ &hf_p2p_attr_listen_channel_country,
{ "Country String", "wifi_p2p.listen_channel.country_string",
FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@ -1171,9 +1175,11 @@ proto_register_p2p(void)
{ "Channel Number", "wifi_p2p.listen_channel.channel_number",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
/**
{ &hf_p2p_attr_operating_channel,
{ "Operating Channel", "wifi_p2p.operating_channel",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
**/
{ &hf_p2p_attr_operating_channel_country,
{ "Country String", "wifi_p2p.operating_channel.country_string",
FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@ -1184,9 +1190,11 @@ proto_register_p2p(void)
{ "Channel Number", "wifi_p2p.channel.channel_number",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
/**
{ &hf_p2p_attr_channel_list,
{ "Channel List", "wifi_p2p.channel_list",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
**/
{ &hf_p2p_attr_channel_list_country,
{ "Country String", "wifi_p2p.channel_list.country_string",
FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@ -1199,10 +1207,11 @@ proto_register_p2p(void)
{ &hf_p2p_attr_channel_list_chan,
{ "Channel List", "wifi_p2p.channel_list.channel_list",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
/**
{ &hf_p2p_attr_dev_info,
{ "Device Info", "wifi_p2p.dev_info",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
**/
{ &hf_p2p_attr_dev_info_p2p_dev_addr,
{ "P2P Device address", "wifi_p2p.dev_info.p2p_dev_addr",
FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@ -1316,9 +1325,11 @@ proto_register_p2p(void)
{ "Start Time", "wifi_p2p.noa.start_time",
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
/**
{ &hf_p2p_attr_gi,
{ "Device Info", "wifi_p2p.group_info",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
**/
{ &hf_p2p_attr_gi_length,
{ "P2P Client Info Descriptor Length", "wifi_p2p.group_info.length",
FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
@ -1357,14 +1368,14 @@ proto_register_p2p(void)
{ &hf_p2p_attr_gi_dev_capab_limit,
{ "P2P Device Limit",
"wifi_p2p.group_info.device_capability.device_limit",
FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_DEVICE_LIMIT, NULL, HFILL
}},
FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_DEVICE_LIMIT, NULL, HFILL }},
/**
{ &hf_p2p_attr_gi_dev_capab_invitation_procedure,
{ "P2P Invitation Procedure",
"wifi_p2p.group_info.device_capability.invitation_procedure",
FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_INVITATION_PROCEDURE, NULL,
HFILL
}},
HFILL }},
**/
{ &hf_p2p_attr_gi_pri_dev_type,
{ "Primary Device Type", "wifi_p2p.group_info.pri_dev_type",
FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@ -1397,35 +1408,53 @@ proto_register_p2p(void)
{ &hf_p2p_attr_gi_config_methods,
{ "Config Methods", "wifi_p2p.group_info.config_methods",
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
/**
{ &hf_p2p_attr_gi_config_methods_usba,
{ "USBA (Flash Drive)", "wifi_p2p.group_info.config_methods.usba",
FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_USBA, NULL, HFILL }},
**/
/**
{ &hf_p2p_attr_gi_config_methods_ethernet,
{ "Ethernet", "wifi_p2p.group_info.config_methods.ethernet",
FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_ETHERNET, NULL, HFILL }},
**/
/**
{ &hf_p2p_attr_gi_config_methods_label,
{ "Label", "wifi_p2p.group_info.config_methods.label",
FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_LABEL, NULL, HFILL }},
**/
/**
{ &hf_p2p_attr_gi_config_methods_display,
{ "Display", "wifi_p2p.group_info.config_methods.display",
FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_DISPLAY, NULL, HFILL }},
**/
/**
{ &hf_p2p_attr_gi_config_methods_ext_nfc_token,
{ "External NFC Token",
"wifi_p2p.group_info.config_methods.ext_nfc_token",
FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_EXT_NFC_TOKEN, NULL, HFILL }},
**/
/**
{ &hf_p2p_attr_gi_config_methods_int_nfc_token,
{ "Integrated NFC Token",
"wifi_p2p.group_info.config_methods.int_nfc_token",
FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_INT_NFC_TOKEN, NULL, HFILL }},
**/
/**
{ &hf_p2p_attr_gi_config_methods_nfc_interface,
{ "NFC Interface", "wifi_p2p.group_info.config_methods.nfc_interface",
FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_NFC_INTERFACE, NULL, HFILL }},
**/
/**
{ &hf_p2p_attr_gi_config_methods_pushbutton,
{ "PushButton", "wifi_p2p.group_info.config_methods.pushbutton",
FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_PUSHBUTTON, NULL, HFILL }},
**/
/**
{ &hf_p2p_attr_gi_config_methods_keypad,
{ "Keypad", "wifi_p2p.group_info.config_methods.keypad",
FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_KEYPAD, NULL, HFILL }},
**/
{ &hf_p2p_attr_invitation_flags,
{ "Invitation Flags", "wifi_p2p.invitation_flags",

15
epan/dissectors/packet-wlccp.c
View File

@ -505,9 +505,9 @@ static int hf_wlccp_responder_node_type = -1;
static int hf_wlccp_relay_node_type = -1;
static int hf_wlccp_relay_node_id = -1;
static int hf_wlccp_priority = -1;
static int hf_wlccp_age = -1;
static int hf_wlccp_period = -1;
/* static int hf_wlccp_priority = -1; */
/* static int hf_wlccp_age = -1; */
/* static int hf_wlccp_period = -1; */
static int hf_wlccp_ipv4_address = -1;
/* SCM Advertisement */
@ -3313,24 +3313,27 @@ proto_register_wlccp(void)
0x0, "Node which relayed this message", HFILL }
},
/**
{ &hf_wlccp_priority,
{ "WDS priority", "wlccp.priority",
FT_UINT8, BASE_DEC, NULL, 0,
"WDS priority of this access point", HFILL }
},
**/
/**
{ &hf_wlccp_age,
{ "Age", "wlccp.age",
FT_UINT32, BASE_DEC, NULL, 0,
"Time since AP became a WDS master", HFILL }
},
**/
/**
{ &hf_wlccp_period,
{ "Period", "wlccp.period",
FT_UINT8, BASE_DEC, NULL, 0,
"Interval between announcements (seconds)", HFILL }
},
**/
{ &hf_wlccp_ipv4_address,
{ "IPv4 Address", "wlccp.ipv4_address",
FT_IPv4, BASE_NONE, NULL, 0,

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

@ -38,7 +38,7 @@ static int hf_ypbind_procedure_v1 = -1;
static int hf_ypbind_procedure_v2 = -1;
static int hf_ypbind_domain = -1;
static int hf_ypbind_resp_type = -1;
static int hf_ypbind_error = -1;
/* static int hf_ypbind_error = -1; */
static int hf_ypbind_addr = -1;
static int hf_ypbind_port = -1;
static int hf_ypbind_setdom_version = -1;
@ -64,6 +64,7 @@ static const value_string resp_type_vals[] = {
{0, NULL}
};
#if 0
#define YPBIND_ERROR_ERR 1
#define YPBIND_ERROR_NOSERV 2
#define YPBIND_ERROR_RESC 3
@ -73,6 +74,7 @@ static const value_string error_vals[] = {
{YPBIND_ERROR_RESC, "System resource allocation failure"},
{0, NULL}
};
#endif
static int
dissect_ypbind_domain_v2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
@ -181,10 +183,10 @@ proto_register_ypbind(void)
"Response Type", "ypbind.resp_type", FT_UINT32, BASE_DEC,
VALS(resp_type_vals), 0, NULL, HFILL }},
{ &hf_ypbind_error, {
/** { &hf_ypbind_error, {
"Error", "ypbind.error", FT_UINT32, BASE_DEC,
VALS(error_vals), 0, "YPBIND Error code", HFILL }},
**/
{ &hf_ypbind_addr, {
"IP Addr", "ypbind.addr", FT_IPv4, BASE_NONE,
NULL, 0, "IP Address of server", HFILL }},

5
epan/dissectors/packet-zbee-zcl.c
View File

@ -107,7 +107,6 @@ static int hf_zbee_zcl_attr_int16 = -1;
static int hf_zbee_zcl_attr_int24 = -1;
static int hf_zbee_zcl_attr_int32 = -1;
static int hf_zbee_zcl_attr_int64 = -1;
static int hf_zbee_zcl_attr_semi = -1;
static int hf_zbee_zcl_attr_float = -1;
static int hf_zbee_zcl_attr_double = -1;
static int hf_zbee_zcl_attr_bytes = -1;
@ -2102,10 +2101,6 @@ void proto_register_zbee_zcl(void)
{ "Int64", "zbee_zcl.attr.int64", FT_INT64, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_zbee_zcl_attr_semi,
{ "Semi Float", "zbee_zcl.attr.float", FT_FLOAT, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_zbee_zcl_attr_float,
{ "Float", "zbee_zcl.attr.float", FT_FLOAT, BASE_NONE, NULL, 0x0,
NULL, HFILL }},

5
epan/dissectors/packet-zep.c
View File

@ -66,7 +66,6 @@ void proto_reg_handoff_zep(void);
/* Initialize protocol and registered fields. */
static int proto_zep = -1;
static int hf_zep_version = -1;
static int hf_zep_type = -1;
static int hf_zep_channel_id = -1;
static int hf_zep_device_id = -1;
static int hf_zep_lqi_mode = -1;
@ -266,10 +265,6 @@ void proto_register_zep(void)
{ "Protocol Version", "zep.version", FT_UINT8, BASE_DEC, NULL, 0x0,
"The version of the sniffer.", HFILL }},
{ &hf_zep_type,
{ "Type", "zep.type", FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_zep_channel_id,
{ "Channel ID", "zep.channel_id", FT_UINT8, BASE_DEC, NULL, 0x0,
"The logical channel on which this packet was detected.", HFILL }},

530
epan/dissectors/packet-zrtp.c
View File

@ -43,7 +43,6 @@ static int proto_zrtp = -1;
static int hf_zrtp_rtpversion = -1;
static int hf_zrtp_rtppadding = -1;
static int hf_zrtp_rtpextension = -1;
static int hf_zrtp_id = -1;
static int hf_zrtp_sequence = -1;
static int hf_zrtp_cookie = -1;
static int hf_zrtp_source_id = -1;
@ -170,7 +169,7 @@ typedef struct _value_string_keyval {
} value_string_keyval;
const value_zrtp_versions valid_zrtp_versions[]=
const value_zrtp_versions valid_zrtp_versions[] =
{
{"1.1x"},
{"1.0x"},
@ -182,54 +181,54 @@ const value_zrtp_versions valid_zrtp_versions[]=
const value_string_keyval zrtp_hash_type_vals[] =
{
{ "S256", "SHA-256 Hash"},
{ "S384", "SHA-384 Hash"},
{ "N256", "SHA-3 256-bit hash"},
{ "N384", "SHA-3 384 bit hash"},
{ NULL, NULL }
{ "S256", "SHA-256 Hash"},
{ "S384", "SHA-384 Hash"},
{ "N256", "SHA-3 256-bit hash"},
{ "N384", "SHA-3 384 bit hash"},
{ NULL, NULL }
};
const value_string_keyval zrtp_cipher_type_vals[] =
{
{ "AES1", "AES-CM with 128 bit keys"},
{ "AES2", "AES-CM with 192 bit keys"},
{ "AES3", "AES-CM with 256 bit keys"},
{ "AES1", "AES-CM with 128 bit keys"},
{ "AES2", "AES-CM with 192 bit keys"},
{ "AES3", "AES-CM with 256 bit keys"},
{ "2FS1", "TwoFish with 128 bit keys"},
{ "2FS2", "TwoFish with 192 bit keys"},
{ "2FS3", "TwoFish with 256 bit keys"},
{ "CAM1", "Camellia with 128 bit keys"},
{ "CAM2", "Camellia with 192 bit keys"},
{ "CAM3", "Camellia with 256 bit keys"},
{ NULL, NULL }
{ NULL, NULL }
};
const value_string_keyval zrtp_auth_tag_vals[] =
{
{ "HS32", "HMAC-SHA1 32 bit authentication tag"},
{ "HS80", "HMAC-SHA1 80 bit authentication tag"},
{ "SK32", "Skein-512-MAC 32 bit authentication tag"},
{ "SK64", "Skein-512-MAC 64 bit authentication tag"},
{ NULL, NULL }
{ "HS32", "HMAC-SHA1 32 bit authentication tag"},
{ "HS80", "HMAC-SHA1 80 bit authentication tag"},
{ "SK32", "Skein-512-MAC 32 bit authentication tag"},
{ "SK64", "Skein-512-MAC 64 bit authentication tag"},
{ NULL, NULL }
};
const value_string_keyval zrtp_sas_type_vals[] =
{
{ "B32 ", "Short authentication string using base 32"},
{ "B256", "Short authentication string using base 256"},
{ NULL, NULL }
{ "B32 ", "Short authentication string using base 32"},
{ "B256", "Short authentication string using base 256"},
{ NULL, NULL }
};
const value_string_keyval zrtp_key_agreement_vals[] =
{
{ "DH2k", "DH mode with p=2048 bit prime"},
{ "DH3k", "DH mode with p=3072 bit prime"},
{ "DH4k", "DH mode with p=4096 bit prime"},
{ "Prsh", "Preshared non-DH mode using shared secret"},
{ "EC25", "Elliptic Curve DH-256"},
{ "EC38", "Elliptic Curve DH-384"},
{ "EC52", "Elliptic Curve DH-521"},
{ "Mult", "Multistream mode"},
{ NULL, NULL }
{ "DH2k", "DH mode with p=2048 bit prime"},
{ "DH3k", "DH mode with p=3072 bit prime"},
{ "DH4k", "DH mode with p=4096 bit prime"},
{ "Prsh", "Preshared non-DH mode using shared secret"},
{ "EC25", "Elliptic Curve DH-256"},
{ "EC38", "Elliptic Curve DH-384"},
{ "EC52", "Elliptic Curve DH-521"},
{ "Mult", "Multistream mode"},
{ NULL, NULL }
};
const value_string zrtp_error_vals[] =
@ -270,13 +269,13 @@ dissect_Conf2ACK(packet_info *pinfo);
static void
dissect_HelloACK( packet_info *pinfo);
static void
dissect_GoClear(tvbuff_t *tvb,packet_info *pinfo, proto_tree *zrtp_tree);
dissect_GoClear(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree);
static void
dissect_Error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree);
static void
dissect_Confirm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree,int part);
dissect_Confirm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree, int part);
static void
dissect_DHPart(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree,int part);
dissect_DHPart(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree, int part);
static void
dissect_SASrelay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree);
static void
@ -288,10 +287,10 @@ dissect_PingACK(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree);
static const gchar *
key_to_val(const gchar *key, int keylen, const value_string_keyval *kv, const gchar *fmt){
int i=0;
key_to_val(const gchar *key, int keylen, const value_string_keyval *kv, const gchar *fmt) {
int i = 0;
while (kv[i].key) {
if (!strncmp(kv[i].key, key, keylen)){
if (!strncmp(kv[i].key, key, keylen)) {
return(kv[i].val);
}
i++;
@ -300,11 +299,11 @@ key_to_val(const gchar *key, int keylen, const value_string_keyval *kv, const gc
}
static const gchar *
check_valid_version(const gchar *version){
int i=0;
check_valid_version(const gchar *version) {
int i = 0;
int match_size = (version[0] == '0') ? 4 : 3;
while (valid_zrtp_versions[i].version) {
if (!strncmp(valid_zrtp_versions[i].version, version, match_size)){
if (!strncmp(valid_zrtp_versions[i].version, version, match_size)) {
return(valid_zrtp_versions[i].version);
}
i++;
@ -316,125 +315,125 @@ check_valid_version(const gchar *version){
static void
dissect_zrtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *zrtp_tree;
proto_tree *zrtp_msg_tree;
proto_tree *zrtp_msg_data_tree;
proto_tree *checksum_tree;
proto_item *ti;
int linelen;
int checksum_offset;
unsigned char message_type[9];
unsigned int prime_offset = 0;
unsigned int msg_offset = 12;
guint32 sent_crc, calc_crc;
proto_tree *zrtp_tree;
proto_tree *zrtp_msg_tree;
proto_tree *zrtp_msg_data_tree;
proto_tree *checksum_tree;
proto_item *ti;
int linelen;
int checksum_offset;
unsigned char message_type[9];
unsigned int prime_offset = 0;
unsigned int msg_offset = 12;
guint32 sent_crc, calc_crc;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZRTP");
col_set_str(pinfo->cinfo, COL_INFO, "Unknown ZRTP Packet");
ti = proto_tree_add_protocol_format(tree,proto_zrtp,tvb,0,-1,"ZRTP protocol");
zrtp_tree = proto_item_add_subtree(ti,ett_zrtp);
ti = proto_tree_add_protocol_format(tree, proto_zrtp, tvb, 0, -1, "ZRTP protocol");
zrtp_tree = proto_item_add_subtree(ti, ett_zrtp);
proto_tree_add_item(zrtp_tree,hf_zrtp_rtpversion,tvb,prime_offset+0,1,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree,hf_zrtp_rtppadding,tvb,prime_offset+0,1,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree,hf_zrtp_rtpextension,tvb,prime_offset+0,1,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_rtpversion, tvb, prime_offset+0, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_rtppadding, tvb, prime_offset+0, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_rtpextension, tvb, prime_offset+0, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree,hf_zrtp_sequence,tvb,prime_offset+2,2,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_sequence, tvb, prime_offset+2, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree,hf_zrtp_cookie,tvb,prime_offset+4,4,ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_cookie, tvb, prime_offset+4, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_source_id,tvb,prime_offset+8,4,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_source_id, tvb, prime_offset+8, 4, ENC_BIG_ENDIAN);
linelen = tvb_reported_length_remaining(tvb,msg_offset);
linelen = tvb_reported_length_remaining(tvb, msg_offset);
checksum_offset = linelen-4;
ti = proto_tree_add_protocol_format(zrtp_tree,proto_zrtp,tvb,msg_offset,linelen-4,"Message");
zrtp_msg_tree = proto_item_add_subtree(ti,ett_zrtp_msg);
ti = proto_tree_add_protocol_format(zrtp_tree, proto_zrtp, tvb, msg_offset, linelen-4, "Message");
zrtp_msg_tree = proto_item_add_subtree(ti, ett_zrtp_msg);
proto_tree_add_item(zrtp_msg_tree,hf_zrtp_signature,tvb,msg_offset+0,2,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_msg_tree, hf_zrtp_signature, tvb, msg_offset+0, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_msg_tree,hf_zrtp_msg_length,tvb,msg_offset+2,2,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_msg_tree, hf_zrtp_msg_length, tvb, msg_offset+2, 2, ENC_BIG_ENDIAN);
tvb_memcpy(tvb,(void *)message_type,msg_offset+4,8);
tvb_memcpy(tvb, (void *)message_type, msg_offset+4, 8);
message_type[8] = '\0';
proto_tree_add_item(zrtp_msg_tree,hf_zrtp_msg_type,tvb,msg_offset+4,8,ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_msg_tree, hf_zrtp_msg_type, tvb, msg_offset+4, 8, ENC_ASCII|ENC_NA);
linelen = tvb_reported_length_remaining(tvb,msg_offset+12);
linelen = tvb_reported_length_remaining(tvb, msg_offset+12);
if (!strncmp(message_type,"Hello ",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_Hello(tvb,pinfo,zrtp_msg_data_tree);
} else if (!strncmp(message_type,"HelloACK",8)){
if (!strncmp(message_type, "Hello ", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_Hello(tvb, pinfo, zrtp_msg_data_tree);
} else if (!strncmp(message_type, "HelloACK", 8)) {
dissect_HelloACK(pinfo);
} else if (!strncmp(message_type,"Commit ",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_Commit(tvb,pinfo,zrtp_msg_data_tree);
} else if (!strncmp(message_type,"DHPart1 ",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_DHPart(tvb,pinfo,zrtp_msg_data_tree,1);
} else if (!strncmp(message_type,"DHPart2 ",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_DHPart(tvb,pinfo,zrtp_msg_data_tree,2);
} else if (!strncmp(message_type,"Confirm1",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_Confirm(tvb,pinfo,zrtp_msg_data_tree,1);
} else if (!strncmp(message_type,"Confirm2",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_Confirm(tvb,pinfo,zrtp_msg_data_tree,2);
} else if (!strncmp(message_type,"Conf2ACK",8)){
} else if (!strncmp(message_type, "Commit ", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_Commit(tvb, pinfo, zrtp_msg_data_tree);
} else if (!strncmp(message_type, "DHPart1 ", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_DHPart(tvb, pinfo, zrtp_msg_data_tree, 1);
} else if (!strncmp(message_type, "DHPart2 ", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_DHPart(tvb, pinfo, zrtp_msg_data_tree, 2);
} else if (!strncmp(message_type, "Confirm1", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_Confirm(tvb, pinfo, zrtp_msg_data_tree, 1);
} else if (!strncmp(message_type, "Confirm2", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_Confirm(tvb, pinfo, zrtp_msg_data_tree, 2);
} else if (!strncmp(message_type, "Conf2ACK", 8)) {
dissect_Conf2ACK(pinfo);
} else if (!strncmp(message_type,"Error ",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_Error(tvb,pinfo,zrtp_msg_data_tree);
} else if (!strncmp(message_type,"ErrorACK",8)){
} else if (!strncmp(message_type, "Error ", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_Error(tvb, pinfo, zrtp_msg_data_tree);
} else if (!strncmp(message_type, "ErrorACK", 8)) {
dissect_ErrorACK(pinfo);
} else if (!strncmp(message_type,"GoClear ",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_GoClear(tvb,pinfo,zrtp_msg_data_tree);
} else if (!strncmp(message_type,"ClearACK",8)){
} else if (!strncmp(message_type, "GoClear ", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_GoClear(tvb, pinfo, zrtp_msg_data_tree);
} else if (!strncmp(message_type, "ClearACK", 8)) {
dissect_ClearACK(pinfo);
} else if (!strncmp(message_type,"SASrelay",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_SASrelay(tvb,pinfo,zrtp_msg_data_tree);
} else if (!strncmp(message_type,"RelayACK",8)){
} else if (!strncmp(message_type, "SASrelay", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_SASrelay(tvb, pinfo, zrtp_msg_data_tree);
} else if (!strncmp(message_type, "RelayACK", 8)) {
dissect_RelayACK(pinfo);
} else if (!strncmp(message_type,"Ping ",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_Ping(tvb,pinfo,zrtp_msg_data_tree);
} else if (!strncmp(message_type,"PingACK ",8)){
ti = proto_tree_add_protocol_format(zrtp_msg_tree,proto_zrtp,tvb,msg_offset+12,linelen-4,"Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti,ett_zrtp_msg_data);
dissect_PingACK(tvb,pinfo,zrtp_msg_data_tree);
} else if (!strncmp(message_type, "Ping ", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_Ping(tvb, pinfo, zrtp_msg_data_tree);
} else if (!strncmp(message_type, "PingACK ", 8)) {
ti = proto_tree_add_protocol_format(zrtp_msg_tree, proto_zrtp, tvb, msg_offset+12, linelen-4, "Data");
zrtp_msg_data_tree = proto_item_add_subtree(ti, ett_zrtp_msg_data);
dissect_PingACK(tvb, pinfo, zrtp_msg_data_tree);
}
sent_crc = tvb_get_ntohl(tvb,msg_offset+checksum_offset);
calc_crc = ~crc32c_calculate(tvb_get_ptr(tvb,0,msg_offset+checksum_offset),msg_offset+checksum_offset,CRC32C_PRELOAD);
sent_crc = tvb_get_ntohl(tvb, msg_offset+checksum_offset);
calc_crc = ~crc32c_calculate(tvb_get_ptr(tvb, 0, msg_offset+checksum_offset), msg_offset+checksum_offset, CRC32C_PRELOAD);
if (sent_crc == calc_crc) {
ti = proto_tree_add_uint_format_value(zrtp_tree, hf_zrtp_checksum, tvb, msg_offset+checksum_offset, 4, sent_crc,
"0x%04x [correct]", sent_crc);
checksum_tree = proto_item_add_subtree(ti, ett_zrtp_checksum);
ti = proto_tree_add_boolean(checksum_tree, hf_zrtp_checksum_good, tvb, msg_offset+checksum_offset, 4, TRUE);
ti = proto_tree_add_boolean(checksum_tree, hf_zrtp_checksum_good, tvb, msg_offset+checksum_offset, 4, TRUE);
PROTO_ITEM_SET_GENERATED(ti);
ti = proto_tree_add_boolean(checksum_tree, hf_zrtp_checksum_bad, tvb, msg_offset+checksum_offset, 4, FALSE);
ti = proto_tree_add_boolean(checksum_tree, hf_zrtp_checksum_bad, tvb, msg_offset+checksum_offset, 4, FALSE);
PROTO_ITEM_SET_GENERATED(ti);
} else {
ti = proto_tree_add_uint_format_value(zrtp_tree, hf_zrtp_checksum, tvb, msg_offset+checksum_offset, 4, sent_crc,
"0x%04x [incorrect, should be 0x%04x]", sent_crc, calc_crc);
checksum_tree = proto_item_add_subtree(ti, ett_zrtp_checksum);
ti = proto_tree_add_boolean(checksum_tree, hf_zrtp_checksum_good, tvb, msg_offset+checksum_offset, 4, FALSE);
ti = proto_tree_add_boolean(checksum_tree, hf_zrtp_checksum_good, tvb, msg_offset+checksum_offset, 4, FALSE);
PROTO_ITEM_SET_GENERATED(ti);
ti = proto_tree_add_boolean(checksum_tree, hf_zrtp_checksum_bad, tvb, msg_offset+checksum_offset, 4, TRUE);
ti = proto_tree_add_boolean(checksum_tree, hf_zrtp_checksum_bad, tvb, msg_offset+checksum_offset, 4, TRUE);
PROTO_ITEM_SET_GENERATED(ti);
}
@ -488,254 +487,254 @@ dissect_HelloACK(packet_info *pinfo) {
static void
dissect_Ping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
unsigned int data_offset=24;
unsigned int data_offset = 24;
col_set_str(pinfo->cinfo, COL_INFO, "Ping Packet");
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_ping_version,tvb,data_offset,4,ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_ping_endpointhash,tvb,data_offset+4,8,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_version, tvb, data_offset, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_endpointhash, tvb, data_offset+4, 8, ENC_BIG_ENDIAN);
}
static void
dissect_PingACK(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
unsigned int data_offset=24;
unsigned int data_offset = 24;
col_set_str(pinfo->cinfo, COL_INFO, "PingACK Packet");
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_ping_version,tvb,data_offset,4,ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_pingack_endpointhash,tvb,data_offset+4,8,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_ping_endpointhash,tvb,data_offset+12,8,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_ping_ssrc,tvb,data_offset+20,4,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_version, tvb, data_offset, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_pingack_endpointhash, tvb, data_offset+4, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_endpointhash, tvb, data_offset+12, 8, ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_ping_ssrc, tvb, data_offset+20, 4, ENC_BIG_ENDIAN);
}
static void
dissect_GoClear(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
unsigned int data_offset=24;
unsigned int data_offset = 24;
col_set_str(pinfo->cinfo, COL_INFO, "GoClear Packet");
/* Now we should clear the SRT(C)P session... */
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hmac, tvb, data_offset+0, 8, ENC_NA);
}
static void
dissect_Error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
unsigned int data_offset=24;
unsigned int data_offset = 24;
col_set_str(pinfo->cinfo, COL_INFO, "Error Packet");
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_error,tvb,data_offset,4,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_error, tvb, data_offset, 4, ENC_BIG_ENDIAN);
}
static void
dissect_Confirm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree,int part) {
unsigned int data_offset=24;
int linelen;
dissect_Confirm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree, int part) {
unsigned int data_offset = 24;
int linelen;
col_add_fstr(pinfo->cinfo, COL_INFO, (part == 1) ? "Confirm1 Packet" : "Confirm2 Packet");
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_cfb,tvb,data_offset+8,16,ENC_NA);
linelen = tvb_reported_length_remaining(tvb,data_offset+24);
proto_tree_add_protocol_format(zrtp_tree,proto_zrtp,tvb,data_offset+24,linelen-4,"Encrypted Data");
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hmac, tvb, data_offset+0, 8, ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_cfb, tvb, data_offset+8, 16, ENC_NA);
linelen = tvb_reported_length_remaining(tvb, data_offset+24);
proto_tree_add_protocol_format(zrtp_tree, proto_zrtp, tvb, data_offset+24, linelen-4, "Encrypted Data");
}
static void
dissect_SASrelay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
unsigned int data_offset=24;
int linelen;
unsigned int data_offset = 24;
int linelen;
col_set_str(pinfo->cinfo, COL_INFO, "SASrelay Packet");
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_cfb,tvb,data_offset+8,16,ENC_NA);
linelen = tvb_reported_length_remaining(tvb,data_offset+24);
proto_tree_add_protocol_format(zrtp_tree,proto_zrtp,tvb,data_offset+24,linelen-4,"Encrypted Data");
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hmac, tvb, data_offset+0, 8, ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_cfb, tvb, data_offset+8, 16, ENC_NA);
linelen = tvb_reported_length_remaining(tvb, data_offset+24);
proto_tree_add_protocol_format(zrtp_tree, proto_zrtp, tvb, data_offset+24, linelen-4, "Encrypted Data");
}
static void
dissect_DHPart(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree,int part) {
unsigned int msg_offset=12;
unsigned int data_offset=56;
int linelen, pvr_len;
dissect_DHPart(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree, int part) {
unsigned int msg_offset = 12;
unsigned int data_offset = 56;
int linelen, pvr_len;
col_add_fstr(pinfo->cinfo, COL_INFO, (part == 1) ? "DHPart1 Packet" : "DHPart2 Packet");
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+12,32,ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_rs1ID,tvb,data_offset+0,8,ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_rs2ID,tvb,data_offset+8,8,ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_auxs,tvb,data_offset+16,8,ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_pbxs,tvb,data_offset+24,8,ENC_NA);
linelen = tvb_reported_length_remaining(tvb,data_offset+32);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hash_image, tvb, msg_offset+12, 32, ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_rs1ID, tvb, data_offset+0, 8, ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_rs2ID, tvb, data_offset+8, 8, ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_auxs, tvb, data_offset+16, 8, ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_pbxs, tvb, data_offset+24, 8, ENC_NA);
linelen = tvb_reported_length_remaining(tvb, data_offset+32);
pvr_len = linelen-8-4;
proto_tree_add_protocol_format(zrtp_tree,proto_zrtp,tvb,data_offset+32,pvr_len,(part==1)?"pvr Data":"pvi Data");
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+32+pvr_len,8,ENC_NA);
proto_tree_add_protocol_format(zrtp_tree, proto_zrtp, tvb, data_offset+32, pvr_len, (part==1) ? "pvr Data" : "pvi Data");
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hmac, tvb, data_offset+32+pvr_len, 8, ENC_NA);
}
static void
dissect_Commit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
unsigned int msg_offset=12;
unsigned int data_offset=56;
unsigned int msg_offset = 12;
unsigned int data_offset = 56;
unsigned char value[5];
int key_type = 0;
int key_type = 0;
/*
0 - other type
1 - "Mult"
2 - "Prsh"
*/
unsigned int offset;
unsigned int offset;
col_set_str(pinfo->cinfo, COL_INFO, "Commit Packet");
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+12,32,ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hash_image, tvb, msg_offset+12, 32, ENC_NA);
/* ZID */
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_zid,tvb,data_offset+0,12,ENC_NA);
tvb_memcpy(tvb,(void *)value,data_offset+12,4);
value[4]='\0';
proto_tree_add_string_format(zrtp_tree,hf_zrtp_msg_hash,tvb,data_offset+12,4,value,
"Hash: %s",key_to_val(value,4,zrtp_hash_type_vals,"Unknown hash type %s"));
tvb_memcpy(tvb,(void *)value,data_offset+16,4);
value[4]='\0';
proto_tree_add_string_format(zrtp_tree,hf_zrtp_msg_cipher,tvb,data_offset+16,4,value,"Cipher: %s",
key_to_val(value,4,zrtp_cipher_type_vals,"Unknown cipher type %s"));
tvb_memcpy(tvb,(void *)value,data_offset+20,4);
value[4]='\0';
proto_tree_add_string_format(zrtp_tree,hf_zrtp_msg_at,tvb,data_offset+20,4,value,
"Auth tag: %s",key_to_val(value,4,zrtp_auth_tag_vals,"Unknown auth tag %s"));
tvb_memcpy(tvb,(void *)value,data_offset+24,4);
value[4]='\0';
proto_tree_add_string_format(zrtp_tree,hf_zrtp_msg_keya,tvb,data_offset+24,4,value,
"Key agreement: %s",key_to_val(value,4,zrtp_key_agreement_vals,"Unknown key agreement %s"));
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_zid, tvb, data_offset+0, 12, ENC_NA);
tvb_memcpy(tvb, (void *)value, data_offset+12, 4);
value[4] = '\0';
proto_tree_add_string_format(zrtp_tree, hf_zrtp_msg_hash, tvb, data_offset+12, 4, value,
"Hash: %s", key_to_val(value, 4, zrtp_hash_type_vals, "Unknown hash type %s"));
tvb_memcpy(tvb, (void *)value, data_offset+16, 4);
value[4] = '\0';
proto_tree_add_string_format(zrtp_tree, hf_zrtp_msg_cipher, tvb, data_offset+16, 4, value, "Cipher: %s",
key_to_val(value, 4, zrtp_cipher_type_vals, "Unknown cipher type %s"));
tvb_memcpy(tvb, (void *)value, data_offset+20, 4);
value[4] = '\0';
proto_tree_add_string_format(zrtp_tree, hf_zrtp_msg_at, tvb, data_offset+20, 4, value,
"Auth tag: %s", key_to_val(value, 4, zrtp_auth_tag_vals, "Unknown auth tag %s"));
tvb_memcpy(tvb, (void *)value, data_offset+24, 4);
value[4] = '\0';
proto_tree_add_string_format(zrtp_tree, hf_zrtp_msg_keya, tvb, data_offset+24, 4, value,
"Key agreement: %s", key_to_val(value, 4, zrtp_key_agreement_vals, "Unknown key agreement %s"));
if(!strncmp(value, "Mult", 4)){
if(!strncmp(value, "Mult", 4)) {
key_type = 1;
} else if (!strncmp(value, "Prsh", 4)){
} else if (!strncmp(value, "Prsh", 4)) {
key_type = 2;
}
tvb_memcpy(tvb,(void *)value,data_offset+28,4);
value[4]='\0';
proto_tree_add_string_format(zrtp_tree,hf_zrtp_msg_sas,tvb,data_offset+28,4,value,
"SAS type: %s",key_to_val(value,4,zrtp_sas_type_vals,"Unknown SAS type %s"));
tvb_memcpy(tvb, (void *)value, data_offset+28, 4);
value[4] = '\0';
proto_tree_add_string_format(zrtp_tree, hf_zrtp_msg_sas, tvb, data_offset+28, 4, value,
"SAS type: %s", key_to_val(value, 4, zrtp_sas_type_vals, "Unknown SAS type %s"));
switch(key_type){
switch (key_type) {
case 1: /*
Mult
*/
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_nonce,tvb,data_offset+32,16,ENC_NA);
Mult
*/
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_nonce, tvb, data_offset+32, 16, ENC_NA);
offset = 48;
break;
case 2: /*
Prsh
*/
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_nonce,tvb,data_offset+32,16,ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_key_id,tvb,data_offset+48,8,ENC_NA);
Prsh
*/
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_nonce, tvb, data_offset+32, 16, ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_key_id, tvb, data_offset+48, 8, ENC_NA);
offset = 56;
break;
default: /*
other
*/
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hvi,tvb,data_offset+32, 32, ENC_NA);
other
*/
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hvi, tvb, data_offset+32, 32, ENC_NA);
offset = 64;
break;
}
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+offset,8,ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hmac, tvb, data_offset+offset, 8, ENC_NA);
}
static void
dissect_Hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
proto_item *ti;
unsigned int msg_offset = 12;
unsigned int data_offset = 88;
guint8 val_b;
unsigned int i;
unsigned int run_offset;
unsigned int hc,cc,ac,kc,sc;
unsigned int vhc,vcc,vac,vkc,vsc;
unsigned char value[5];
unsigned char version_str[5];
proto_tree *tmp_tree;
proto_item *ti;
unsigned int msg_offset = 12;
unsigned int data_offset = 88;
guint8 val_b;
unsigned int i;
unsigned int run_offset;
unsigned int hc, cc, ac, kc, sc;
unsigned int vhc, vcc, vac, vkc, vsc;
unsigned char value[5];
unsigned char version_str[5];
proto_tree *tmp_tree;
col_set_str(pinfo->cinfo, COL_INFO, "Hello Packet");
tvb_memcpy(tvb,version_str,msg_offset+12,4);
version_str[4]='\0';
if (check_valid_version(version_str) == NULL){
tvb_memcpy(tvb, version_str, msg_offset+12, 4);
version_str[4] = '\0';
if (check_valid_version(version_str) == NULL) {
col_set_str(pinfo->cinfo, COL_INFO, "Unsupported version of ZRTP protocol");
}
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_version,tvb,msg_offset+12,4,ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_client_id,tvb,msg_offset+16,16,ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+32,32,ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_zid,tvb,msg_offset+64,12,ENC_NA);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_sigcap,tvb,data_offset+0,1,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_mitm,tvb,data_offset+0,1,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_passive,tvb,data_offset+0,1,ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_version, tvb, msg_offset+12, 4, ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_client_id, tvb, msg_offset+16, 16, ENC_ASCII|ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hash_image, tvb, msg_offset+32, 32, ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_zid, tvb, msg_offset+64, 12, ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_sigcap, tvb, data_offset+0, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_mitm, tvb, data_offset+0, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_passive, tvb, data_offset+0, 1, ENC_BIG_ENDIAN);
val_b = tvb_get_guint8(tvb,data_offset+1);
val_b = tvb_get_guint8(tvb, data_offset+1);
hc = val_b & 0x0F;
vhc = hc;
val_b = tvb_get_guint8(tvb,data_offset+2);
val_b = tvb_get_guint8(tvb, data_offset+2);
cc = val_b & 0xF0;
ac = val_b & 0x0F;
vcc = cc >> 4;
vac = ac;
val_b = tvb_get_guint8(tvb,data_offset+3);
val_b = tvb_get_guint8(tvb, data_offset+3);
kc = val_b & 0xF0;
sc = val_b & 0x0F;
vkc = kc >> 4;
vsc = sc;
ti=proto_tree_add_uint_format(zrtp_tree,hf_zrtp_msg_hash_count,tvb,data_offset+1,1,hc,"Hash type count = %d",vhc);
tmp_tree = proto_item_add_subtree(ti,ett_zrtp_msg_hc);
ti = proto_tree_add_uint_format(zrtp_tree, hf_zrtp_msg_hash_count, tvb, data_offset+1, 1, hc, "Hash type count = %d", vhc);
tmp_tree = proto_item_add_subtree(ti, ett_zrtp_msg_hc);
run_offset = data_offset+4;
for(i=0;i<vhc;i++){
tvb_memcpy(tvb,(void *)value,run_offset,4);
value[4]='\0';
proto_tree_add_string_format(tmp_tree,hf_zrtp_msg_hash,tvb,run_offset,4,value,
"Hash[%d]: %s",i,key_to_val(value,4,zrtp_hash_type_vals,"Unknown hash type %s"));
run_offset+=4;
for (i=0; i<vhc; i++) {
tvb_memcpy(tvb, (void *)value, run_offset, 4);
value[4] = '\0';
proto_tree_add_string_format(tmp_tree, hf_zrtp_msg_hash, tvb, run_offset, 4, value,
"Hash[%d]: %s", i, key_to_val(value, 4, zrtp_hash_type_vals, "Unknown hash type %s"));
run_offset += 4;
}
ti=proto_tree_add_uint_format(zrtp_tree,hf_zrtp_msg_cipher_count,tvb,data_offset+2,1,cc,"Cipher type count = %d",vcc);
tmp_tree = proto_item_add_subtree(ti,ett_zrtp_msg_cc);
for(i=0;i<vcc;i++){
tvb_memcpy(tvb,(void *)value,run_offset,4);
value[4]='\0';
proto_tree_add_string_format(tmp_tree,hf_zrtp_msg_cipher,tvb,run_offset,4,value,"Cipher[%d]: %s",i,
key_to_val(value,4,zrtp_cipher_type_vals,"Unknown cipher type %s"));
run_offset+=4;
ti = proto_tree_add_uint_format(zrtp_tree, hf_zrtp_msg_cipher_count, tvb, data_offset+2, 1, cc, "Cipher type count = %d", vcc);
tmp_tree = proto_item_add_subtree(ti, ett_zrtp_msg_cc);
for (i=0; i<vcc; i++) {
tvb_memcpy(tvb, (void *)value, run_offset, 4);
value[4] = '\0';
proto_tree_add_string_format(tmp_tree, hf_zrtp_msg_cipher, tvb, run_offset, 4, value, "Cipher[%d]: %s", i,
key_to_val(value, 4, zrtp_cipher_type_vals, "Unknown cipher type %s"));
run_offset += 4;
}
ti=proto_tree_add_uint_format(zrtp_tree,hf_zrtp_msg_authtag_count,tvb,data_offset+2,1,ac,"Auth tag count = %d",vac);
tmp_tree = proto_item_add_subtree(ti,ett_zrtp_msg_ac);
for(i=0;i<vac;i++){
tvb_memcpy(tvb,(void *)value,run_offset,4);
value[4]='\0';
proto_tree_add_string_format(tmp_tree,hf_zrtp_msg_at,tvb,run_offset,4,value,
"Auth tag[%d]: %s",i,key_to_val(value,4,zrtp_auth_tag_vals,"Unknown auth tag %s"));
run_offset+=4;
ti = proto_tree_add_uint_format(zrtp_tree, hf_zrtp_msg_authtag_count, tvb, data_offset+2, 1, ac, "Auth tag count = %d", vac);
tmp_tree = proto_item_add_subtree(ti, ett_zrtp_msg_ac);
for (i=0; i<vac; i++) {
tvb_memcpy(tvb, (void *)value, run_offset, 4);
value[4] = '\0';
proto_tree_add_string_format(tmp_tree, hf_zrtp_msg_at, tvb, run_offset, 4, value,
"Auth tag[%d]: %s", i, key_to_val(value, 4, zrtp_auth_tag_vals, "Unknown auth tag %s"));
run_offset += 4;
}
ti=proto_tree_add_uint_format(zrtp_tree,hf_zrtp_msg_key_count,tvb,data_offset+3,1,kc,"Key agreement type count = %d",vkc);
tmp_tree = proto_item_add_subtree(ti,ett_zrtp_msg_kc);
for(i=0;i<vkc;i++){
tvb_memcpy(tvb,(void *)value,run_offset,4);
value[4]='\0';
proto_tree_add_string_format(tmp_tree,hf_zrtp_msg_keya,tvb,run_offset,4,value,
"Key agreement[%d]: %s",i,key_to_val(value,4,zrtp_key_agreement_vals,"Unknown key agreement %s"));
run_offset+=4;
ti = proto_tree_add_uint_format(zrtp_tree, hf_zrtp_msg_key_count, tvb, data_offset+3, 1, kc, "Key agreement type count = %d", vkc);
tmp_tree = proto_item_add_subtree(ti, ett_zrtp_msg_kc);
for (i=0; i<vkc; i++) {
tvb_memcpy(tvb, (void *)value, run_offset, 4);
value[4] = '\0';
proto_tree_add_string_format(tmp_tree, hf_zrtp_msg_keya, tvb, run_offset, 4, value,
"Key agreement[%d]: %s", i, key_to_val(value, 4, zrtp_key_agreement_vals, "Unknown key agreement %s"));
run_offset += 4;
}
ti=proto_tree_add_uint_format(zrtp_tree,hf_zrtp_msg_sas_count,tvb,data_offset+3,1,sc,"SAS type count = %d",vsc);
tmp_tree = proto_item_add_subtree(ti,ett_zrtp_msg_sc);
for(i=0;i<vsc;i++){
tvb_memcpy(tvb,(void *)value,run_offset,4);
value[4]='\0';
proto_tree_add_string_format(tmp_tree,hf_zrtp_msg_sas,tvb,run_offset,4,value,
"SAS type[%d]: %s",i,key_to_val(value,4,zrtp_sas_type_vals,"Unknown SAS type %s"));
run_offset+=4;
ti = proto_tree_add_uint_format(zrtp_tree, hf_zrtp_msg_sas_count, tvb, data_offset+3, 1, sc, "SAS type count = %d", vsc);
tmp_tree = proto_item_add_subtree(ti, ett_zrtp_msg_sc);
for (i=0; i<vsc; i++) {
tvb_memcpy(tvb, (void *)value, run_offset, 4);
value[4] = '\0';
proto_tree_add_string_format(tmp_tree, hf_zrtp_msg_sas, tvb, run_offset, 4, value,
"SAS type[%d]: %s", i, key_to_val(value, 4, zrtp_sas_type_vals, "Unknown SAS type %s"));
run_offset += 4;
}
proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,run_offset,8,ENC_NA);
proto_tree_add_item(zrtp_tree, hf_zrtp_msg_hmac, tvb, run_offset, 8, ENC_NA);
}
void
@ -769,15 +768,6 @@ proto_register_zrtp(void)
}
},
{&hf_zrtp_id,
{
"ID", "zrtp.id",
FT_UINT8, BASE_HEX,
NULL, 0x0,
NULL, HFILL
}
},
{&hf_zrtp_sequence,
{
"Sequence", "zrtp.sequence",