From c53cbf81f452ca6858f8cbe7163f4da8070e7065 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 22 Oct 2020 17:42:25 +0000 Subject: [PATCH] Use wtap_uses_interface_ids() to check if IDBs are necessary. Use that, rather than specifically checking for pcapng. (cherry picked from commit 4740f01134bd55a9ea0f9a6d53c6fc04da3eb438) --- wiretap/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiretap/merge.c b/wiretap/merge.c index 4281b042d2..632453bf5f 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -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");