diff options
author | Michael Mann <mmann78@netscape.net> | 2016-06-03 23:45:10 -0400 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-06-05 06:11:12 +0000 |
commit | 6a847b7e015bc2f97e5a8ef5735f02c1981c7dc7 (patch) | |
tree | 80390b296fb8a0e96c6a4cec19a56557b0307d7f | |
parent | 7d7190695ce2ff269fdffb04e87139995cde21f4 (diff) |
Fix expert_info errors found by new and improved checkhfs.pl.
Change-Id: I30f1b92ee438361c3bd58743f7d1ae8d5ffc96f0
Reviewed-on: https://code.wireshark.org/review/15718
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | epan/dissectors/asn1/isdn-sup/packet-isdn-sup-template.c | 4 | ||||
-rw-r--r-- | epan/dissectors/asn1/qsig/packet-qsig-template.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-amqp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ceph.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-cops.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dof.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ecp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-fc.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-hip.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee1722a.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ieee802154.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-ipos.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-isdn-sup.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-lbmc.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ldp.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-openflow_v1.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-qsig.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-tcp.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-tds.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-wccp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-wcp.c | 4 |
21 files changed, 84 insertions, 30 deletions
diff --git a/epan/dissectors/asn1/isdn-sup/packet-isdn-sup-template.c b/epan/dissectors/asn1/isdn-sup/packet-isdn-sup-template.c index dc8f129551..66943d2cf9 100644 --- a/epan/dissectors/asn1/isdn-sup/packet-isdn-sup-template.c +++ b/epan/dissectors/asn1/isdn-sup/packet-isdn-sup-template.c @@ -90,7 +90,7 @@ static gint ett_isdn_sup = -1; #include "packet-isdn-sup-ett.c" -static expert_field ei_isdn_sup_unsupported_arg_type = EI_INIT; +/* static expert_field ei_isdn_sup_unsupported_arg_type = EI_INIT; */ static expert_field ei_isdn_sup_unsupported_result_type = EI_INIT; static expert_field ei_isdn_sup_unsupported_error_type = EI_INIT; @@ -355,7 +355,9 @@ void proto_register_isdn_sup(void) { }; static ei_register_info ei[] = { +#if 0 { &ei_isdn_sup_unsupported_arg_type, { "isdn_sup.unsupported.arg_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED ARGUMENT TYPE (ETSI sup)", EXPFILL }}, +#endif { &ei_isdn_sup_unsupported_result_type, { "isdn_sup.unsupported.result_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED RESULT TYPE (ETSI sup)", EXPFILL }}, { &ei_isdn_sup_unsupported_error_type, { "isdn_sup.unsupported.error_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED ERROR TYPE (ETSI sup)", EXPFILL }}, }; diff --git a/epan/dissectors/asn1/qsig/packet-qsig-template.c b/epan/dissectors/asn1/qsig/packet-qsig-template.c index 56b7586df6..3fb961c6d6 100644 --- a/epan/dissectors/asn1/qsig/packet-qsig-template.c +++ b/epan/dissectors/asn1/qsig/packet-qsig-template.c @@ -309,7 +309,7 @@ static gint ett_qsig_unknown_extension = -1; #include "packet-qsig-ett.c" static gint ett_cnq_PSS1InformationElement = -1; -static expert_field ei_qsig_unsupported_arg_type = EI_INIT; +/* static expert_field ei_qsig_unsupported_arg_type = EI_INIT; */ static expert_field ei_qsig_unsupported_result_type = EI_INIT; static expert_field ei_qsig_unsupported_error_type = EI_INIT; @@ -676,7 +676,9 @@ void proto_register_qsig(void) { }; static ei_register_info ei[] = { +#if 0 { &ei_qsig_unsupported_arg_type, { "qsig.unsupported.arg_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED ARGUMENT TYPE (QSIG)", EXPFILL }}, +#endif { &ei_qsig_unsupported_result_type, { "qsig.unsupported.result_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED RESULT TYPE (QSIG)", EXPFILL }}, { &ei_qsig_unsupported_error_type, { "qsig.unsupported.error_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED ERROR TYPE (QSIG)", EXPFILL }}, }; diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index dec8a2ab8e..dac805c92a 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -2062,7 +2062,7 @@ static expert_field ei_amqp_unknown_stream_method = EI_INIT; static expert_field ei_amqp_unknown_basic_method = EI_INIT; static expert_field ei_amqp_unknown_frame_type = EI_INIT; static expert_field ei_amqp_field_short = EI_INIT; -static expert_field ei_amqp_bad_length = EI_INIT; +/* static expert_field ei_amqp_bad_length = EI_INIT; */ static expert_field ei_amqp_unknown_command_class = EI_INIT; static expert_field ei_amqp_unknown_tunnel_method = EI_INIT; static expert_field ei_amqp_unknown_confirm_method = EI_INIT; @@ -13940,7 +13940,9 @@ proto_register_amqp(void) { &ei_amqp_channel_error, { "amqp.channel.error", PI_RESPONSE_CODE, PI_WARN, "Channel error", EXPFILL }}, { &ei_amqp_message_undeliverable, { "amqp.message.undeliverable", PI_RESPONSE_CODE, PI_WARN, "Message was not delivered", EXPFILL }}, { &ei_amqp_bad_flag_value, { "amqp.bad_flag_value", PI_PROTOCOL, PI_WARN, "Bad flag value", EXPFILL }}, +#if 0 { &ei_amqp_bad_length, { "amqp.bad_length", PI_MALFORMED, PI_ERROR, "Bad frame length", EXPFILL }}, +#endif { &ei_amqp_field_short, { "amqp.field_short", PI_PROTOCOL, PI_ERROR, "Field is cut off by the end of the field table", EXPFILL }}, { &ei_amqp_invalid_class_code, { "amqp.unknown.class_code", PI_PROTOCOL, PI_WARN, "Invalid class code", EXPFILL }}, { &ei_amqp_unknown_command_class, { "amqp.unknown.command_class", PI_PROTOCOL, PI_ERROR, "Unknown command/control class", EXPFILL }}, diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 6f1b1298ae..172a436600 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -731,7 +731,7 @@ static expert_field ei_union_unknown = EI_INIT; static expert_field ei_ver_tooold = EI_INIT; static expert_field ei_ver_toonew = EI_INIT; static expert_field ei_oloc_both = EI_INIT; -static expert_field ei_banner_invalid = EI_INIT; +/* static expert_field ei_banner_invalid = EI_INIT; */ static expert_field ei_sizeillogical = EI_INIT; /* Initialize the subtree pointers */ @@ -10465,10 +10465,12 @@ proto_register_ceph(void) "Only one of the key or hash should be present, however both are.", EXPFILL } }, +#if 0 { &ei_banner_invalid, { "ceph.banner.invalid", PI_MALFORMED, PI_ERROR, "Banner was invalid.", EXPFILL } }, +#endif { &ei_sizeillogical, { "ceph.sizeillogical", PI_MALFORMED, PI_ERROR, "The claimed size is impossible.", EXPFILL diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index d3aa455da3..68226ef780 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -794,7 +794,7 @@ static expert_field ei_cops_trailing_garbage = EI_INIT; static expert_field ei_cops_bad_cops_object_length = EI_INIT; static expert_field ei_cops_bad_cops_pr_object_length = EI_INIT; static expert_field ei_cops_unknown_c_num = EI_INIT; -static expert_field ei_cops_unknown_s_num = EI_INIT; +/* static expert_field ei_cops_unknown_s_num = EI_INIT; */ /* For PacketCable */ static gint ett_cops_subtree = -1; @@ -2804,7 +2804,9 @@ void proto_register_cops(void) { &ei_cops_bad_cops_object_length, { "cops.bad_cops_object_length", PI_MALFORMED, PI_ERROR, "COPS object length is too short", EXPFILL }}, { &ei_cops_bad_cops_pr_object_length, { "cops.bad_cops_pr_object_length", PI_MALFORMED, PI_ERROR, "COPS-PR object length is too short", EXPFILL }}, { &ei_cops_unknown_c_num, { "cops.unknown_c_num", PI_UNDECODED, PI_NOTE, "Unknown C-Num value", EXPFILL }}, +#if 0 { &ei_cops_unknown_s_num, { "cops.unknown_s_num", PI_UNDECODED, PI_NOTE, "Unknown S-Num value", EXPFILL }}, +#endif }; diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c index 13021d4b76..39f630f3ab 100644 --- a/epan/dissectors/packet-dof.c +++ b/epan/dissectors/packet-dof.c @@ -2087,7 +2087,7 @@ static int ett_oid_attribute_oid = -1; * Expert infos are related to either a PDU type or a specification, and so * they are listed separately. */ -static expert_field ei_undecoded = EI_INIT; +/* static expert_field ei_undecoded = EI_INIT; */ static expert_field ei_malformed = EI_INIT; static expert_field ei_implicit_no_op = EI_INIT; static expert_field ei_c2_c3_c4_format = EI_INIT; @@ -10898,7 +10898,9 @@ static void dof_register(void) static ei_register_info ei[] = { +#if 0 { &ei_undecoded, { "dof.undecoded", PI_UNDECODED, PI_WARN, "DOF: Some protocol octets were not decoded", EXPFILL } }, +#endif { &ei_malformed, { "dof.malformed", PI_MALFORMED, PI_ERROR, "Malformed:", EXPFILL } }, { &ei_implicit_no_op, { "dof.implicit_no_op", PI_PROTOCOL, PI_COMMENT, "Implicit No-op", EXPFILL } }, { &ei_c2_c3_c4_format, { "dof.c2_c3_c4_format", PI_MALFORMED, PI_WARN, "DOF: Cx IE format", EXPFILL } }, diff --git a/epan/dissectors/packet-ecp.c b/epan/dissectors/packet-ecp.c index e60af32b49..7ddcbd46d6 100644 --- a/epan/dissectors/packet-ecp.c +++ b/epan/dissectors/packet-ecp.c @@ -265,7 +265,7 @@ static void dissect_vdp_tlv_mgrid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item* length_item, int offset, int tlvlen) { if (tlvlen != 16) { - expert_add_info_format(pinfo, length_item, &ei_vdp_tlvlen_bad, "VDP TLV Invalid Length"); + expert_add_info(pinfo, length_item, &ei_vdp_tlvlen_bad); } else { proto_tree_add_item(tree, hf_vdp_manager_id, tvb, offset, 16, ENC_NA); } @@ -284,7 +284,7 @@ dissect_vdp_tlv_org(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_i guint8 subtype; if (tlvlen < 3) { - expert_add_info_format(pinfo, length_item, &ei_vdp_tlvlen_bad, "VDP TLV Invalid Length"); + expert_add_info(pinfo, length_item, &ei_vdp_tlvlen_bad); return; } @@ -538,9 +538,17 @@ proto_register_vdp(void) &ett_vdp_assoc_flags, }; + static ei_register_info ei[] = { + { &ei_vdp_tlvlen_bad, { "vdp21.tlvlen.bad", PI_MALFORMED, PI_ERROR, "VDP TLV Invalid Length", EXPFILL }}, + }; + + expert_module_t* expert_vdp; + proto_vdp = proto_register_protocol("VSI protocol", "VDP21", "vdp21"); proto_register_field_array(proto_vdp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + expert_vdp = expert_register_protocol(proto_vdp); + expert_register_field_array(expert_vdp, ei, array_length(ei)); } diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 5f372efff1..a7fd8eb294 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -140,7 +140,7 @@ static gint ett_fc_vft = -1; static expert_field ei_fccrc = EI_INIT; static expert_field ei_short_hdr = EI_INIT; -static expert_field ei_frag_size = EI_INIT; +/* static expert_field ei_frag_size = EI_INIT; */ static dissector_handle_t fc_handle, fcsof_handle; static dissector_table_t fcftype_dissector_table; @@ -1531,9 +1531,11 @@ proto_register_fc(void) { &ei_short_hdr, { "fc.short_hdr", PI_MALFORMED, PI_ERROR, "Packet length is shorter than the required header", EXPFILL }}, +#if 0 { &ei_frag_size, { "fc.frag_size", PI_MALFORMED, PI_ERROR, "Invalid fragment size", EXPFILL }} +#endif }; module_t *fc_module; diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index 37625304ae..928e446293 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -411,7 +411,7 @@ static gint ett_hip_tlv_host_id_hdr = -1; static gint ett_hip_locator_data = -1; static expert_field ei_hip_tlv_host_id_len = EI_INIT; -static expert_field ei_hip_tlv_host_id_e_len = EI_INIT; +/* static expert_field ei_hip_tlv_host_id_e_len = EI_INIT; */ static expert_field ei_hip_tlv_host_id_hdr_alg = EI_INIT; /* Dissect the HIP packet */ @@ -1590,7 +1590,9 @@ proto_register_hip(void) static ei_register_info ei[] = { { &ei_hip_tlv_host_id_len, { "hip.tlv.host_id_length.invalid", PI_PROTOCOL, PI_WARN, "Invalid HI length", EXPFILL }}, +#if 0 { &ei_hip_tlv_host_id_e_len, { "hip.tlv.host_id_e_length.invalid", PI_PROTOCOL, PI_WARN, "e_len too large", EXPFILL }}, +#endif { &ei_hip_tlv_host_id_hdr_alg, { "hip.tlv.host_id_header_algo.invalid", PI_PROTOCOL, PI_WARN, "Unknown algorithm type", EXPFILL }}, }; diff --git a/epan/dissectors/packet-ieee1722a.c b/epan/dissectors/packet-ieee1722a.c index ff84765740..510d0f7739 100644 --- a/epan/dissectors/packet-ieee1722a.c +++ b/epan/dissectors/packet-ieee1722a.c @@ -223,7 +223,7 @@ static int ett_1722a_crf_timestamp = -1; static expert_field ei_sample_width = EI_INIT; static expert_field ei_channels_per_frame = EI_INIT; -static expert_field ei_unknown_parameter = EI_INIT; +/* static expert_field ei_unknown_parameter = EI_INIT; */ static expert_field ei_format_info = EI_INIT; static expert_field ei_clock_reference_type = EI_INIT; @@ -481,7 +481,9 @@ void proto_register_1722a (void) static ei_register_info ei[] = { { &ei_sample_width, { "1722a.expert.sample_width_zero", PI_PROTOCOL, PI_WARN, "Wrong value for Sample Width", EXPFILL }}, { &ei_channels_per_frame, { "1722a.expert.channels_per_frame_zero", PI_PROTOCOL, PI_WARN, "Wrong value for parameter Channels per Frame", EXPFILL }}, +#if 0 { &ei_unknown_parameter, { "1722a.expert.unknown_parameter", PI_PROTOCOL, PI_WARN, "Unknown parameter", EXPFILL }}, +#endif { &ei_format_info, { "1722a.expert.format_info", PI_PROTOCOL, PI_WARN, "Format Info Value Reserved", EXPFILL }}, { &ei_clock_reference_type, { "1722a.expert.clock_reference_format_type", PI_PROTOCOL, PI_WARN, "The CRF type is not supported", EXPFILL }} }; diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 357f63a195..562bae2b76 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -345,14 +345,14 @@ static gint ett_ieee802154_zigbee = -1; static gint ett_ieee802154_zboss = -1; static expert_field ei_ieee802154_invalid_addressing = EI_INIT; -static expert_field ei_ieee802154_invalid_panid_compression = EI_INIT; +/* static expert_field ei_ieee802154_invalid_panid_compression = EI_INIT; */ static expert_field ei_ieee802154_invalid_panid_compression2 = EI_INIT; static expert_field ei_ieee802154_fcs = EI_INIT; static expert_field ei_ieee802154_decrypt_error = EI_INIT; static expert_field ei_ieee802154_dst = EI_INIT; static expert_field ei_ieee802154_src = EI_INIT; static expert_field ei_ieee802154_frame_ver = EI_INIT; -static expert_field ei_ieee802154_frame_type = EI_INIT; +/* static expert_field ei_ieee802154_frame_type = EI_INIT; */ static expert_field ei_ieee802154_seqno_suppression = EI_INIT; static int ieee802_15_4_short_address_type = -1; @@ -3476,8 +3476,10 @@ void proto_register_ieee802154(void) static ei_register_info ei[] = { { &ei_ieee802154_invalid_addressing, { "wpan.invalid_addressing", PI_MALFORMED, PI_WARN, "Invalid Addressing", EXPFILL }}, +#if 0 { &ei_ieee802154_invalid_panid_compression, { "wpan.invalid_panid_compression", PI_MALFORMED, PI_ERROR, "Invalid Setting for PAN ID Compression", EXPFILL }}, +#endif { &ei_ieee802154_invalid_panid_compression2, { "wpan.seqno_supression_fv2_invalid", PI_MALFORMED, PI_WARN, "Invalid Pan ID Compression and addressing combination for Frame Version 2", EXPFILL }}, { &ei_ieee802154_dst, { "wpan.dst_invalid", PI_MALFORMED, PI_ERROR, @@ -3486,8 +3488,10 @@ void proto_register_ieee802154(void) "Invalid Source Address Mode", EXPFILL }}, { &ei_ieee802154_frame_ver, { "wpan.frame_version_unknown", PI_MALFORMED, PI_ERROR, "Frame Version Unknown Cannot Dissect", EXPFILL }}, +#if 0 { &ei_ieee802154_frame_type, { "wpan.frame_type_unknown", PI_MALFORMED, PI_ERROR, "Frame Type Unknown Cannot Dissect", EXPFILL }}, +#endif { &ei_ieee802154_decrypt_error, { "wpan.decrypt_error", PI_UNDECODED, PI_WARN, "Decryption error", EXPFILL }}, { &ei_ieee802154_fcs, { "wpan.fcs.bad", PI_CHECKSUM, PI_WARN, diff --git a/epan/dissectors/packet-ipos.c b/epan/dissectors/packet-ipos.c index 9047bcc158..fd13416cff 100644 --- a/epan/dissectors/packet-ipos.c +++ b/epan/dissectors/packet-ipos.c @@ -52,7 +52,7 @@ static int hf_ipos_ppe = -1; static int hf_ipos_slot = -1; static gint ett_ipos = -1; -static expert_field ei_ipos_protocol = EI_INIT; +/* static expert_field ei_ipos_protocol = EI_INIT; */ #define LINUX_SLL_P_IPOS_NETIPC 0x0030 /* IPOS IPC frames to/from AF_IPC module */ #define LINUX_SLL_P_IPOS_RBN 0x0031 /* IPOS IP frames to/from CTX module */ @@ -140,6 +140,7 @@ proto_register_ipos(void) &ett_ipos }; +#if 0 static ei_register_info ei[] = { { &ei_ipos_protocol, { "ipos.protocol.unknown", PI_PROTOCOL, PI_WARN, @@ -147,12 +148,15 @@ proto_register_ipos(void) }; expert_module_t* expert_ipos; +#endif proto_ipos = proto_register_protocol("IPOS Kernel Packet Protocol", "IPOS", "ipos"); proto_register_field_array(proto_ipos, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); +#if 0 expert_ipos = expert_register_protocol(proto_ipos); expert_register_field_array(expert_ipos, ei, array_length(ei)); +#endif register_dissector("ipos", dissect_ipos, proto_ipos); } diff --git a/epan/dissectors/packet-isdn-sup.c b/epan/dissectors/packet-isdn-sup.c index 8f735bbf07..11ffa328df 100644 --- a/epan/dissectors/packet-isdn-sup.c +++ b/epan/dissectors/packet-isdn-sup.c @@ -422,7 +422,7 @@ static gint ett_isdn_sup_MLPPLFBResp = -1; /*--- End of included file: packet-isdn-sup-ett.c ---*/ #line 92 "./asn1/isdn-sup/packet-isdn-sup-template.c" -static expert_field ei_isdn_sup_unsupported_arg_type = EI_INIT; +/* static expert_field ei_isdn_sup_unsupported_arg_type = EI_INIT; */ static expert_field ei_isdn_sup_unsupported_result_type = EI_INIT; static expert_field ei_isdn_sup_unsupported_error_type = EI_INIT; @@ -3806,7 +3806,9 @@ void proto_register_isdn_sup(void) { }; static ei_register_info ei[] = { +#if 0 { &ei_isdn_sup_unsupported_arg_type, { "isdn_sup.unsupported.arg_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED ARGUMENT TYPE (ETSI sup)", EXPFILL }}, +#endif { &ei_isdn_sup_unsupported_result_type, { "isdn_sup.unsupported.result_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED RESULT TYPE (ETSI sup)", EXPFILL }}, { &ei_isdn_sup_unsupported_error_type, { "isdn_sup.unsupported.error_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED ERROR TYPE (ETSI sup)", EXPFILL }}, }; diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index e76fe2e7e7..c208abcea4 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -6015,7 +6015,7 @@ static expert_field ei_lbmc_analysis_zero_length = EI_INIT; static expert_field ei_lbmc_analysis_tsni = EI_INIT; static expert_field ei_lbmc_analysis_invalid_value = EI_INIT; static expert_field ei_lbmc_analysis_no_reassembly = EI_INIT; -static expert_field ei_lbmc_analysis_invalid_offset = EI_INIT; +/* static expert_field ei_lbmc_analysis_invalid_offset = EI_INIT; */ static expert_field ei_lbmc_analysis_missing_reassembly_frame = EI_INIT; static expert_field ei_lbmc_analysis_invalid_fragment = EI_INIT; static expert_field ei_lbmc_extopt_fragment_offset = EI_INIT; @@ -14177,7 +14177,9 @@ void proto_register_lbmc(void) { &ei_lbmc_analysis_tsni, { "lbmc.analysis.tsni", PI_SEQUENCE, PI_NOTE, "TSNI Sqn", EXPFILL } }, { &ei_lbmc_analysis_invalid_value, { "lbmc.analysis.invalid_value", PI_MALFORMED, PI_ERROR, "Invalid value", EXPFILL } }, { &ei_lbmc_analysis_no_reassembly, { "lbmc.analysis.no_reassembly", PI_PROTOCOL, PI_ERROR, "Reassembly not in progress but fragment_offset not zero", EXPFILL } }, +#if 0 { &ei_lbmc_analysis_invalid_offset, { "lbmc.analysis.invalid_offset", PI_MALFORMED, PI_ERROR, "Message property offset exceeds data length", EXPFILL } }, +#endif { &ei_lbmc_analysis_missing_reassembly_frame, { "lbmc.analysis.missing_reassembly_frame", PI_UNDECODED, PI_WARN, "Message not reassembled - reassembly data missing from capture", EXPFILL } }, { &ei_lbmc_analysis_invalid_fragment, { "lbmc.analysis.invalid_fragment", PI_MALFORMED, PI_ERROR, "Invalid fragment", EXPFILL } }, { &ei_lbmc_extopt_fragment_offset, { "lbmc.extopt.fragment_offset.invalid", PI_PROTOCOL, PI_ERROR, "Invalid fragment offset", EXPFILL } }, diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 0f75301d25..dbaad8a1d5 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -4250,11 +4250,11 @@ proto_register_ldp(void) }; static ei_register_info ei[] = { - { &ei_ldp_dtsm_and_target, { "ldp.dtsm_and_target", PI_PROTOCOL, PI_WARN,"ERROR - Both GTSM and Target Flag are enabled.", EXPFILL }}, - { &ei_ldp_gtsm_supported, { "ldp.gtsm_supported", PI_PROTOCOL, PI_CHAT,"GTSM is supported by the source", EXPFILL }}, - { &ei_ldp_gtsm_not_supported_basic_discovery, { "ldp.gtsm_not_supported_basic_discovery", PI_PROTOCOL, PI_WARN,"GTSM is not supported by the source, since basic discovery is not enabled", EXPFILL }}, - { &ei_ldp_gtsm_not_supported, { "ldp.gtsm_not_supported", PI_PROTOCOL, PI_CHAT,"GTSM is not supported by the source", EXPFILL }}, - { &ei_ldp_inv_length, { "ldp.invalid_length", PI_MALFORMED, PI_ERROR,"Length of the packet is malformed", EXPFILL }}, + { &ei_ldp_dtsm_and_target, { "ldp.dtsm_and_target", PI_PROTOCOL, PI_WARN, "ERROR - Both GTSM and Target Flag are enabled.", EXPFILL }}, + { &ei_ldp_gtsm_supported, { "ldp.gtsm_supported", PI_PROTOCOL, PI_CHAT, "GTSM is supported by the source", EXPFILL }}, + { &ei_ldp_gtsm_not_supported_basic_discovery, { "ldp.gtsm_not_supported_basic_discovery", PI_PROTOCOL, PI_WARN, "GTSM is not supported by the source, since basic discovery is not enabled", EXPFILL }}, + { &ei_ldp_gtsm_not_supported, { "ldp.gtsm_not_supported", PI_PROTOCOL, PI_CHAT, "GTSM is not supported by the source", EXPFILL }}, + { &ei_ldp_inv_length, { "ldp.invalid_length", PI_MALFORMED, PI_ERROR, "Length of the packet is malformed", EXPFILL }}, { &ei_ldp_address_family_not_implemented, { "ldp.address_family_not_implemented", PI_UNDECODED, PI_WARN, "Support for Address Family not implemented", EXPFILL }}, { &ei_ldp_tlv_fec, { "ldp.msg.tlv.fec.error", PI_PROTOCOL, PI_ERROR, "Error in FEC Element %u", EXPFILL }}, { &ei_ldp_tlv_fec_len, { "ldp.msg.tlv.fec.len.invalid", PI_PROTOCOL, PI_ERROR, "Invalid prefix %u length for family %s", EXPFILL }}, diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c index d77776a9ec..41c9bd62df 100644 --- a/epan/dissectors/packet-openflow_v1.c +++ b/epan/dissectors/packet-openflow_v1.c @@ -156,7 +156,7 @@ static gint ett_openflow_port_cnf = -1; static gint ett_openflow_port_state = -1; static gint ett_openflow_port_cf = -1; -static expert_field ei_openflow_undecoded_data = EI_INIT; +/* static expert_field ei_openflow_undecoded_data = EI_INIT; */ static expert_field ei_openflow_action_type = EI_INIT; static expert_field ei_openflow_1_0_type = EI_INIT; @@ -1440,7 +1440,9 @@ proto_register_openflow_v1(void) }; static ei_register_info ei[] = { +#if 0 { &ei_openflow_undecoded_data, { "openflow.undecoded_data", PI_UNDECODED, PI_WARN, "Data not dissected yet", EXPFILL }}, +#endif { &ei_openflow_action_type, { "openflow.action_typ.undecoded", PI_UNDECODED, PI_WARN, "Action not dissected yet", EXPFILL }}, { &ei_openflow_1_0_type, { "openflow_1_0.type.undecoded", PI_UNDECODED, PI_WARN, "Message data not dissected yet", EXPFILL }}, }; diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 33b2e884e1..14165b1092 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -2040,7 +2040,7 @@ static gint ett_qsig_mid_SEQUENCE_OF_Extension = -1; #line 310 "./asn1/qsig/packet-qsig-template.c" static gint ett_cnq_PSS1InformationElement = -1; -static expert_field ei_qsig_unsupported_arg_type = EI_INIT; +/* static expert_field ei_qsig_unsupported_arg_type = EI_INIT; */ static expert_field ei_qsig_unsupported_result_type = EI_INIT; static expert_field ei_qsig_unsupported_error_type = EI_INIT; @@ -16363,7 +16363,9 @@ void proto_register_qsig(void) { }; static ei_register_info ei[] = { +#if 0 { &ei_qsig_unsupported_arg_type, { "qsig.unsupported.arg_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED ARGUMENT TYPE (QSIG)", EXPFILL }}, +#endif { &ei_qsig_unsupported_result_type, { "qsig.unsupported.result_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED RESULT TYPE (QSIG)", EXPFILL }}, { &ei_qsig_unsupported_error_type, { "qsig.unsupported.error_type", PI_UNDECODED, PI_WARN, "UNSUPPORTED ERROR TYPE (QSIG)", EXPFILL }}, }; diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 717881de06..73399e12d1 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -381,14 +381,14 @@ static expert_field ei_tcp_checksum_bad = EI_INIT; static expert_field ei_tcp_urgent_pointer_non_zero = EI_INIT; static expert_field ei_tcp_suboption_malformed = EI_INIT; -static expert_field ei_mptcp_analysis_unexpected_idsn = EI_INIT; +/* static expert_field ei_mptcp_analysis_unexpected_idsn = EI_INIT; */ static expert_field ei_mptcp_analysis_echoed_key_mismatch = EI_INIT; static expert_field ei_mptcp_analysis_missing_algorithm = EI_INIT; static expert_field ei_mptcp_analysis_unsupported_algorithm = EI_INIT; static expert_field ei_mptcp_infinite_mapping= EI_INIT; static expert_field ei_mptcp_mapping_missing = EI_INIT; -static expert_field ei_mptcp_stream_incomplete = EI_INIT; -static expert_field ei_mptcp_analysis_dsn_out_of_order = EI_INIT; +/* static expert_field ei_mptcp_stream_incomplete = EI_INIT; */ +/* static expert_field ei_mptcp_analysis_dsn_out_of_order = EI_INIT; */ /* Some protocols such as encrypted DCE/RPCoverHTTP have dependencies * from one PDU to the next PDU and require that they are called in sequence. @@ -6962,14 +6962,18 @@ proto_register_tcp(void) }; static ei_register_info mptcp_ei[] = { +#if 0 { &ei_mptcp_analysis_unexpected_idsn, { "mptcp.connection.unexpected_idsn", PI_PROTOCOL, PI_NOTE, "Unexpected initial sequence number", EXPFILL }}, +#endif { &ei_mptcp_analysis_echoed_key_mismatch, { "mptcp.connection.echoed_key_mismatch", PI_PROTOCOL, PI_WARN, "The echoed key in the ACK of the MPTCP handshake does not match the key of the SYN/ACK", EXPFILL }}, { &ei_mptcp_analysis_missing_algorithm, { "mptcp.connection.missing_algorithm", PI_PROTOCOL, PI_WARN, "No crypto algorithm specified", EXPFILL }}, { &ei_mptcp_analysis_unsupported_algorithm, { "mptcp.connection.unsupported_algorithm", PI_PROTOCOL, PI_WARN, "Unsupported algorithm", EXPFILL }}, { &ei_mptcp_infinite_mapping, { "mptcp.dss.infinite_mapping", PI_PROTOCOL, PI_WARN, "Fallback to infinite mapping", EXPFILL }}, { &ei_mptcp_mapping_missing, { "mptcp.dss.missing_mapping", PI_PROTOCOL, PI_WARN, "No mapping available", EXPFILL }}, +#if 0 { &ei_mptcp_stream_incomplete, { "mptcp.incomplete", PI_PROTOCOL, PI_WARN, "Everything was not captured", EXPFILL }}, { &ei_mptcp_analysis_dsn_out_of_order, { "mptcp.analysis.dsn.out_of_order", PI_PROTOCOL, PI_WARN, "Out of order dsn", EXPFILL }}, +#endif }; static hf_register_info mptcp_hf[] = { diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 55ac36a8b3..e99fb2d45f 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -822,12 +822,12 @@ static gint ett_tds_prelogin_option = -1; static gint ett_tds7_featureextack = -1; static gint ett_tds7_featureextack_feature = -1; -static expert_field ei_tds_type_info_type_undecoded = EI_INIT; +/* static expert_field ei_tds_type_info_type_undecoded = EI_INIT; */ static expert_field ei_tds_invalid_length = EI_INIT; static expert_field ei_tds_token_length_invalid = EI_INIT; static expert_field ei_tds_type_info_type = EI_INIT; static expert_field ei_tds_all_headers_header_type = EI_INIT; -static expert_field ei_tds_token_stats = EI_INIT; +/* static expert_field ei_tds_token_stats = EI_INIT; */ static expert_field ei_tds_invalid_plp_type = EI_INIT; /* Desegmentation of Netlib buffers crossing TCP segment boundaries. */ @@ -5575,10 +5575,14 @@ proto_register_tds(void) static ei_register_info ei[] = { { &ei_tds_all_headers_header_type, { "tds.all_headers.header.type.invalid", PI_PROTOCOL, PI_WARN, "Invalid header type", EXPFILL }}, { &ei_tds_type_info_type, { "tds.type_info.type.invalid", PI_PROTOCOL, PI_WARN, "Invalid data type", EXPFILL }}, +#if 0 { &ei_tds_type_info_type_undecoded, { "tds.type_info.type.undecoded", PI_UNDECODED, PI_ERROR, "Data type not supported yet", EXPFILL }}, +#endif { &ei_tds_invalid_length, { "tds.invalid_length", PI_MALFORMED, PI_ERROR, "Invalid length", EXPFILL }}, { &ei_tds_token_length_invalid, { "tds.token.length.invalid", PI_PROTOCOL, PI_WARN, "Bogus token size", EXPFILL }}, +#if 0 { &ei_tds_token_stats, { "tds.token.stats", PI_PROTOCOL, PI_NOTE, "Token stats", EXPFILL }}, +#endif { &ei_tds_invalid_plp_type, { "tds.type_info.type.invalidplp", PI_PROTOCOL, PI_NOTE, "Invalid PLP type", EXPFILL }} }; diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 6a145c539c..9c9eb00e29 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -277,7 +277,7 @@ static expert_field ei_wccp_address_table_family_unknown = EI_INIT; static expert_field ei_wccp_capability_element_length = EI_INIT; static expert_field ei_wccp_port_fields_not_used = EI_INIT; static expert_field ei_wccp_a_zero_not_c = EI_INIT; -static expert_field ei_wccp_c_zero_not_a = EI_INIT; +/* static expert_field ei_wccp_c_zero_not_a = EI_INIT; */ /* * At @@ -3548,7 +3548,9 @@ proto_register_wccp(void) { &ei_wccp_capability_element_length, { "wccp.capability_element.length.invalid", PI_PROTOCOL, PI_WARN, "Value Length invalid", EXPFILL }}, { &ei_wccp_port_fields_not_used, { "wccp.port_fields_not_used", PI_PROTOCOL, PI_NOTE, "Ports fields not used", EXPFILL }}, { &ei_wccp_a_zero_not_c, { "wccp.a_zero_not_c", PI_PROTOCOL, PI_WARN, "Error A is 0, but C is not", EXPFILL }}, +#if 0 { &ei_wccp_c_zero_not_a, { "wccp.c_zero_not_a", PI_PROTOCOL, PI_WARN, "Error C is 0, but A is not", EXPFILL }}, +#endif }; expert_module_t* expert_wccp; diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 1460e6a4d8..f7ac337c28 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -175,7 +175,7 @@ static gint ett_wcp_field = -1; static expert_field ei_wcp_compressed_data_exceeds = EI_INIT; static expert_field ei_wcp_uncompressed_data_exceeds = EI_INIT; static expert_field ei_wcp_invalid_window_offset = EI_INIT; -static expert_field ei_wcp_invalid_match_length = EI_INIT; +/* static expert_field ei_wcp_invalid_match_length = EI_INIT; */ static dissector_handle_t fr_uncompressed_handle; @@ -770,7 +770,9 @@ proto_register_wcp(void) { &ei_wcp_compressed_data_exceeds, { "wcp.compressed_data.exceeds", PI_MALFORMED, PI_ERROR, "Compressed data exceeds maximum buffer length", EXPFILL }}, { &ei_wcp_uncompressed_data_exceeds, { "wcp.uncompressed_data.exceeds", PI_MALFORMED, PI_ERROR, "Uncompressed data exceeds maximum buffer length", EXPFILL }}, { &ei_wcp_invalid_window_offset, { "wcp.off.invalid", PI_MALFORMED, PI_ERROR, "Offset points outside of visible window", EXPFILL }}, +#if 0 { &ei_wcp_invalid_match_length, { "wcp.len.invalid", PI_MALFORMED, PI_ERROR, "Length greater than offset", EXPFILL }}, +#endif }; expert_module_t* expert_wcp; |