diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-08-30 15:51:54 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-08-31 00:08:01 +0000 |
commit | a4c8ebc18b71200d7a6245e386e97a9d14c5dbdb (patch) | |
tree | 4918b2d727a5d308dfbecfa41f9c559c73ca725b /epan/dissectors/packet-cip.c | |
parent | 1dbd2216edfe34e3dbb1f8967d325e7fa00ecb51 (diff) |
Don't do any Decode As stuff for dissector tables not used with Decode As.
Have all dissector tables have a "supports Decode As" flag, which
defaults to FALSE, and which is set to TRUE if a register_decode_as()
refers to it.
When adding a dissector to a dissector table with a given key, only add
it for Decode As if the dissector table supports it.
For non-FT_STRING dissector tables, always check for multiple entries
for the same protocol with different dissectors, and report an error if
we found them.
This means there's no need for the creator of a dissector table to
specify whether duplicates of that sort should be allowed - we always do
the check when registering something for "Decode As" (in a non-FT_STRING
dissector table), and just don't bother registering anything for "Decode
As" if the dissector table doesn't support "Decode As", so there's no
check done for those dissector tables.
Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed
Reviewed-on: https://code.wireshark.org/review/17402
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-cip.c')
-rw-r--r-- | epan/dissectors/packet-cip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 31be7fd1e1..31e0ed60ae 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -7989,9 +7989,9 @@ proto_register_cip(void) &cip_enhanced_info_column); subdissector_class_table = register_dissector_table("cip.class.iface", - "CIP Class Interface Handle", proto_cip, FT_UINT32, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); + "CIP Class Interface Handle", proto_cip, FT_UINT32, BASE_HEX); subdissector_symbol_table = register_dissector_table("cip.data_segment.iface", - "CIP Data Segment Interface Handle", proto_cip, FT_UINT32, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); + "CIP Data Segment Interface Handle", proto_cip, FT_UINT32, BASE_HEX); /* Register the protocol name and description */ proto_cip_class_generic = proto_register_protocol("CIP Class Generic", |