diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-01-31 18:31:28 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-01-31 18:31:28 +0000 |
| commit | d3a7f4b817160718d31eb3dd3b0b9a2029055c73 (patch) | |
| tree | cf0332af039331f5b57c4d4403bca40f268fada5 /epan | |
| parent | c439b805e20dd9dba744b3f7216c970c3591592e (diff) | |
Use '#if 0 ... #endif' rather than /** ... **/ to comment out
unused hf[] entries (which I should have done in the first place).
svn path=/trunk/; revision=47390
Diffstat (limited to 'epan')
66 files changed, 425 insertions, 398 deletions
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index a48887608a..f3a65f3d36 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -652,17 +652,17 @@ void proto_register_nmas(void) { static hf_register_info hf_nmas[] = { -/** +#if 0 { &hf_func, { "Function", "nmas.func", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_subfunc, { "Subfunction", "nmas.subfunc", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_ping_version, { "Ping Version", "nmas.ping_version", FT_UINT32, BASE_HEX, NULL, 0x0, @@ -711,11 +711,11 @@ proto_register_nmas(void) { "Message Verb", "nmas.msg_verb", FT_UINT8, BASE_HEX, VALS(nmas_msgverb_enum), 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_attribute, { "Attribute Type", "nmas.attribute", FT_UINT32, BASE_DEC, VALS(nmas_attribute_enum), 0x0, NULL, HFILL }}, -**/ +#endif { &hf_clearance, { "Requested Clearance", "nmas.clearance", diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index d71bd272da..f40917e7fa 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -1022,12 +1022,12 @@ proto_register_ncp(void) { "Control Code", "ncp.control_code", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_ncp_fragment_handle, { "Fragment Handle", "ncp.fragger_hndl", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_lip_echo, { "Large Internet Packet Echo", "ncp.lip_echo", FT_STRING, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 5aca6ea863..cfe6752c96 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3869,11 +3869,11 @@ proto_register_ndmp(void) "CDB length", "ndmp.execute_cdb.cdb_len", FT_UINT32, BASE_DEC, NULL, 0, "Length of CDB", HFILL }}, -/** +#if 0 { &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 }}, -**/ +#endif { &hf_ndmp_execute_cdb_status, { "Status", "ndmp.execute_cdb.status", FT_UINT8, BASE_DEC, @@ -3883,11 +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 }}, -/** +#if 0 { &hf_ndmp_execute_cdb_datain, { "Data in", "ndmp.execute_cdb.datain", FT_BYTES, BASE_NONE, NULL, 0, "Data transferred from the SCSI device", HFILL }}, -**/ +#endif { &hf_ndmp_execute_cdb_sns_len, { "Sense data length", "ndmp.execute_cdb.sns_len", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 581995e700..49953c006e 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -8353,12 +8353,12 @@ proto_register_ndps(void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_ndps_error, { "NDPS Error", "spx.ndps_error", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_ndps_other_error_string, { "Extended Error String", "ndps.ext_err_string", @@ -8405,19 +8405,19 @@ proto_register_ndps(void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_ndps_sbuffer, { "Server", "ndps.sbuffer", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_ndps_rbuffer, { "Connection", "ndps.rbuffer", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_ndps_user_name, { "Trustee Name", "ndps.user_name", @@ -8604,12 +8604,12 @@ proto_register_ndps(void) FT_UINT32, BASE_HEX, VALS(qualified_name_enum), 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_ndps_qualified_name2, { "Qualified Name Type", "ndps.qual_name_type2", FT_UINT32, BASE_HEX, VALS(qualified_name_enum2), 0x0, NULL, HFILL }}, -**/ +#endif { &hf_ndps_item_count, { "Number of Items", "ndps.item_count", @@ -9146,19 +9146,19 @@ proto_register_ndps(void) FT_UINT32, BASE_HEX, VALS(ndps_filter_enum), 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_ndps_item_filter, { "Filter Item Operation", "ndps.filter_item", FT_UINT32, BASE_HEX, VALS(ndps_filter_item_enum), 0x0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_ndps_substring_match, { "Substring Match", "ndps.substring_match", FT_UINT32, BASE_HEX, VALS(ndps_match_criteria_enum), 0x0, NULL, HFILL }}, -**/ +#endif { &hf_ndps_time_limit, { "Time Limit", "ndps.time_limit", @@ -9270,12 +9270,12 @@ proto_register_ndps(void) FT_UINT32, BASE_HEX, VALS(ndps_error_types), 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_ndps_banner_count, { "Number of Banners", "ndps.banner_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_ndps_banner_name, { "Banner Name", "ndps.banner_name", @@ -9423,12 +9423,12 @@ proto_register_ndps(void) FT_UINT32, BASE_DEC, VALS(ndps_doc_content_enum), 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_ndps_doc_name, { "Document Name", "ndps.doc_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_local_id, { "Local ID", "ndps.local_id", @@ -9585,12 +9585,12 @@ proto_register_ndps(void) FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_info_bytes, { "Byte Value", "ndps.info_bytes", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_ndps_list_local_servers_type, { "Server Type", "ndps.list_local_server_type", @@ -9717,12 +9717,12 @@ proto_register_ndps(void) FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_ndps_attribute_time, { "Time", "ndps.attribute_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_print_security, { "Printer Security", "ndps.print_security", diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 754028e804..e7fbb35de9 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1355,11 +1355,11 @@ void proto_register_netbios(void) { "Remote Session No.", "netbios.remote_session", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_netb_data1, { "DATA1 value", "netbios.data1", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_netb_data2, { "DATA2 value", "netbios.data2", FT_UINT16, BASE_HEX, NULL, 0x0, diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index d5a58a257b..5fc3789df1 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -7449,14 +7449,14 @@ proto_register_netflow(void) FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL} }, -/** +#if 0 {&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} }, -**/ +#endif {&hf_cflow_transport_packets_out_of_order_string, {"Transport Packets Out of Order", "cflow.transport_packets_out_of_order", diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 0ad0f6cacc..3f4bbb4986 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -10644,11 +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 }}, -/** +#if 0 { &hf_nfs_impl_id4_len, { "Implementation ID length", "nfs.impl_id4.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_fh_length, { "length", "nfs.fh.length", FT_UINT32, BASE_DEC, NULL, 0, "file handle length", HFILL }}, @@ -10784,16 +10784,16 @@ proto_register_nfs(void) { &hf_nfs_fh_dentry, { "dentry", "nfs.fh.dentry", FT_UINT32, BASE_HEX, NULL, 0, "dentry (cookie)", HFILL }}, -/** +#if 0 { &hf_nfs_fh_dev, { "device", "nfs.fh.dev", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ -/** +#endif +#if 0 { &hf_nfs_fh_xdev, { "exported device", "nfs.fh.xdev", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_fh_dirinode, { "directory inode", "nfs.fh.dirinode", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -11050,11 +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 }}, -/** +#if 0 { &hf_nfs_fattr_type, { "type", "nfs.fattr.type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_fattr_nlink, { "nlink", "nfs.fattr.nlink", FT_UINT32, BASE_DEC, @@ -11116,11 +11116,11 @@ proto_register_nfs(void) "used", "nfs.fattr3.used", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_nfs_fattr3_rdev, { "rdev", "nfs.fattr3.rdev", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_fattr3_fsid, { "fsid", "nfs.fattr3.fsid", FT_UINT64, BASE_HEX_DEC, @@ -11224,11 +11224,11 @@ proto_register_nfs(void) "clientid", "nfs.clientid", FT_UINT64, BASE_HEX, NULL, 0, "Client ID", HFILL }}, -/** +#if 0 { &hf_nfs_ace4, { "ace", "nfs.ace", FT_STRING, BASE_NONE, NULL, 0, "Access Control Entry", HFILL }}, -**/ +#endif { &hf_nfs_recall, { "Recall", "nfs.recall", FT_BOOLEAN, BASE_NONE, @@ -11386,11 +11386,11 @@ proto_register_nfs(void) "eof", "nfs.dirlist4.eof", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_nfs_stateid4, { "stateid", "nfs.stateid4", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_offset4, { "offset", "nfs.offset4", FT_UINT64, BASE_DEC, @@ -11460,17 +11460,17 @@ proto_register_nfs(void) "acetype", "nfs.acetype4", FT_UINT32, BASE_DEC, VALS(names_acetype4), 0, NULL, HFILL }}, -/** +#if 0 { &hf_nfs_aceflag4, { "aceflag", "nfs.aceflag4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_nfs_acemask4, { "acemask", "nfs.acemask4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_fattr4_size, { "size", "nfs.fattr4.size", FT_UINT64, BASE_DEC, @@ -11604,11 +11604,11 @@ proto_register_nfs(void) "cookieverf", "nfs.cookieverf4", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_nfs_cb_location, { "cb_location", "nfs.cb_location", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_cb_program, { "cb_program", "nfs.cb_program", FT_UINT32, BASE_HEX, @@ -11702,11 +11702,11 @@ proto_register_nfs(void) "owner", "nfs.open_owner4", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_nfs_lock_owner4, { "owner", "nfs.lock_owner4", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_createmode4, { "Create Mode", "nfs.createmode4", FT_UINT32, BASE_DEC, @@ -11896,35 +11896,35 @@ proto_register_nfs(void) "IO mode", "nfs.iomode", FT_UINT32, BASE_DEC, VALS(iomode_names), 0, NULL, HFILL }}, -/** +#if 0 { &hf_nfs_stripetype4, { "stripe type", "nfs.stripetype", FT_UINT32, BASE_DEC, VALS(stripetype_names), 0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_nfs_stripeunit4, { "stripe unit", "nfs.stripeunit", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_nfs_util4, { "util", "nfs.util", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_nfs_first_stripe_idx4, { "first stripe index", "nfs.stripeindex", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_nfs_pattern_offset, { "layout pattern offset", "nfs.patternoffset", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_notification_bitmap4, { "notification bitmap", "nfs.notificationbitmap", FT_UINT32, BASE_DEC, @@ -11946,11 +11946,11 @@ proto_register_nfs(void) "layout available?", "nfs.layoutavail", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_nfs_mdscommit4, { "MDS commit?", "nfs.mdscommit", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0x0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_layoutupdate4, { "layout update", "nfs.layoutupdate", FT_BYTES, BASE_NONE, @@ -11972,24 +11972,24 @@ proto_register_nfs(void) "layout", "nfs.layout", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_nfs_layout_count, { "layout", "nfs.layoutcount", FT_UINT32, BASE_DEC, NULL, 0, "layout count", HFILL }}, -**/ +#endif -/** +#if 0 { &hf_nfs_stripedevs4, { "stripe devs", "nfs.stripedevs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_nfs_devaddr4, { "device addr", "nfs.devaddr", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_return_on_close4, { "return on close?", "nfs.retclose4", FT_BOOLEAN, BASE_NONE, @@ -12030,23 +12030,23 @@ proto_register_nfs(void) "hdr pad size", "nfs.padsize4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_nfs_cbrenforce4, { "binding enforce?", "nfs.cbrenforce4", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0x0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_nfs_hashalg4, { "hash alg", "nfs.hashalg4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_nfs_ssvlen4, { "ssv len", "nfs.ssvlen4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_nfs_maxreqsize4, { "max req size", "nfs.maxreqsize4", FT_UINT32, BASE_DEC, diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index b688d61a2b..d1807b8332 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -1177,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, @@ -1265,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, @@ -1293,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", @@ -1311,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, diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index e5fb1739b8..0fdf3b14bf 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.c @@ -1561,11 +1561,11 @@ proto_register_nis(void) "column", "nisplus.entry.col", FT_NONE, BASE_NONE, NULL, 0, "Entry Column", HFILL }}, -/** +#if 0 { &hf_nisplus_entry_flags, { "flags", "nisplus.entry.flags", FT_UINT32, BASE_HEX, NULL, 0, "Entry Col Flags", HFILL }}, -**/ +#endif { &hf_nisplus_entry_val, { "val", "nisplus.entry.val", FT_STRING, BASE_NONE, diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index b25996b048..c839a1d815 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -1050,20 +1050,20 @@ proto_register_nsip(void) FT_UINT16, BASE_DEC, NULL, 0x0, "Network Service Entity Identifier", HFILL } }, -/** +#if 0 { &hf_nsip_ip4_elements, { "IP4 elements", "nsip.ip4_elements", FT_NONE, BASE_NONE, NULL, 0x0, "List of IP4 elements", HFILL } }, -**/ -/** +#endif +#if 0 { &hf_nsip_ip6_elements, { "IP6 elements", "nsip.ip6_elements", FT_NONE, BASE_NONE, NULL, 0x0, "List of IP6 elements", HFILL } }, -**/ +#endif { &hf_nsip_max_num_ns_vc, { "Maximum number of NS-VCs", "nsip.max_num_ns_vc", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -1134,20 +1134,20 @@ proto_register_nsip(void) FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_nsip_ip_element_ip_address_ipv4, { "IP Address", "nsip.ip_element.ipv4_address", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_nsip_ip_element_ip_address_ipv6, { "IP Address", "nsip.ip_element.ipv6_address", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_nsip_ip_element_udp_port, { "UDP Port", "nsip.ip_element.udp_port", FT_UINT16, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index c120fd2ec9..a6a5e0b3c2 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -430,13 +430,13 @@ proto_register_nsrp(void) FT_UINT8, BASE_DEC, VALS(nsrp_encflag_vals), 0, "NSRP ENCRYPT FLAG", HFILL } }, -/** +#if 0 { &hf_nsrp_notused, { "Not Used", "nsrp.notused", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -**/ +#endif { &hf_nsrp_total_size, { "Total Size", "nsrp.totalsize", FT_UINT32, BASE_DEC, NULL, 0, diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 4ee4b05447..e53aac5378 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -2901,53 +2901,53 @@ proto_register_ntlmssp(void) FT_BOOLEAN, 32, TFS (&tfs_set_notset), NTLMSSP_NEGOTIATE_56, "56-bit encryption is supported", HFILL } }, -/** +#if 0 { &hf_ntlmssp_negotiate_workstation_strlen, { "Calling workstation name length", "ntlmssp.negotiate.callingworkstation.strlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_ntlmssp_negotiate_workstation_maxlen, { "Calling workstation name max length", "ntlmssp.negotiate.callingworkstation.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_ntlmssp_negotiate_workstation_buffer, { "Calling workstation name buffer", "ntlmssp.negotiate.callingworkstation.buffer", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_ntlmssp_negotiate_workstation, { "Calling workstation name", "ntlmssp.negotiate.callingworkstation", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_ntlmssp_negotiate_domain_strlen, { "Calling workstation domain length", "ntlmssp.negotiate.domain.strlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_ntlmssp_negotiate_domain_maxlen, { "Calling workstation domain max length", "ntlmssp.negotiate.domain.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_ntlmssp_negotiate_domain_buffer, { "Calling workstation domain buffer", "ntlmssp.negotiate.domain.buffer", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_ntlmssp_negotiate_domain, { "Calling workstation domain", "ntlmssp.negotiate.domain", FT_STRING, BASE_NONE, NULL, 0x0, @@ -3236,13 +3236,13 @@ proto_register_ntlmssp(void) FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_ntlmssp_decrypted_payload, { "NTLM Decrypted Payload", "ntlmssp.decrypted_payload", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_ntlmssp_verf_randompad, { "Random Pad", "ntlmssp.verf.randompad", FT_UINT32, BASE_HEX, NULL, 0x0, diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index b37165345d..da043a50f2 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -825,14 +825,14 @@ void proto_register_olsr(void) { } }, -/** +#if 0 { &hf_olsr_neighbor6, { "Neighbor Address", "olsr.neighbor6", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, -**/ +#endif { &hf_olsr_origin6_addr, { "Originator Address", "olsr.origin6_addr", diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 23e3bf17c6..bd4bc2f53b 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1734,11 +1734,11 @@ proto_register_opensafety(void) { &hf_oss_length, { "Length", "opensafety.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_oss_data, { "Data", "opensafety.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_oss_crc, { "CRC", "opensafety.crc.data", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, @@ -1786,11 +1786,11 @@ proto_register_opensafety(void) { &hf_oss_ssdo_client, { "SSDO Client", "opensafety.ssdo.client", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_oss_ssdo_sano, { "SOD Access Request Number", "opensafety.ssdo.sano", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_oss_ssdo_sacmd, { "SOD Access Command", "opensafety.ssdo.sacmd", FT_UINT8, BASE_HEX, VALS(ssdo_sacmd_values), 0x0, NULL, HFILL } }, @@ -1806,16 +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 } }, -/** +#if 0 { &hf_oss_ssdo_segment_size, { "SOD Segment Size", "opensafety.ssdo.segmentsize", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_oss_ssdo_inhibit_time, { "Inhibit Time", "opensafety.ssdo.inhibittime", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_oss_ssdo_abort_code, { "Abort Code", "opensafety.ssdo.abortcode", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, @@ -1823,11 +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 } }, -/** +#if 0 { &hf_oss_ssdo_sacmd_reserved, { "Reserved", "opensafety.ssdo.sacmd.reserved", FT_BOOLEAN, 8, TFS(&opensafety_sacmd_res), OPENSAFETY_SSDO_SACMD_RES, NULL, HFILL } }, -**/ +#endif { &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 } }, diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 62302b0e34..f70c0c86f3 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -2543,12 +2543,12 @@ proto_register_per(void) { "integer length", "per.integer_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_per_debug_pos, { "Current bit offset", "per.debug_pos", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif }; static gint *ett[] = { diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 6f6b83f13f..46492af3b0 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -1158,16 +1158,16 @@ proto_register_pgm(void) { &hf_pgm_spm_path6, { "Path NLA", "pgm.spm.path", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_pgm_data_sqn, { "Data Packet Sequence Number", "pgm.data.sqn", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ -/** +#endif +#if 0 { &hf_pgm_data_trail, { "Trailing Edge Sequence Number", "pgm.data.trail", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_pgm_nak_sqn, { "Requested Sequence Number", "pgm.nak.sqn", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c index a9afdad657..172a4ce078 100644 --- a/epan/dissectors/packet-ppcap.c +++ b/epan/dissectors/packet-ppcap.c @@ -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}}, diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c index 0ccc4706b8..95aeca93bf 100644 --- a/epan/dissectors/packet-ppi-gps.c +++ b/epan/dissectors/packet-ppi-gps.c @@ -533,12 +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 } }, -/** +#if 0 { &hf_ppi_gps_fractime, { "fractional Timestamp", "ppi_gps.fractime", FT_DOUBLE, BASE_NONE, NULL, 0x0, "fractional GPSTimestamp packet was received at", HFILL } }, -**/ +#endif { &hf_ppi_gps_eph, { "Horizontal Error (m)", "ppi_gps.eph", FT_DOUBLE, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 315e325550..f66356475b 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -1259,11 +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 }}, -/** +#if 0 { &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 }}, -**/ +#endif { &hf_ampdu_reassembled_in, { "Reassembled A-MPDU in frame", "ppi.80211n-mac.ampdu.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 579a70c6fe..bd34c6b7e2 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -1214,20 +1214,20 @@ void proto_register_pppoes(void) NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_pppoes_tag, { "Tag", "pppoes.tag", FT_UINT16, BASE_HEX, VALS(tag_vals), 0x0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_pppoes_tag_credits, { "Credits", "pppoes.tags.credits", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_pppoes_tag_credits_fcn, { "FCN", "pppoes.tags.credits.fcn", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index f7712b151c..ce817e76ca 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -4103,13 +4103,13 @@ proto_register_ptp(void) NULL, HFILL } }, /*parameterlength > 0*/ -/** +#if 0 { &hf_ptp_mm_messageparameters, { "messageParameters", "ptp.mm.messageparameters", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif /*ptp_mm_clock_identity (parameterlength = 64)*/ { &hf_ptp_mm_clock_identity_clockcommunicationtechnology, { "clockCommunicationTechnology", "ptp.mm.clock.identity.clockcommunicationtechnology", @@ -4511,13 +4511,13 @@ proto_register_ptp(void) FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_ptp_mm_update_global_time_properties_epochnumber, { "epochNumber", "ptp.mm.update.global.time.properties.epochnumber", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, -**/ +#endif /*ptp_mm_get_foreign_data_set (parameterlength = 4)*/ { &hf_ptp_mm_get_foreign_data_set_recordkey, { "recordKey", "ptp.mm.get.foreign.data.set.recordkey", @@ -4721,13 +4721,13 @@ proto_register_ptp(void) }, /*Fields for PTP_Announce (=an) messages*/ -/** +#if 0 { &hf_ptp_v2_an_origintimestamp, { "originTimestamp", "ptp.v2.an.origintimestamp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif { &hf_ptp_v2_an_origintimestamp_seconds, { "originTimestamp (seconds)", "ptp.v2.an.origintimestamp.seconds", FT_UINT64, BASE_DEC, NULL, 0x00, @@ -4878,13 +4878,13 @@ proto_register_ptp(void) }, /*Fields for PTP_Sync AND PTP_DelayRequest (=sdr) messages*/ -/** +#if 0 { &hf_ptp_v2_sdr_origintimestamp, { "originTimestamp", "ptp.v2.sdr.origintimestamp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif { &hf_ptp_v2_sdr_origintimestamp_seconds, { "originTimestamp (seconds)", "ptp.v2.sdr.origintimestamp.seconds", FT_UINT64, BASE_DEC, NULL, 0x00, @@ -4897,13 +4897,13 @@ proto_register_ptp(void) }, /*Fields for PTP_Follow_Up (=fu) messages*/ -/** +#if 0 { &hf_ptp_v2_fu_preciseorigintimestamp, { "preciseOriginTimestamp", "ptp.v2.fu.preciseorigintimestamp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif { &hf_ptp_v2_fu_preciseorigintimestamp_seconds, { "preciseOriginTimestamp (seconds)", "ptp.v2.fu.preciseorigintimestamp.seconds", FT_UINT64, BASE_DEC, NULL, 0x00, @@ -4957,13 +4957,13 @@ proto_register_ptp(void) }, /*Fields for PTP_DelayResponse (=dr) messages*/ -/** +#if 0 { &hf_ptp_v2_dr_receivetimestamp, { "receiveTimestamp", "ptp.v2.dr.receivetimestamp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif { &hf_ptp_v2_dr_receivetimestamp_seconds, { "receiveTimestamp (seconds)", "ptp.v2.dr.receivetimestamp.seconds", FT_UINT64, BASE_DEC, NULL, 0x00, @@ -4986,13 +4986,13 @@ proto_register_ptp(void) }, /*Fields for PTP_PDelayRequest (=pdrq) messages*/ -/** +#if 0 { &hf_ptp_v2_pdrq_origintimestamp, { "originTimestamp", "ptp.v2.pdrq.origintimestamp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif { &hf_ptp_v2_pdrq_origintimestamp_seconds, { "originTimestamp (seconds)", "ptp.v2.pdrq.origintimestamp.seconds", FT_UINT64, BASE_DEC, NULL, 0x00, @@ -5005,13 +5005,13 @@ proto_register_ptp(void) }, /*Fields for PTP_PDelayResponse (=pdrs) messages*/ -/** +#if 0 { &hf_ptp_v2_pdrs_requestreceipttimestamp, { "requestreceiptTimestamp", "ptp.v2.pdrs.requestreceipttimestamp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif { &hf_ptp_v2_pdrs_requestreceipttimestamp_seconds, { "requestreceiptTimestamp (seconds)", "ptp.v2.pdrs.requestreceipttimestamp.seconds", FT_UINT64, BASE_DEC, NULL, 0x00, @@ -5034,13 +5034,13 @@ proto_register_ptp(void) }, /*Fields for PTP_PDelayResponseFollowUp (=pdfu) messages*/ -/** +#if 0 { &hf_ptp_v2_pdfu_responseorigintimestamp, { "responseOriginTimestamp", "ptp.v2.pdfu.responseorigintimestamp", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif { &hf_ptp_v2_pdfu_responseorigintimestamp_seconds, { "responseOriginTimestamp (seconds)", "ptp.v2.pdfu.responseorigintimestamp.seconds", FT_UINT64, BASE_DEC, NULL, 0x00, @@ -5304,13 +5304,13 @@ proto_register_ptp(void) FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, -/** +#if 0 { &hf_ptp_v2_mm_faultRecord, { "fault record", "ptp.v2.mm.faultRecord", FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif { &hf_ptp_v2_mm_faultRecordLength, { "fault record length", "ptp.v2.mm.faultRecordLength", FT_UINT16, BASE_DEC, NULL, 0x00, @@ -5351,13 +5351,13 @@ proto_register_ptp(void) FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL } }, -/** +#if 0 { &hf_ptp_v2_mm_faultTime, { "Fault time", "ptp.v2.mm.faultTime", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x00, NULL, HFILL } }, -**/ +#endif { &hf_ptp_v2_mm_faultTime_s, { "Fault time (seconds)", "ptp.v2.mm.faultTime.seconds", FT_UINT64, BASE_DEC, NULL, 0x00, diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index ce3152a650..20f0748e78 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -3251,11 +3251,11 @@ proto_register_pvfs(void) { "Size", "pvfs.size", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_pvfs_release_number, { "Release Number", "pvfs.release_number", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_pvfs_encoding, { "Encoding", "pvfs.encoding", FT_UINT32, BASE_DEC, @@ -3265,21 +3265,21 @@ proto_register_pvfs(void) { "Server Operation", "pvfs.server_op", FT_UINT32, BASE_DEC, VALS(names_pvfs_server_op), 0, NULL, HFILL }}, -/** +#if 0 { &hf_pvfs_handle, { "Handle", "pvfs.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_pvfs_fs_id, { "fs_id", "pvfs.fs_id", FT_UINT32, BASE_HEX, NULL, 0, "File System ID", HFILL }}, -/** +#if 0 { &hf_pvfs_attrmask, { "attrmask", "pvfs.attrmask", FT_UINT32, BASE_HEX, NULL, 0, "Attribute Mask", HFILL }}, -**/ +#endif { &hf_pvfs_attr, { "attr", "pvfs.attribute", FT_UINT32, BASE_HEX, @@ -3365,11 +3365,11 @@ proto_register_pvfs(void) { "microseconds", "pvfs.parent_ctime.usec", FT_UINT32, BASE_DEC, NULL, 0, "Creation Time (microseconds)", HFILL }}, -/** +#if 0 { &hf_pvfs_dirent_count, { "Dir Entry Count", "pvfs.dirent_count", FT_UINT64, BASE_DEC, NULL, 0, "Directory Entry Count", HFILL }}, -**/ +#endif { &hf_pvfs_directory_version, { "Directory Version", "pvfs.directory_version", FT_UINT64, BASE_HEX, @@ -3407,11 +3407,11 @@ proto_register_pvfs(void) { "Previous Value", "pvfs.prev_value", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_pvfs_ram_free_bytes, { "RAM Free Bytes", "pvfs.ram.free_bytes", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_pvfs_bytes_available, { "Bytes Available", "pvfs.bytes_available", FT_UINT64, BASE_DEC, diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c index 4fff9f85e7..cafa7ec85b 100644 --- a/epan/dissectors/packet-pw-hdlc.c +++ b/epan/dissectors/packet-pw-hdlc.c @@ -182,14 +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[] = { -/** +#if 0 { &hf_pw_hdlc, { "PW HDLC", "pw_hdlc", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_pw_hdlc_address_field, { diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index ffd28ac2f5..664017d5e9 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -2243,11 +2243,11 @@ proto_register_q933(void) { "Connected party number digits", "q933.connected_number.digits", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_q933_redirecting_number, { "Redirecting party number digits", "q933.redirecting_number.digits", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_q933_report_type, { "Report type", "q933.report_type", FT_UINT8, BASE_DEC, VALS(q933_report_type_vals), 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 87a32d83c2..8f32e86b63 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -2470,18 +2470,18 @@ proto_register_rdp(void) { { "Pad3", "rdp.Pad3", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_rdp_Key1, { "Key1", "rdp.Key1", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -**/ -/** +#endif +#if 0 { &hf_rdp_Key2, { "Key2", "rdp.Key2", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_rdp_originatorId, { "originatorId", "rdp.OriginatorId", FT_UINT32, BASE_DEC, NULL, 0, @@ -2522,12 +2522,12 @@ proto_register_rdp(void) { { "capabilityData", "rdp.capabilityData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_rdp_unknownData, { "unknownData", "rdp.unknownData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_rdp_notYetImplemented, { "notYetImplemented", "rdp.notYetImplemented", FT_NONE, BASE_NONE, NULL, 0, @@ -2536,12 +2536,12 @@ proto_register_rdp(void) { { "encryptedData", "rdp.encryptedData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_rdp_compressed, { "compressedData", "rdp.compressedData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_rdp_sessionId, { "sessionId", "rdp.sessionId", FT_UINT32, BASE_HEX, NULL, 0, diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 5ef29de2ae..09e50fa2ba 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -1520,7 +1520,7 @@ void proto_register_rdt(void) NULL, HFILL } }, -/** +#if 0 { &hf_rdt_rtt_request_flags, { @@ -1533,8 +1533,8 @@ void proto_register_rdt(void) NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_rdt_rtt_response_flags, { @@ -1547,8 +1547,8 @@ void proto_register_rdt(void) NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_rdt_congestion_flags, { @@ -1561,7 +1561,7 @@ void proto_register_rdt(void) NULL, HFILL } }, -**/ +#endif { &hf_rdt_report_flags, { @@ -1574,7 +1574,7 @@ void proto_register_rdt(void) NULL, HFILL } }, -/** +#if 0 { &hf_rdt_tirq_flags, { @@ -1587,7 +1587,7 @@ void proto_register_rdt(void) NULL, HFILL } }, -**/ +#endif { &hf_rdt_tirp_flags, { diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index 04adf7a0d2..c13835cba5 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -2092,14 +2092,14 @@ proto_register_rohc(void) "Whether the IP-ID is in Network Byte Order" , HFILL } }, -/** +#if 0 { &hf_rohc_rtp_checksum, { "Checksum","rohc.rtp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0, NULL , HFILL } }, -**/ +#endif { &hf_rohc_dynamic_udp_checksum, { "UDP Checksum", "rohc.dynamic.udp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0, diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index 5356905cb9..37f3c472e4 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.c @@ -294,12 +294,12 @@ void proto_register_roofnet(void) FT_UINT32, BASE_DEC, NULL, 0x0, "Roofnet Sequential Number", HFILL } }, -/** +#if 0 { &hf_roofnet_links, { "Links", "roofnet.links", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_roofnet_link_src, { "Source IP", "roofnet.link.src", diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 4be1b69f9d..d6c59f7609 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -3386,7 +3386,7 @@ proto_register_rtcp(void) NULL, HFILL } }, -/** +#if 0 { &hf_rtcp_ssrc_csrc, { @@ -3399,7 +3399,7 @@ proto_register_rtcp(void) NULL, HFILL } }, -**/ +#endif { &hf_rtcp_sdes_type, { diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 7c58cb2e14..1b0e572a35 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -2723,11 +2723,11 @@ proto_register_amf(void) { "Length", "amf.header.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_amf_header_value_type, { "Value type", "amf.header.value_type", FT_UINT32, BASE_HEX, VALS(rtmpt_type_vals), 0x0, NULL, HFILL }}, -**/ +#endif { &hf_amf_message_count, { "Message count", "amf.message_count", FT_UINT16, BASE_DEC, @@ -2787,11 +2787,11 @@ proto_register_amf(void) { "Date", "amf.date", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, "AMF date", HFILL }}, - /** +#if 0 { &hf_amf_longstringlength, { "String length", "amf.longstringlength", FT_UINT32, BASE_DEC, NULL, 0x0, "AMF long string length", HFILL }}, - **/ +#endif { &hf_amf_longstring, { "Long string", "amf.longstring", FT_STRING, BASE_NONE, diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index 15b5994e48..728c18c0cf 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -9095,7 +9095,7 @@ void proto_register_rtps2(void) { }, /* Counter ------------------------------------------------------------- */ -/** +#if 0 { &hf_rtps_counter, { / * HIDDEN * / "counter", "rtps2.counter", @@ -9106,7 +9106,7 @@ void proto_register_rtps2(void) { "Sub-component 'counter' of the GuidPrefix of the RTPS packet", HFILL } }, -**/ +#endif /* Submessage ID ------------------------------------------------------- */ { &hf_rtps_sm_id, { @@ -9177,7 +9177,7 @@ void proto_register_rtps2(void) { "AppId component of the rtps2.sm.guidPrefix", HFILL } }, -/** +#if 0 { &hf_rtps_sm_instance_id, { "instanceId", "rtps2.sm.guidPrefix.appId.instanceId", @@ -9188,8 +9188,8 @@ void proto_register_rtps2(void) { "instanceId component of the AppId of the rtps2.sm.guidPrefix", HFILL } }, -**/ - /** +#endif +#if 0 { &hf_rtps_sm_app_kind, { "appKind", "rtps2.sm.guidPrefix.appId.appKind", @@ -9200,7 +9200,7 @@ void proto_register_rtps2(void) { "appKind component of the AppId of the rtps2.sm.guidPrefix", HFILL } }, - **/ +#endif { &hf_rtps_sm_counter, { "counter", diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c index 1120bfcdc2..c6a5926b6d 100644 --- a/epan/dissectors/packet-sasp.c +++ b/epan/dissectors/packet-sasp.c @@ -1312,12 +1312,12 @@ void proto_register_sasp(void) FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_dereg_req_reason, { "Dereg Req-Reason", "sasp.dereg-req.reason", FT_UINT8, BASE_HEX, NULL, 0x0, "SASP Dereg Req Reason", HFILL } }, -**/ +#endif /* Dereg Rep */ { &hf_sasp_dereg_rep_sz, @@ -1360,12 +1360,12 @@ void proto_register_sasp(void) "Group Of Member State Data Count", HFILL } }, /* Set Mem State Reply */ -/** +#if 0 { &hf_sasp_setmemstate_rep, { "Set Memstate Reply", "sasp.setmemstate-rep", FT_UINT32, BASE_HEX, NULL, 0x0, "SASP Set Memstate Reply", HFILL } }, -**/ +#endif { &hf_sasp_setmemstate_rep_sz, { "Set Memstate Rep-Size", "sasp.setmemstate-rep.size", @@ -1450,12 +1450,12 @@ void proto_register_sasp(void) /*Set LB State Rep */ -/** +#if 0 { &hf_sasp_setlbstate_rep, { "Set Lbstate Rep", "sasp.msg.type", FT_UINT32, BASE_HEX, NULL, 0x0, "SASP Set Lbstate Rep", HFILL } }, -**/ +#endif { &hf_sasp_setlbstate_rep_sz, { "Set Lbstate Rep-Size", "sasp.setlbstate-rep.size", @@ -1541,12 +1541,12 @@ void proto_register_sasp(void) FT_UINT8, BASE_HEX, VALS(lbstate_healthtable), 0x0, "SASP Set LB State Req LB Health", HFILL } }, -/** +#if 0 { &hf_lbstate_flag, { "Flags", "sasp.flags.lbstate", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_sasp_pushflag, { "PUSH", "sasp.flags.push", @@ -1622,12 +1622,12 @@ void proto_register_sasp(void) FT_UINT8, BASE_HEX, NULL, 0x0, "SASP Wt Entry Data Comp State", HFILL } }, -/** +#if 0 { &hf_wtstate_flag, { "Flags", "sasp.flags.wtstate", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_sasp_wed_contactsuccess_flag, { "Contact Success", "sasp.flags.contactsuccess", diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index fc0263b63f..f03c6ef18f 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -2100,45 +2100,45 @@ proto_register_sbus(void) "Availability of PGU baud switch feature", HFILL } }, -/** +#if 0 { &hf_sbus_sysinfo_length, { "System information length", "sbus.sysinfo_length", FT_UINT8, BASE_HEX, NULL, 0, "System information length in response", HFILL } }, -**/ +#endif -/** +#if 0 { &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 } }, -**/ +#endif -/** +#if 0 { &hf_sbus_harware_version, { "Hardware version", "sbus.hw_version", FT_STRING, BASE_NONE, NULL, 0, "Hardware version of the PCD or the module", HFILL } }, -**/ +#endif -/** +#if 0 { &hf_sbus_hardware_modification, { "Hardware modification", "sbus.hw_modification", FT_UINT8, BASE_DEC, NULL, 0, "Hardware modification of the PCD or module", HFILL } }, -**/ +#endif -/** +#if 0 { &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 } }, -**/ +#endif { &hf_sbus_acknackcode, { "ACK/NAK code", "sbus.nakcode", diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c index 39fc4896b9..e901504677 100644 --- a/epan/dissectors/packet-scsi-sbc.c +++ b/epan/dissectors/packet-scsi-sbc.c @@ -1,11 +1,11 @@ /* This dissector is based on the SBC2 specification. - * TODO - * parts of opcodes + * TODO + * parts of opcodes * 0x7f * 0xa3 * 0xa4 * 0x9e - * are still missing. + * are still missing. * Some DATA IN/OUT PDUs are missing as well. */ /* packet-scsi-sbc.c @@ -1573,7 +1573,7 @@ scsi_cdb_table_t scsi_sbc_table[256] = { /*SBC 0x3f*/{dissect_sbc_writelong10}, /*SBC 0x40*/{NULL}, /*SBC 0x41*/{dissect_sbc_writesame10}, -/*SBC 0x42*/{dissect_sbc_unmap}, +/*SBC 0x42*/{dissect_sbc_unmap}, /*SBC 0x43*/{NULL}, /*SBC 0x44*/{NULL}, /*SBC 0x45*/{NULL}, @@ -1818,11 +1818,11 @@ proto_register_scsi_sbc(void) { &hf_scsi_sbc_bytchk, {"BYTCHK", "scsi_sbc.bytchk", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}}, -/** +#if 0 { &hf_scsi_sbc_verify_reladdr, {"RELADDR", "scsi_sbc.verify.reladdr", FT_BOOLEAN, 8, NULL, 0x1, NULL, HFILL}}, -**/ +#endif { &hf_scsi_sbc_verify_lba, {"LBA", "scsi_sbc.verify.lba", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, @@ -1847,11 +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}}, -/** +#if 0 { &hf_scsi_sbc_readcapacity_flags, {"Flags", "scsi_sbc.readcapacity.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, -**/ +#endif { &hf_scsi_sbc_readdefdata_flags, {"Flags", "scsi_sbc.readdefdata.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c index 973a930dbe..63ff74161b 100644 --- a/epan/dissectors/packet-scsi-smc.c +++ b/epan/dissectors/packet-scsi-smc.c @@ -908,11 +908,11 @@ proto_register_scsi_smc(void) { &hf_scsi_smc_range, {"RANGE", "scsi_smc.range", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}}, -/** +#if 0 { &hf_scsi_smc_sea, {"Starting Element Address", "scsi_smc.sea", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}}, -**/ +#endif { &hf_scsi_smc_num_elements, {"Number of Elements", "scsi_smc.num_elements", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index ef15d5bb07..d0d711e34a 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -4064,9 +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 } }, -/** +#if 0 { &hf_cumulative_tsn_ack, { "Cumulative TSN Ack", "sctp.cumulative_tsn_ack", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &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 } }, @@ -4103,9 +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 } }, -/** +#if 0 { &hf_nr_sack_chunk_duplicate_tsn, { "Duplicate TSN", "sctp.nr_sack_duplicate_tsn", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &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 } }, diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c index 1c6025dc76..53709ad185 100644 --- a/epan/dissectors/packet-sercosiii.c +++ b/epan/dissectors/packet-sercosiii.c @@ -1379,41 +1379,41 @@ proto_register_sercosiii(void) FT_UINT16, BASE_DEC, NULL, 0x01, NULL, HFILL } }, -/** +#if 0 { &hf_siii_svch_data_telofs_telno, {"Telegram Number", "siii.mdt.svch.data.telassign.telno", FT_UINT16, BASE_DEC, NULL, 0xF000, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &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 } }, -**/ -/** +#endif +#if 0 { &hf_siii_svch_data_telofs_offset, {"Telegram Offset", "siii.mdt.svch.data.telassign.offset", FT_UINT16, BASE_DEC, NULL, 0x07FF, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &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 } }, -**/ -/** +#endif +#if 0 { &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 } }, -**/ +#endif { &hf_siii_mst_channel, { "Channel", "siii.channel", FT_UINT8, BASE_DEC, VALS(siii_mst_channel_text), 0x80, diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 6901954536..ea646593d9 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -1267,7 +1267,7 @@ proto_register_ses(void) } }, -/** +#if 0 { &hf_ses_version, { @@ -1280,8 +1280,8 @@ proto_register_ses(void) NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_ses_reserved, { @@ -1294,7 +1294,7 @@ proto_register_ses(void) NULL, HFILL } }, -**/ +#endif { &hf_called_ss_user_reference, { diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index d5263e4ff9..dcc9247b05 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -2795,12 +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}}, -/** +#if 0 { &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}}, -**/ +#endif { &hf_sflow_245_seqnum, { "Sequence number", "sflow_245.sequence_number", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -2817,18 +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}}, -/** +#if 0 { &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}}, -**/ -/** +#endif +#if 0 { &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}}, -**/ +#endif { &hf_sflow_5_flow_record_format, { "Format", "sflow_245.flow_record_format", FT_UINT32, BASE_DEC, VALS(sflow_5_flow_record_type), 0x0, @@ -2930,12 +2930,12 @@ proto_register_sflow(void) { { "Gateway Communities", "sflow_245.communityEntries", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, -/** +#if 0 { &hf_sflow_245_community, { "Gateway Community", "sflow_245.community", FT_UINT32, BASE_DEC, NULL, 0x0, "Gateway Communities", HFILL}}, -**/ +#endif { &hf_sflow_245_localpref, { "localpref", "sflow_245.localpref", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -2949,18 +2949,18 @@ proto_register_sflow(void) { { "Interface Speed", "sflow_245.ifspeed", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}}, -/** +#if 0 { &hf_sflow_245_ifdirection, { "Interface Direction", "sflow_245.ifdirection", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, -**/ -/** +#endif +#if 0 { &hf_sflow_245_ifstatus, { "Interface Status", "sflow_245.ifstatus", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, -**/ +#endif { &hf_sflow_245_ifinoct, { "Input Octets", "sflow_245.ifinoct", FT_UINT64, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index f507fd565e..d1d29372a8 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -2327,13 +2327,13 @@ proto_register_sigcomp(void) FT_UINT8, BASE_HEX, VALS(display_lit_bytecode_vals), 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_udvm_operand, { "UDVM operand", "sigcomp.udvm.operand", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_udvm_length, { "%Length", "sigcomp.udvm.length", FT_UINT16, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 8765b72154..124da92743 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -2419,11 +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 } }, -/** +#if 0 { &hf_slsk_server_ip, { "SoulSeek Server IP", "slsk.server.ip", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, -**/ +#endif { &hf_slsk_string_length, { "String Length", "slsk.string.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, @@ -2514,11 +2514,11 @@ proto_register_slsk(void) { &hf_slsk_size, { "Size", "slsk.size", FT_UINT32, BASE_DEC, NULL, 0, "File Size", HFILL } }, -/** +#if 0 { &hf_slsk_checksum, { "Checksum", "slsk.checksum", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, -**/ +#endif { &hf_slsk_code, { "Code", "slsk.code", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, @@ -2540,11 +2540,11 @@ proto_register_slsk(void) { &hf_slsk_picture, { "Picture", "slsk.user.picture", FT_STRING, BASE_NONE, NULL, 0, "User Picture", HFILL } }, -/** +#if 0 { &hf_slsk_user_uploads, { "User uploads", "slsk.uploads.user", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, -**/ +#endif { &hf_slsk_total_uploads, { "Total uploads allowed", "slsk.uploads.total", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index b60567a70c..5e951dc95a 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -1126,11 +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 }}, -/** +#if 0 { &hf_election_revision, { "Election Revision", "browser.election.revision", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_election_os, { "Election OS", "browser.election.os", FT_UINT8, BASE_HEX, diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index e2e842ed43..5d8e8d7096 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -2972,17 +2972,17 @@ proto_register_sna(void) { "Received Sequence Number", "sna.nlp.thdr.optional.0e.rseq", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_sna_nlp_opti_0e_abspbeg, { "ABSP Begin", "sna.nlp.thdr.optional.0e.abspbeg", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ +#endif -/** +#if 0 { &hf_sna_nlp_opti_0e_abspend, { "ABSP End", "sna.nlp.thdr.optional.0e.abspend", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_sna_nlp_opti_0f_bits, { "Client Bits", "sna.nlp.thdr.optional.0f.bits", @@ -3257,11 +3257,11 @@ proto_register_sna(void) { "Type of Variable", "sna.gds.type", FT_UINT16, BASE_HEX, VALS(sna_gds_var_vals), 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_sna_xid, { "XID", "sna.xid", FT_NONE, BASE_NONE, NULL, 0x0, "XID Frame", HFILL }}, -**/ +#endif { &hf_sna_xid_0, { "XID Byte 0", "sna.xid.0", FT_UINT8, BASE_HEX, NULL, 0x0, diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index b0c6267efd..6648779dbd 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.c @@ -254,12 +254,12 @@ proto_register_spp(void) FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_spp_rexmt_frame, { "Retransmitted Frame Number", "spp.rexmt_frame", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif }; static gint *ett[] = { diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 55cb1737ba..0ba01cef63 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -903,14 +903,14 @@ void proto_register_ts2(void) NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_ts2_string, { "String", "ts2.string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_ts2_registeredlogin, { "Registered Login", "ts2.registeredlogin", FT_BOOLEAN, BASE_NONE, diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 02502f5a58..b95794d676 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -2655,13 +2655,13 @@ proto_register_tipc(void) FT_UINT32, BASE_DEC, NULL, 0x0000FFFF, NULL, HFILL } }, -/** +#if 0 { &hf_tipcv2_bcast_seq_no, { "Broadcast Sequence Number", "tipcv2.bcast_seq_no", FT_UINT32, BASE_DEC, NULL, 0x0000FFFF, NULL, HFILL } }, -**/ +#endif { &hf_tipcv2_prev_node, { "Previous Node", "tipcv2.prev_node", FT_STRING, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 4d4747c3e2..406bd6d98b 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -1224,11 +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 }}, -/** +#if 0 { &hf_tns_marker_data, { "Marker Data", "tns.marker.data", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_tns_control, { "Control", "tns.control", FT_BOOLEAN, BASE_NONE, diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c index fc512d2d85..8b5b694b44 100644 --- a/epan/dissectors/packet-tte-pcf.c +++ b/epan/dissectors/packet-tte-pcf.c @@ -145,13 +145,13 @@ proto_register_tte_pcf(void) { static hf_register_info hf[] = { -/** +#if 0 { &hf_tte_pcf, { "Protocol Control Frame", "tte.pcf", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_tte_pcf_ic, { "Integration Cycle", "tte.pcf.ic", FT_UINT32, BASE_HEX, NULL, 0x0, @@ -162,13 +162,13 @@ proto_register_tte_pcf(void) FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_tte_pcf_res0, { "Reserved 0", "tte.pcf.res0", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_tte_pcf_sp, { "Sync Priority", "tte.pcf.sp", FT_UINT8, BASE_HEX, NULL, 0x0, @@ -184,13 +184,13 @@ proto_register_tte_pcf(void) FT_UINT8, BASE_HEX, VALS(pcf_type_str_vals), 0x0F, NULL, HFILL } }, -/** +#if 0 { &hf_tte_pcf_res1, { "Reserved 1", "tte.pcf.res1", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_tte_pcf_tc, { "Transparent Clock", "tte.pcf.tc", FT_UINT64, BASE_HEX, NULL, 0x0, diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index af1c05a9c1..f8b2fcad8b 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -439,19 +439,19 @@ proto_register_tzsp(void) { &hf_tzsp_encap, { "Encapsulation", "tzsp.encap", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_status_field, { "Status", "tzsp.wlan.status", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_status_msg_type, { "Type", "tzsp.wlan.status.msg_type", FT_UINT8, BASE_HEX, VALS(msg_type), 0, "Message type", HFILL }}, -/** +#if 0 { &hf_status_mac_port, { "Port", "tzsp.wlan.status.mac_port", FT_UINT8, BASE_DEC, NULL, 0, "MAC port", HFILL }}, -**/ +#endif { &hf_status_pcf, { "PCF", "tzsp.wlan.status.pcf", FT_BOOLEAN, BASE_NONE, TFS (&pcf_flag), 0x0, "Point Coordination Function", HFILL }}, diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index b38b5b522b..e0a0622384 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -4847,14 +4847,14 @@ void proto_register_fp(void) "HS-DSCH type 2 PDU block header", HFILL } }, -/** +#if 0 { &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 } }, -**/ +#endif { &hf_fp_flush, { "Flush", "fp.flush", FT_UINT8, BASE_DEC, 0, 0x04, diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index ab6ae64097..58498f1683 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -1347,17 +1347,17 @@ proto_register_umts_mac(void) FT_UINT16, BASE_DEC, VALS(mac_logical_channel_vals), 0, NULL, HFILL } }, -/** +#if 0 { &hf_mac_channel_str, { "Logical Channel", "mac.logical_channel", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_mac_channel_hsdsch, { "MACd-FlowID", "mac.macd_flowid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_mac_macdflowd_id, { "MACd-FlowID", "mac.macd_flowid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } }, @@ -1367,38 +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 } }, -/** +#if 0 { &hf_mac_edch_type2_descriptors, { "MAC-is Descriptors", "mac.edch.type2.descriptors", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_mac_edch_type2_lchid, { "LCH-ID", "mac.logical_channel_id", FT_UINT8, BASE_HEX, NULL, 0xf0, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_mac_edch_type2_length, { "Length", "mac.edch.type2.length", FT_UINT16, BASE_DEC, NULL, 0x0ffe, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_mac_edch_type2_flag, { "Flag", "mac.edch.type2.lchid", FT_UINT8, BASE_HEX, NULL, 0x01, "Indicates if another entry follows", HFILL } }, -**/ +#endif { &hf_mac_edch_type2_ss, { "SS", /* TODO: VALS */ @@ -1424,14 +1424,14 @@ proto_register_umts_mac(void) NULL, HFILL } }, -/** +#if 0 { &hf_mac_edch_type2_subframe_header, { "Subframe header", "mac.edch.type2.subframeheader", FT_STRING, BASE_NONE, NULL, 0x0, "EDCH Subframe header", HFILL } }, -**/ +#endif { &hf_mac_is_reasmin, { "Reassembled in frame", "mac.is.reasmin", FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL } diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c index 378e93bb73..1f83e1bd0a 100644 --- a/epan/dissectors/packet-usb-hid.c +++ b/epan/dissectors/packet-usb-hid.c @@ -965,11 +965,11 @@ proto_register_usb_hid(void) { "Usage minimum", "usbhid.item.local.usage_min", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, -/** +#if 0 { &hf_usb_hid_localitem_usage_max, { "Usage maximum", "usbhid.item.local.usage_max", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }}, -**/ +#endif { &hf_usb_hid_localitem_desig_index, { "Designator index", "usbhid.item.local.desig_index", FT_UINT8, BASE_HEX, diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 64f5de33b6..986b927e9a 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -3103,12 +3103,12 @@ proto_register_usb(void) FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, /* --------------------------------- */ -/** +#if 0 { &hf_usb_data_len, {"Application Data Length", "usb.data.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_usb_capdata, {"Leftover Capture Data", "usb.capdata", diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index 8d61d178c6..c72663fd98 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -2252,18 +2252,18 @@ proto_register_v52(void) { &hf_v52_discriminator, { "Protocol discriminator", "v52.disc", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_v52_address, { "Address", "v52.address", FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_v52_low_address, { "Address Low", "v52.low_address", FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL } }, -**/ +#endif /* ISDN */ { &hf_v52_isdn_address, { "Address isdn", "v52.isdn_address", @@ -2310,18 +2310,18 @@ proto_register_v52(void) FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL } }, /* CONTROL */ -/** +#if 0 { &hf_v52_ctrl_address, { "Address ctrl", "v52.ctrl_address", FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL } }, -**/ -/** +#endif +#if 0 { &hf_v52_ctrl_low_address, { "Address ctrl Low", "v52.ctrl_low_address", FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL } }, -**/ +#endif /* OTHER */ {&hf_v52_msg_type, { "Message type", "v52.msg_type", diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c index f16fb4cad1..21d370da68 100644 --- a/epan/dissectors/packet-v5dl.c +++ b/epan/dissectors/packet-v5dl.c @@ -324,11 +324,11 @@ proto_register_v5dl(void) { "Direction", "v5dl.direction", FT_UINT8, BASE_DEC, VALS(v5dl_direction_vals), 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_v5dl_address, { "Address Field", "v5dl.address", FT_UINT16, BASE_HEX, NULL, 0x0, "Address", HFILL }}, -**/ +#endif { &hf_v5dl_ef, { "EF", "v5dl.ef", FT_UINT16, BASE_DEC, VALS(v5dl_addr_vals), 0x0, diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index c74c8b8b19..f3e7375329 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -1516,12 +1516,12 @@ proto_register_v5ua(void) { "Message Type", "v5ua.msg_type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_msg_type_id, { "Message Type ID", "v5ua.msg_type_id", FT_UINT8, BASE_DEC, VALS(msg_class_type_values), 0x0, NULL, HFILL } }, -**/ +#endif { &hf_msg_length, { "Message length", "v5ua.msg_length", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -1579,12 +1579,12 @@ proto_register_v5ua(void) { "Envelope Function Address","v5ua.efa", FT_UINT16, BASE_DEC, VALS(efa_values), 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_spare_efa, { "Envelope Function Address (spare)","v5ua.efa", FT_UINT16, BASE_DEC, NULL, ~7, NULL, HFILL } }, -**/ +#endif { &hf_asp_reason, { "Reason", "v5ua.asp_reason", FT_UINT32, BASE_HEX, VALS(asp_reason_values), 0x0, diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index f75e182d09..3fa2a92495 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -455,13 +455,13 @@ proto_register_vcdu(void) FT_UINT64, BASE_DEC, NULL, 0x0, "SMEX Ground Sequence Counter", HFILL } }, -/** +#if 0 { &hf_smex_unused, { "Unused", "vcdu.smex.unused", FT_UINT16, BASE_DEC, NULL, 0x0, "SMEX Unused", HFILL } }, -**/ +#endif { &hf_smex_version, { "Version", "vcdu.smex.version", FT_UINT16, BASE_DEC, NULL, SMEX_VERSION, @@ -542,13 +542,13 @@ proto_register_vcdu(void) FT_UINT16, BASE_DEC, NULL, PB5_MILLISECONDS_MASK, "SMEX Milliseconds", HFILL } }, -/** +#if 0 { &hf_smex_spare, { "Spare", "vcdu.smex.spare", FT_UINT16, BASE_DEC, NULL, 0x03f, "SMEX Spare", HFILL } }, -**/ +#endif { &hf_vcdu_version, { "Version", "vcdu.version", diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 20e070bb8a..1f31474ae7 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -1068,11 +1068,11 @@ proto_register_wassp(void) 0x0, NULL, HFILL }}, /* Data: Embedded IEEE 802.11 Frame */ -/** +#if 0 { &hf_data, { "DATA", "wassp.data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif /* WASSP tunnel data */ { &hf_status, diff --git a/epan/dissectors/packet-waveagent.c b/epan/dissectors/packet-waveagent.c index f3de74bb53..b43cbfb120 100644 --- a/epan/dissectors/packet-waveagent.c +++ b/epan/dissectors/packet-waveagent.c @@ -1467,26 +1467,26 @@ void proto_register_waveagent(void) FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -/** +#if 0 { &hf_waveagent_rxmeanlatency, { "Rx Mean latency", "waveagent.rxmeanlatency", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ +#endif -/** +#if 0 { &hf_waveagent_rxminlatency, { "Rx Minimum latency", "waveagent.rxminlatency", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ +#endif -/** +#if 0 { &hf_waveagent_rxmaxlatency, { "Rx Maximum latency", "waveagent.rxmaxlatency", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } }, -**/ +#endif { &hf_waveagent_jitter, { "Jitter (microseconds)", "waveagent.jitter", diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index b1a4654e4e..cd826b408e 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -647,11 +647,11 @@ proto_register_wcp(void) { &hf_wcp_alg, { "Alg", "wcp.alg", FT_UINT8, BASE_DEC, NULL, 0, "Algorithm", HFILL }}, -/** +#if 0 { &hf_wcp_rexmit, { "Rexmit", "wcp.rexmit", FT_UINT8, BASE_DEC, NULL, 0, "Retransmit", HFILL }}, -**/ +#endif { &hf_wcp_hist_size, { "History", "wcp.hist", FT_UINT8, BASE_DEC, NULL, 0, "History Size", HFILL }}, @@ -664,11 +664,11 @@ proto_register_wcp(void) { &hf_wcp_comp_bits, { "Compress Flag", "wcp.flag", FT_UINT8, BASE_HEX, NULL, 0, "Compressed byte flag", HFILL }}, -/** +#if 0 { &hf_wcp_comp_marker, { "Compress Marker", "wcp.mark", FT_UINT8, BASE_DEC, NULL, 0, "Compressed marker", HFILL }}, -**/ +#endif { &hf_wcp_offset, { "Source offset", "wcp.off", FT_UINT16, BASE_HEX, NULL, WCP_OFFSET_MASK, "Data source offset", HFILL }}, diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index d32f1c5f6c..dba3e19d5e 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -1063,11 +1063,11 @@ proto_register_p2p(void) { "Attribute Length", "wifi_p2p.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_p2p_attr_capab, { "P2P Capability", "wifi_p2p.p2p_capability", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_p2p_attr_capab_device, { "Device Capability Bitmap", "wifi_p2p.p2p_capability.device_capability", @@ -1160,11 +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 }}, -/** +#if 0 { &hf_p2p_attr_listen_channel, { "Listen Channel", "wifi_p2p.listen_channel", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_p2p_attr_listen_channel_country, { "Country String", "wifi_p2p.listen_channel.country_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -1175,11 +1175,11 @@ proto_register_p2p(void) { "Channel Number", "wifi_p2p.listen_channel.channel_number", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_p2p_attr_operating_channel, { "Operating Channel", "wifi_p2p.operating_channel", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_p2p_attr_operating_channel_country, { "Country String", "wifi_p2p.operating_channel.country_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -1190,11 +1190,11 @@ proto_register_p2p(void) { "Channel Number", "wifi_p2p.channel.channel_number", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_p2p_attr_channel_list, { "Channel List", "wifi_p2p.channel_list", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_p2p_attr_channel_list_country, { "Country String", "wifi_p2p.channel_list.country_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -1207,11 +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 }}, -/** +#if 0 { &hf_p2p_attr_dev_info, { "Device Info", "wifi_p2p.dev_info", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &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 }}, @@ -1325,11 +1325,11 @@ proto_register_p2p(void) { "Start Time", "wifi_p2p.noa.start_time", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, -/** +#if 0 { &hf_p2p_attr_gi, { "Device Info", "wifi_p2p.group_info", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, -**/ +#endif { &hf_p2p_attr_gi_length, { "P2P Client Info Descriptor Length", "wifi_p2p.group_info.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -1369,13 +1369,13 @@ proto_register_p2p(void) { "P2P Device Limit", "wifi_p2p.group_info.device_capability.device_limit", FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_DEVICE_LIMIT, NULL, HFILL }}, -/** +#if 0 { &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 }}, -**/ +#endif { &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 }}, @@ -1408,53 +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 }}, -/** +#if 0 { &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 }}, -**/ -/** +#endif +#if 0 { &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 }}, -**/ -/** +#endif +#if 0 { &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 }}, -**/ -/** +#endif +#if 0 { &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 }}, -**/ -/** +#endif +#if 0 { &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 }}, -**/ -/** +#endif +#if 0 { &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 }}, -**/ -/** +#endif +#if 0 { &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 }}, -**/ -/** +#endif +#if 0 { &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 }}, -**/ -/** +#endif +#if 0 { &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 }}, -**/ +#endif { &hf_p2p_attr_invitation_flags, { "Invitation Flags", "wifi_p2p.invitation_flags", diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index e8531dbb36..759b0588e8 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -3313,27 +3313,27 @@ proto_register_wlccp(void) 0x0, "Node which relayed this message", HFILL } }, -/** +#if 0 { &hf_wlccp_priority, { "WDS priority", "wlccp.priority", FT_UINT8, BASE_DEC, NULL, 0, "WDS priority of this access point", HFILL } }, -**/ -/** +#endif +#if 0 { &hf_wlccp_age, { "Age", "wlccp.age", FT_UINT32, BASE_DEC, NULL, 0, "Time since AP became a WDS master", HFILL } }, -**/ -/** +#endif +#if 0 { &hf_wlccp_period, { "Period", "wlccp.period", FT_UINT8, BASE_DEC, NULL, 0, "Interval between announcements (seconds)", HFILL } }, -**/ +#endif { &hf_wlccp_ipv4_address, { "IPv4 Address", "wlccp.ipv4_address", FT_IPv4, BASE_NONE, NULL, 0, diff --git a/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c index 80d6ccea68..4691f937a3 100644 --- a/epan/dissectors/packet-ypbind.c +++ b/epan/dissectors/packet-ypbind.c @@ -183,10 +183,11 @@ proto_register_ypbind(void) "Response Type", "ypbind.resp_type", FT_UINT32, BASE_DEC, VALS(resp_type_vals), 0, NULL, HFILL }}, -/** { &hf_ypbind_error, { +#if 0 + { &hf_ypbind_error, { "Error", "ypbind.error", FT_UINT32, BASE_DEC, VALS(error_vals), 0, "YPBIND Error code", HFILL }}, -**/ +#endif { &hf_ypbind_addr, { "IP Addr", "ypbind.addr", FT_IPv4, BASE_NONE, NULL, 0, "IP Address of server", HFILL }}, diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index 66e1e8e0f7..555f691be4 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -107,6 +107,7 @@ 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; @@ -2101,6 +2102,12 @@ void proto_register_zbee_zcl(void) { "Int64", "zbee_zcl.attr.int64", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, +#if 0 + { &hf_zbee_zcl_attr_semi, + { "Semi Float", "zbee_zcl.attr.float", FT_FLOAT, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, +#endif + { &hf_zbee_zcl_attr_float, { "Float", "zbee_zcl.attr.float", FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index 6f91177def..d397be2d9a 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -66,6 +66,7 @@ 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; @@ -265,6 +266,12 @@ void proto_register_zep(void) { "Protocol Version", "zep.version", FT_UINT8, BASE_DEC, NULL, 0x0, "The version of the sniffer.", HFILL }}, +#if 0 + { &hf_zep_type, + { "Type", "zep.type", FT_UINT8, BASE_DEC, NULL, 0x0, + NULL, HFILL }}, +#endif + { &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 }}, diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index 314463b7e7..9f0a5820c7 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -43,6 +43,7 @@ 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; @@ -768,6 +769,17 @@ proto_register_zrtp(void) } }, +#if 0 + {&hf_zrtp_id, + { + "ID", "zrtp.id", + FT_UINT8, BASE_HEX, + NULL, 0x0, + NULL, HFILL + } + }, +#endif + {&hf_zrtp_sequence, { "Sequence", "zrtp.sequence", |