diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-04-16 23:45:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-04-17 06:45:44 +0000 |
| commit | 450c0d518bda19479a4770ad0e28a55ee0a08cab (patch) | |
| tree | ed8614b068810541e864fd1e7a4a7cb5ba27ef00 /epan/packet.c | |
| parent | 256a7be13e435920220cae5bdd7a14b0dbe69a11 (diff) | |
| download | wireshark-450c0d518bda19479a4770ad0e28a55ee0a08cab.tar.gz | |
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>
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/packet.c b/epan/packet.c index b26c46a18c..b44c37074d 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -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(); } |