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 /debian | |
| 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 'debian')
| -rw-r--r-- | debian/libwireshark0.symbols | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index 09ce063a1d..04935f514b 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -437,10 +437,10 @@ libwireshark.so.0 libwireshark0 #MINVER# dissector_hostlist_init@Base 1.99.0 dissector_reset_string@Base 1.9.1 dissector_reset_uint@Base 1.9.1 + dissector_table_allow_decode_as@Base 2.3.0 dissector_table_foreach@Base 1.9.1 dissector_table_foreach_handle@Base 1.9.1 dissector_table_get_dissector_handles@Base 1.12.0~rc1 - dissector_table_get_proto_allowed@Base 2.1.0 dissector_table_get_type@Base 1.12.0~rc1 dissector_try_guid@Base 2.1.0 dissector_try_guid_new@Base 2.1.0 |