diff options
| author | John Thacker <johnthacker@gmail.com> | 2022-05-10 00:12:00 -0400 |
|---|---|---|
| committer | A Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2022-06-02 12:51:52 +0000 |
| commit | 06871d27df80ce58130798a87c1e8a447919960c (patch) | |
| tree | 6dd5f581c3a5ac85c6c329a7d596c02acf5d4316 /doc | |
| parent | ea2ddd40f5b61d1547b3ef4285df3ecc7702b0f8 (diff) | |
wiretap: merge support for IDBs in the middle of a file
Support merging files with IDBs in the middle of the file.
Use wtap_get_next_interface_description when doing the initial
list of interfaces so that we can correctly get IDBs later.
Note that while IDB merge modes "any" and "none" work as expected, the
default "all" mode can't really work for IDBs in the middle of the file
without adding a two-pass mode. In "all" mode, if there are any such IDBs,
merge them with duplicates iff the interfaces at the beginning of the
files were merged.
Related to #15502 and #16542.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/mergecap.adoc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/mergecap.adoc b/doc/mergecap.adoc index 044e598dee..f1bca75846 100644 --- a/doc/mergecap.adoc +++ b/doc/mergecap.adoc @@ -107,7 +107,10 @@ copied to the merged output file. *all*: IDBs are merged only if all input files have the same number of IDBs, and each IDB matches their respective entry in the -other files. This is the default mode. +other files. (Only the IDBs that occur at the beginning of the files, +before any packet blocks, are compared. IDBs that occur later in the +files are merged with duplicates iff the initial IDBs were merged.) +This is the default mode. *any*: Any and all duplicate IDBs are merged into one IDB, regardless of what file they are in. |