osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use wtap_uses_interface_ids() to check if IDBs are necessary. 

Use that, rather than specifically checking for pcapng.
This commit is contained in:
Guy Harris 2020-10-22 10:42:25 -07:00
parent 87a42de393
commit 4740f01134
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wiretap/merge.c
View File

@ -1038,7 +1038,7 @@ merge_files_common(const gchar* out_filename, /* normal output mode */
wtap_dump_params params = WTAP_DUMP_PARAMS_INIT;
params.encap = frame_type;
params.snaplen = snaplen;
if (file_type == WTAP_FILE_TYPE_SUBTYPE_PCAPNG) {
if (wtap_uses_interface_ids(file_type)) {
shb_hdrs = create_shb_header(in_files, in_file_count, app_name);
merge_debug("merge_files: SHB created");