diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-10-29 09:23:55 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-04 12:39:40 +0000 |
| commit | 74541a9596eead6647c592de9aa46797c2dffa84 (patch) | |
| tree | 7962802ba44900541a93a77f2d4923e2d4daebf2 /epan/dissectors/packet-rtp.c | |
| parent | 0ccab3c0b54ce82a5e5036894194ab25c9ea18d4 (diff) | |
Don't allow multiple registrations of a protocol in dissector tables.
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing.
The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not. It's just ENFORCED for Decode As.
Bug: 3949
Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127
Reviewed-on: https://code.wireshark.org/review/11405
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-rtp.c')
| -rw-r--r-- | epan/dissectors/packet-rtp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 2998ec13ff..4e157b07fe 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -3669,15 +3669,15 @@ proto_register_rtp(void) rtp_tap = register_tap("rtp"); rtp_pt_dissector_table = register_dissector_table("rtp.pt", - "RTP payload type", FT_UINT8, BASE_DEC); + "RTP payload type", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE); rtp_dyn_pt_dissector_table = register_dissector_table("rtp_dyn_payload_type", - "Dynamic RTP payload type", FT_STRING, TRUE); + "Dynamic RTP payload type", FT_STRING, TRUE, DISSECTOR_TABLE_ALLOW_DUPLICATE); rtp_hdr_ext_dissector_table = register_dissector_table("rtp.hdr_ext", - "RTP header extension", FT_UINT32, BASE_HEX); + "RTP header extension", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_ALLOW_DUPLICATE); rtp_hdr_ext_rfc5285_dissector_table = register_dissector_table("rtp.ext.rfc5285.id", - "RTP Generic header extension (RFC 5285)", FT_UINT8, BASE_DEC); + "RTP Generic header extension (RFC 5285)", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE); register_dissector("rtp.ext.ed137", dissect_rtp_hdr_ext_ed137, proto_rtp); register_dissector("rtp.ext.ed137a", dissect_rtp_hdr_ext_ed137a, proto_rtp); |