aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-dcerpc.c20
-rw-r--r--epan/dissectors/packet-ieee80211.c4
-rw-r--r--epan/dissectors/packet-netflow.c20
-rw-r--r--epan/dissectors/packet-riemann.c24
-rw-r--r--epan/dissectors/packet-sysex.c2
5 files changed, 35 insertions, 35 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 7a516fa670..89d30ec321 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -615,7 +615,6 @@ static int hf_dcerpc_payload_stub_data = -1;
static int hf_dcerpc_stub_data_with_sec_vt = -1;
static int hf_dcerpc_stub_data = -1;
static int hf_dcerpc_auth_padding = -1;
-static int hf_dcerpc_auth_verifier = -1;
static int hf_dcerpc_auth_info = -1;
static int hf_dcerpc_auth_credentials = -1;
static int hf_dcerpc_fault_stub_data = -1;
@@ -673,7 +672,7 @@ static expert_field ei_dcerpc_cn_status = EI_INIT;
static expert_field ei_dcerpc_fragment_reassembled = EI_INIT;
static expert_field ei_dcerpc_fragment = EI_INIT;
static expert_field ei_dcerpc_no_request_found = EI_INIT;
-static expert_field ei_dcerpc_context_change = EI_INIT;
+/* static expert_field ei_dcerpc_context_change = EI_INIT */;
static expert_field ei_dcerpc_cn_ctx_id_no_bind = EI_INIT;
static expert_field ei_dcerpc_bind_not_acknowledged = EI_INIT;
static expert_field ei_dcerpc_verifier_unavailable = EI_INIT;
@@ -6954,7 +6953,6 @@ proto_register_dcerpc(void)
{ &hf_dcerpc_stub_data, { "Stub data", "dcerpc.stub_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_dcerpc_auth_padding, { "Auth Padding", "dcerpc.auth_padding", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_dcerpc_auth_info, { "Auth Info", "dcerpc.auth_info", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
- { &hf_dcerpc_auth_verifier, { "Auth Verifier", "dcerpc.auth_verifier", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_dcerpc_auth_credentials, { "Auth Credentials", "dcerpc.auth_credentials", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_dcerpc_fault_stub_data, { "Fault stub data", "dcerpc.fault_stub_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_dcerpc_fragment_data, { "Fragment data", "dcerpc.fragment_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
@@ -6991,16 +6989,18 @@ proto_register_dcerpc(void)
};
static ei_register_info ei[] = {
- { &ei_dcerpc_fragment, { "dcerpc.fragment.reassemble", PI_REASSEMBLE, PI_CHAT, "%s fragment", EXPFILL }},
- { &ei_dcerpc_fragment_reassembled, { "dcerpc.fragment_reassembled", PI_REASSEMBLE, PI_CHAT, "%s fragment, reassembled", EXPFILL }},
- { &ei_dcerpc_cn_ctx_id_no_bind, { "dcerpc.cn_ctx_id.no_bind", PI_UNDECODED, PI_NOTE, "No bind info for interface Context ID %u - capture start too late?", EXPFILL }},
+ { &ei_dcerpc_fragment, { "dcerpc.fragment.reassemble", PI_REASSEMBLE, PI_CHAT, "Fragment", EXPFILL }},
+ { &ei_dcerpc_fragment_reassembled, { "dcerpc.fragment_reassembled", PI_REASSEMBLE, PI_CHAT, "Fragment, reassembled", EXPFILL }},
+ { &ei_dcerpc_cn_ctx_id_no_bind, { "dcerpc.cn_ctx_id.no_bind", PI_UNDECODED, PI_NOTE, "No bind info for interface Context ID", EXPFILL }},
{ &ei_dcerpc_no_request_found, { "dcerpc.no_request_found", PI_SEQUENCE, PI_NOTE, "No request to this DCE/RPC call found", EXPFILL }},
- { &ei_dcerpc_cn_status, { "dcerpc.cn_status.expert", PI_RESPONSE_CODE, PI_NOTE, "Fault: %s", EXPFILL }},
+ { &ei_dcerpc_cn_status, { "dcerpc.cn_status.expert", PI_RESPONSE_CODE, PI_NOTE, "Fault", EXPFILL }},
{ &ei_dcerpc_fragment_multiple, { "dcerpc.fragment_multiple", PI_SEQUENCE, PI_CHAT, "Multiple DCE/RPC fragments/PDU's in one packet", EXPFILL }},
- { &ei_dcerpc_context_change, { "dcerpc.context_change", PI_SEQUENCE, PI_CHAT, "Context change: %s", EXPFILL }},
+#if 0 /* XXX - too much "output noise", removed for now */
+ { &ei_dcerpc_context_change, { "dcerpc.context_change", PI_SEQUENCE, PI_CHAT, "Context change", EXPFILL }},
+#endif
{ &ei_dcerpc_bind_not_acknowledged, { "dcerpc.bind_not_acknowledged", PI_SEQUENCE, PI_WARN, "Bind not acknowledged", EXPFILL }},
- { &ei_dcerpc_verifier_unavailable, { "dcerpc.verifier_unavailable", PI_UNDECODED, PI_WARN, NULL, EXPFILL }},
- { &ei_dcerpc_invalid_pdu_authentication_attempt, { "dcerpc.invalid_pdu_authentication_attempt", PI_UNDECODED, PI_WARN, NULL, EXPFILL }},
+ { &ei_dcerpc_verifier_unavailable, { "dcerpc.verifier_unavailable", PI_UNDECODED, PI_WARN, "Verifier unavailable", EXPFILL }},
+ { &ei_dcerpc_invalid_pdu_authentication_attempt, { "dcerpc.invalid_pdu_authentication_attempt", PI_UNDECODED, PI_WARN, "Invalid authentication attempt", EXPFILL }},
/* Generated from convert_proto_tree_add_text.pl */
{ &ei_dcerpc_long_frame, { "dcerpc.long_frame", PI_PROTOCOL, PI_WARN, "Long frame", EXPFILL }},
{ &ei_dcerpc_cn_rts_command, { "dcerpc.cn_rts_command.unknown", PI_PROTOCOL, PI_WARN, "unknown RTS command number", EXPFILL }},
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 1eba3062d7..6fe9138042 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -28062,11 +28062,11 @@ proto_register_ieee80211(void)
{ &ei_ieee80211_fcs,
{ "wlan.fcs.bad_checksum", PI_MALFORMED, PI_ERROR,
- NULL, EXPFILL }},
+ "Bad checksum", EXPFILL }},
{ &ei_ieee80211_mismatched_akm_suite,
{ "wlan.rsn.akms.mismatched", PI_PROTOCOL, PI_ERROR,
- NULL, EXPFILL }},
+ "Mismatched AKMS", EXPFILL }},
};
expert_module_t *expert_ieee80211;
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 9ac96fab06..0ba6011d70 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -16555,7 +16555,7 @@ proto_register_netflow(void)
static ei_register_info ei[] = {
{ &ei_cflow_flowset_length,
{ "cflow.flowset_length.invalid", PI_MALFORMED, PI_WARN,
- NULL, EXPFILL }},
+ "Flow length invalid", EXPFILL }},
{ &ei_cflow_no_flow_information,
{ "cflow.no_flow_information", PI_MALFORMED, PI_WARN,
"No flow information", EXPFILL }},
@@ -16564,31 +16564,31 @@ proto_register_netflow(void)
"No scope fields", EXPFILL }},
{ &ei_cflow_template_ipfix_scope_field_count_too_many,
{ "cflow.template_ipfix_scope_field_count.too_many", PI_MALFORMED, PI_WARN,
- NULL, EXPFILL }},
+ "More IPFIX scopes than can be handled", EXPFILL }},
{ &ei_cflow_options,
{ "cflow.options.too_many", PI_UNDECODED, PI_WARN,
- NULL, EXPFILL }},
+ "More options than can be handled", EXPFILL }},
{ &ei_cflow_scopes,
{ "cflow.scopes.too_many", PI_UNDECODED, PI_WARN,
- NULL, EXPFILL }},
+ "More scopes than can be handled", EXPFILL }},
{ &ei_cflow_entries,
{ "cflow.entries.too_many", PI_UNDECODED, PI_WARN,
- NULL, EXPFILL }},
+ "More entries than can be handled", EXPFILL }},
{ &ei_cflow_mpls_label_bad_length,
{ "cflow.mpls_label.bad_length", PI_UNDECODED, PI_WARN,
- NULL, EXPFILL }},
+ "MPLS-Label bad length", EXPFILL }},
{ &ei_cflow_flowsets_impossible,
{ "cflow.flowsets.impossible", PI_MALFORMED, PI_WARN,
- NULL, EXPFILL }},
+ "FlowSets impossible", EXPFILL }},
{ &ei_cflow_no_template_found,
{ "cflow.no_template_found", PI_MALFORMED, PI_WARN,
- NULL, EXPFILL }},
+ "No template found", EXPFILL }},
{ &ei_transport_bytes_out_of_order,
{ "cflow.transport_bytes.out-of-order", PI_MALFORMED, PI_WARN,
- NULL, EXPFILL}},
+ "Transport Bytes Out of Order", EXPFILL}},
{ &ei_unexpected_sequence_number,
{ "cflow.unexpected_sequence_number", PI_SEQUENCE, PI_WARN,
- NULL, EXPFILL}},
+ "Unexpected flow sequence for domain ID", EXPFILL}},
};
module_t *netflow_module;
diff --git a/epan/dissectors/packet-riemann.c b/epan/dissectors/packet-riemann.c
index 261c718ee4..899e61a65d 100644
--- a/epan/dissectors/packet-riemann.c
+++ b/epan/dissectors/packet-riemann.c
@@ -158,9 +158,9 @@ static gint ett_state = -1;
#define RIEMANN_WIRE_BYTES 2
#define RIEMANN_WIRE_FLOAT 5
-static expert_field ef_error_unknown_wire_tag = EI_INIT;
-static expert_field ef_error_unknown_field_number = EI_INIT;
-static expert_field ef_error_insufficient_data = EI_INIT;
+static expert_field ei_error_unknown_wire_tag = EI_INIT;
+static expert_field ei_error_unknown_field_number = EI_INIT;
+static expert_field ei_error_insufficient_data = EI_INIT;
static void
riemann_verify_wire_format(guint64 field_number, const char *field_name, int expected, int actual,
@@ -186,7 +186,7 @@ riemann_verify_wire_format(guint64 field_number, const char *field_name, int exp
wire_name = "unknown (check packet-riemann.c)";
break;
}
- expert_add_info_format(pinfo, pi, &ef_error_unknown_wire_tag,
+ expert_add_info_format(pinfo, pi, &ei_error_unknown_wire_tag,
"Expected %s (%d) field to be an %s (%d), but it is %d",
field_name, (int)field_number, wire_name, expected, actual);
}
@@ -196,13 +196,13 @@ riemann_verify_wire_format(guint64 field_number, const char *field_name, int exp
riemann_verify_wire_format(fn, field_name, expected, wire, pinfo, pi)
#define UNKNOWN_FIELD_NUMBER_FOR(message_name) \
- expert_add_info_format(pinfo, pi, &ef_error_unknown_field_number, \
+ expert_add_info_format(pinfo, pi, &ei_error_unknown_field_number, \
"Unknown field number %d for " message_name " (wire format %d)", \
(int)fn, (int)wire);
#define VERIFY_SIZE_FOR(message_name) \
if (size < 0) { \
- expert_add_info_format(pinfo, pi, &ef_error_insufficient_data, \
+ expert_add_info_format(pinfo, pi, &ei_error_insufficient_data, \
"Insufficient data for " message_name " (%d bytes needed)", \
(int)size * -1); \
}
@@ -783,15 +783,15 @@ proto_register_riemann(void)
};
static ei_register_info ei[] = {
- { &ef_error_unknown_wire_tag,
+ { &ei_error_unknown_wire_tag,
{ "riemann.unknown_wire_tag", PI_MALFORMED, PI_ERROR,
- NULL, EXPFILL }},
- { &ef_error_unknown_field_number,
+ "Invalid format type", EXPFILL }},
+ { &ei_error_unknown_field_number,
{ "riemann.unknown_field_number", PI_MALFORMED, PI_ERROR,
- NULL, EXPFILL }},
- { &ef_error_insufficient_data,
+ "Unknown field number", EXPFILL }},
+ { &ei_error_insufficient_data,
{ "riemann.insufficient_data", PI_MALFORMED, PI_ERROR,
- NULL, EXPFILL }}
+ "Insufficient data", EXPFILL }}
};
static gint *ett[] = {
diff --git a/epan/dissectors/packet-sysex.c b/epan/dissectors/packet-sysex.c
index 80d5c60704..1d74c6e773 100644
--- a/epan/dissectors/packet-sysex.c
+++ b/epan/dissectors/packet-sysex.c
@@ -1394,7 +1394,7 @@ proto_register_sysex(void)
static ei_register_info ei[] = {
{ &ei_sysex_message_start_byte, { "sysex.message_start_byte", PI_PROTOCOL, PI_WARN, "SYSEX Error: Wrong start byte", EXPFILL }},
- { &ei_digitech_checksum_bad, { "sysex.digitech.checksum_bad", PI_CHECKSUM, PI_WARN, "ARP packet storm detected", EXPFILL }},
+ { &ei_digitech_checksum_bad, { "sysex.digitech.checksum_bad", PI_CHECKSUM, PI_WARN, "Bad checksum", EXPFILL }},
{ &ei_sysex_message_end_byte, { "sysex.message_end_byte", PI_PROTOCOL, PI_WARN, "SYSEX Error: Wrong end byte", EXPFILL }},
{ &ei_sysex_undecoded, { "sysex.undecoded", PI_UNDECODED, PI_WARN, "Not dissected yet (report to wireshark.org)", EXPFILL }},
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 13:48:23 +0000