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-c15ch.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-c15ch.c')
| -rw-r--r-- | epan/dissectors/packet-c15ch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-c15ch.c b/epan/dissectors/packet-c15ch.c index f7f0b36201..9a746ecb8c 100644 --- a/epan/dissectors/packet-c15ch.c +++ b/epan/dissectors/packet-c15ch.c @@ -11982,7 +11982,7 @@ void proto_register_c15ch(void) ); proto_register_field_array(proto_c15ch_second_level, hf_second_level, array_length(hf_second_level)); proto_register_subtree_array(ett_second_level, array_length(ett_second_level)); - c15ch_dissector_table = register_dissector_table("c15", "C15", FT_UINT32, BASE_DEC); + c15ch_dissector_table = register_dissector_table("c15", "C15", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE); /* third level */ /* tone */ @@ -11993,7 +11993,7 @@ void proto_register_c15ch(void) ); proto_register_field_array(proto_c15ch_third_level_tone, hf_third_level_tone, array_length(hf_third_level_tone)); proto_register_subtree_array(ett_third_level_tone, array_length(ett_third_level_tone)); - c15ch_tone_dissector_table = register_dissector_table("c15.tone", "C15.TONE", FT_UINT32, BASE_DEC); + c15ch_tone_dissector_table = register_dissector_table("c15.tone", "C15.TONE", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE); /* inc gwe */ proto_c15ch_third_level_inc_gwe = proto_register_protocol( @@ -12003,7 +12003,7 @@ void proto_register_c15ch(void) ); proto_register_field_array(proto_c15ch_third_level_inc_gwe, hf_third_level_inc_gwe, array_length(hf_third_level_inc_gwe)); proto_register_subtree_array(ett_third_level_inc_gwe, array_length(ett_third_level_inc_gwe)); - c15ch_inc_gwe_dissector_table = register_dissector_table("c15.inc_gwe", "C15.INC_GWE", FT_UINT32, BASE_DEC); + c15ch_inc_gwe_dissector_table = register_dissector_table("c15.inc_gwe", "C15.INC_GWE", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE); /* out gwe */ proto_c15ch_third_level_out_gwe = proto_register_protocol( @@ -12013,7 +12013,7 @@ void proto_register_c15ch(void) ); proto_register_field_array(proto_c15ch_third_level_out_gwe, hf_third_level_out_gwe, array_length(hf_third_level_out_gwe)); proto_register_subtree_array(ett_third_level_out_gwe, array_length(ett_third_level_out_gwe)); - c15ch_out_gwe_dissector_table = register_dissector_table("c15.out_gwe", "C15.out_gwe", FT_UINT32, BASE_DEC); + c15ch_out_gwe_dissector_table = register_dissector_table("c15.out_gwe", "C15.out_gwe", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE); } |