aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2021-02-21 14:18:04 -0800
committerGuy Harris <gharris@sonic.net>2021-02-21 23:18:35 +0000
commit842a7cccf9ec96ab7ce8945d4de77537f69efc2f (patch)
tree8e27dfa6aed434b1e0cd5e6ba7a0078c310ab829 /debian
parentb8ce02e6fb43dedb8d1a480a154cc7cca0c5c353 (diff)
wiretap: have file handlers advertise blocks and options supported.
Instead of a "supports name resolution" Boolean and bitflags for types of comments supported, provide a list of block types that the file type/subtype supports, with each block type having a list of options supported. Indicate whether "supported" means "one instance" or "multiple instances". "Supports" doesn't just mean "can be written", it also means "could be read". Rename WTAP_BLOCK_IF_DESCRIPTION to WTAP_BLOCK_IF_ID_AND_INFO, to indicate that it provides, in addition to information about the interface, an ID (implicitly, in pcapng files, by its ordinal number) that is associated with every packet in the file. Emphasize that in comments - just because your capture file format can list the interfaces on which a capture was done, that doesn't mean it supports this; it doesn't do so if the file doesn't indicate, for every packet, on which of those interfaces it was captured (I'm looking at *you*, Microsoft Network Monitor...). Use APIs to query that information to do what the "does this file type/subtype support name resolution information", "does this file type/subtype support all of these comment types", and "does this file type/subtype support - and require - interface IDs" APIs did. Provide backwards compatibility for Lua. This allows us to eliminate the WTAP_FILE_TYPE_SUBTYPE_ values for IBM's iptrace; do so.
Diffstat (limited to 'debian')
-rw-r--r--debian/libwiretap0.symbols5
1 files changed, 2 insertions, 3 deletions
diff --git a/debian/libwiretap0.symbols b/debian/libwiretap0.symbols
index 24f083c0e5..ef49398093 100644
--- a/debian/libwiretap0.symbols
+++ b/debian/libwiretap0.symbols
@@ -78,7 +78,6 @@ libwiretap.so.0 libwiretap0 #MINVER#
wtap_dump_file_write@Base 1.12.0~rc1
wtap_dump_flush@Base 1.9.1
wtap_dump_get_needs_reload@Base 2.5.0
- wtap_dump_has_name_resolution@Base 1.9.1
wtap_dump_open@Base 1.9.1
wtap_dump_open_stdout@Base 2.0.0
wtap_dump_open_tempfile@Base 2.0.0
@@ -87,7 +86,6 @@ libwiretap.so.0 libwiretap0 #MINVER#
wtap_dump_params_init@Base 2.9.0
wtap_dump_params_init_no_idbs@Base 3.3.2
wtap_dump_set_addrinfo_list@Base 1.9.1
- wtap_dump_supports_comment_types@Base 1.9.1
wtap_encap_description@Base 2.9.1
wtap_encap_name@Base 2.9.1
wtap_encap_requires_phdr@Base 1.9.1
@@ -105,6 +103,8 @@ libwiretap.so.0 libwiretap0 #MINVER#
wtap_file_type_subtype@Base 1.12.0~rc1
wtap_file_type_subtype_description@Base 3.5.0
wtap_file_type_subtype_name@Base 3.5.0
+ wtap_file_type_subtype_supports_block@Base 3.5.0
+ wtap_file_type_subtype_supports_option@Base 3.5.0
wtap_free_extensions_list@Base 1.9.1
wtap_free_idb_info@Base 1.99.9
wtap_fstat@Base 1.9.1
@@ -153,6 +153,5 @@ libwiretap.so.0 libwiretap0 #MINVER#
wtap_snapshot_length@Base 1.9.1
wtap_strerror@Base 1.9.1
wtap_tsprec_string@Base 1.99.9
- wtap_uses_interface_ids@Base 3.3.2
wtap_write_shb_comment@Base 1.9.1
wtap_wtap_encap_to_pcap_encap@Base 1.9.1