Improve file merging for mergecap and wireshark
authorHadriel Kaplan <hadrielk@yahoo.com>
Sun, 16 Aug 2015 16:37:11 +0000 (12:37 -0400)
committerAnders Broman <a.broman58@gmail.com>
Tue, 18 Aug 2015 14:52:00 +0000 (14:52 +0000)
commit8fcdcb9c95e7436c4da02d39df048f4a1fbeca9c
tree8d22d06db1cf990f273a4d80d496598a4f47671f
parenta3c175a82332ba8be150caf5943a4d0a2b5ff552
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>
debian/libwiretap0.symbols
doc/mergecap.pod
file.c
mergecap.c
ui/gtk/drag_and_drop.c
wiretap/merge.c
wiretap/merge.h
wiretap/wtap.c
wiretap/wtap.h