osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Improve the message for duplicate dissectors for a protocol. 

Report the names for the dissectors as well as the protocol and
dissector table name.

Change-Id: I901b396a1310f0d98b68c9499038fe2f38498ee1
Reviewed-on: https://code.wireshark.org/review/14948
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-04-16 23:45:11 -07:00
parent 256a7be13e
commit 450c0d518b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/packet.c
View File

@ -1775,7 +1775,11 @@ dissector_add_for_decode_as(const char *name, dissector_handle_t handle)
dup_handle = (dissector_handle_t)entry->data;
if (dup_handle->protocol == handle->protocol)
{
fprintf(stderr, "Duplicative protocol %s in %s\n", proto_get_protocol_short_name(handle->protocol), name);
fprintf(stderr, "Duplicate dissectors %s and %s for protocol %s in dissector table %s\n",
dissector_handle_get_dissector_name(handle),
dissector_handle_get_dissector_name(dup_handle),
proto_get_protocol_short_name(handle->protocol),
name);
if (getenv("WIRESHARK_ABORT_ON_DISSECTOR_BUG") != NULL)
abort();
}