URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8fcdcb9c95e7436c4da02d39df048f4a1fbeca9c
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
8fcdcb9 by Hadriel Kaplan (hadrielk@xxxxxxxxx):
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@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from a3c175a Add casts to passify buildboot.
adds 8fcdcb9 Improve file merging for mergecap and wireshark
Summary of changes:
debian/libwiretap0.symbols | 4 +
doc/mergecap.pod | 40 +--
file.c | 515 +++++++++-----------------------
mergecap.c | 463 ++++++++---------------------
ui/gtk/drag_and_drop.c | 2 +-
wiretap/merge.c | 710 +++++++++++++++++++++++++++++++++++++++++++-
wiretap/merge.h | 103 ++++++-
wiretap/wtap.c | 24 ++
wiretap/wtap.h | 12 +
9 files changed, 1139 insertions(+), 734 deletions(-)