diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-08-16 12:37:11 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-08-18 14:52:00 +0000 |
| commit | 8fcdcb9c95e7436c4da02d39df048f4a1fbeca9c (patch) | |
| tree | 8d22d06db1cf990f273a4d80d496598a4f47671f /debian | |
| parent | a3c175a82332ba8be150caf5943a4d0a2b5ff552 (diff) | |
Improve file merging for mergecap and wireshark
Refactor the file merging code by removing the duplicate logic from mergecap.c
and file.c's cf_merge_files(), into a new merge_files() function in merge.c.
Also the following user-visible changes:
* Removed the '-T' encap type option from mergecap, as it's illogical for
mergecap and would complicate common merge code.
* Input files with IDBs of different name, speed, tsprecision, etc., will produce
an output PCAPNG file with separate IDBs, even if their encap types are the same.
* Added a '-I' IDB merge mode option for mergecap, to control how IDBs are merged.
* Changed Wireshark's drag-and-drop merging to use PCAPNG instead of PCAP.
Bug: 8795
Bug: 7381
Change-Id: Icc30d217e093d6f40114422204afd2e332834f71
Reviewed-on: https://code.wireshark.org/review/10058
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/libwiretap0.symbols | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/libwiretap0.symbols b/debian/libwiretap0.symbols index 9f2ea8840f..3244c81e54 100644 --- a/debian/libwiretap0.symbols +++ b/debian/libwiretap0.symbols @@ -11,10 +11,13 @@ libwiretap.so.0 libwiretap0 #MINVER# init_open_routines@Base 1.12.0~rc1 merge_append_read_packet@Base 1.12.0~rc1 merge_close_in_files@Base 1.12.0~rc1 + merge_files@Base 1.99.9 + merge_idb_merge_mode_to_string@Base 1.99.9 merge_max_snapshot_length@Base 1.12.0~rc1 merge_open_in_files@Base 1.12.0~rc1 merge_read_packet@Base 1.12.0~rc1 merge_select_frame_type@Base 1.12.0~rc1 + merge_string_to_idb_merge_mode@Base 1.99.9 open_info_name_to_type@Base 1.12.0~rc1 open_routines@Base 1.12.0~rc1 register_all_wiretap_modules@Base 1.12.0~rc1 @@ -65,6 +68,7 @@ libwiretap.so.0 libwiretap0 #MINVER# wtap_fstat@Base 1.9.1 wtap_get_all_file_extensions_list@Base 1.12.0~rc1 wtap_get_bytes_dumped@Base 1.9.1 + wtap_get_debug_if_descr@Base 1.99.9 wtap_get_file_extension_type_extensions@Base 1.12.0~rc1 wtap_get_file_extension_type_name@Base 1.12.0~rc1 wtap_get_file_extensions_list@Base 1.9.1 |