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 /wiretap/wtap.h | |
| 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 'wiretap/wtap.h')
| -rw-r--r-- | wiretap/wtap.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 1f9b4e1e84..e3b4e5166d 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1735,6 +1735,18 @@ WS_DLL_PUBLIC wtapng_iface_descriptions_t *wtap_file_get_idb_info(wtap *wth); /** + * @brief Gets a debug string of an interface description. + * @details Returns a newly allocated string of debug information about + * the given interface descrption, useful for debugging. + * @note The returned pointer must be g_free'd. + * + * @param if_descr The interface description. + * @return A newly allocated gcahr array string, which must be g_free'd. + */ +WS_DLL_PUBLIC +gchar *wtap_get_debug_if_descr(const wtapng_if_descr_t *if_descr); + +/** * @brief Gets new name resolution info for new file, based on existing info. * @details Creates a new wtapng_name_res_t name resolution info and only * copies appropriate members for a new file. |