diff options
| author | Guy Harris <gharris@sonic.net> | 2021-02-01 15:56:47 -0800 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-02-01 16:50:01 -0800 |
| commit | 0773147a5598f50d456a855e7169c50aa02df16f (patch) | |
| tree | d76d7f769c0824876117c875a1364850ccac56a2 /debian | |
| parent | 5837bcea5e347afd2a6e5860296de09cbb5a0b28 (diff) | |
wiretap: redo the way we handle if_filter IDB options.
Change the data structure for that option to have a type field,
indicating that it's either a pcap filter string or a BPF program,
followed by a union with a string-pointer member for pcap filter strings
and an instruction-count-and-pointer-to-instructions structure for BPF
programs.
Have routines to add, set, and fetch that option that handle that
structure; discard the "generic structured option" routines. That means
there's more type checking possible at compile time.
Add more code to handle BPF programs.
When writing pcapng files, check, both for that option and for string
options, whether the option length is too big for the data to fit in a
pcapng option, and don't write it if it is. (XXX - truncate the data?
Report an error?)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/libwiretap0.symbols | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/libwiretap0.symbols b/debian/libwiretap0.symbols index 72909048b6..4063fae2c9 100644 --- a/debian/libwiretap0.symbols +++ b/debian/libwiretap0.symbols @@ -21,7 +21,7 @@ libwiretap.so.0 libwiretap0 #MINVER# register_pcapng_option_handler@Base 1.99.2 wtap_add_generated_idb@Base 3.3.0 wtap_addrinfo_list_empty@Base 2.5.0 - wtap_block_add_structured_option@Base 3.5.0 + wtap_block_add_if_filter_option@Base 3.5.0 wtap_block_add_ipv4_option@Base 2.1.2 wtap_block_add_ipv6_option@Base 2.1.2 wtap_block_add_string_option@Base 2.1.2 @@ -33,7 +33,7 @@ libwiretap.so.0 libwiretap0 #MINVER# wtap_block_create@Base 2.1.2 wtap_block_foreach_option@Base 2.1.2 wtap_block_free@Base 2.1.2 - wtap_block_get_structured_option_value@Base 3.5.0 + wtap_block_get_if_filter_option_value@Base 3.5.0 wtap_block_get_ipv4_option_value@Base 2.1.2 wtap_block_get_ipv6_option_value@Base 2.1.2 wtap_block_get_mandatory_data@Base 2.1.2 @@ -44,7 +44,7 @@ libwiretap.so.0 libwiretap0 #MINVER# wtap_block_make_copy@Base 3.3.2 wtap_block_remove_nth_option_instance@Base 2.2.0 wtap_block_remove_option@Base 2.2.0 - wtap_block_set_structured_option_value@Base 3.5.0 + wtap_block_set_if_filter_option_value@Base 3.5.0 wtap_block_set_ipv4_option_value@Base 2.1.2 wtap_block_set_ipv6_option_value@Base 2.1.2 wtap_block_set_nth_string_option_value@Base 2.1.2 |