path: root/tshark.c
diff options
authorGuy Harris <guy@alum.mit.edu>2018-11-15 15:34:01 -0800
committerGuy Harris <guy@alum.mit.edu>2018-11-15 23:37:39 +0000
commit658c30dc4b98c7afd1f0a7a5f8380a9399cbb082 (patch)
tree3c2949c357755e43db7fa038b5c93739e56cdcff /tshark.c
parentad2bc773d6c777290b2485de8a43350682c438a1 (diff)
Always use the input file's encapsulation for the output file.
Using WTAP_ENCAP_PER_PACKET if there's more than one interface forces a format supporting multiple encapsulations even if all interfaces use the same encapsulation; there's no reason to force that - you might as well let the user specify pcap format, for example, if that's what they really want. (If there are multiple interfaces and they have different encapsulations, the file encapsulation will be WTAP_ENCAP_PER_PACKET *anyway*.) Change-Id: I0e65c06e1ae3ff159ccd27f72cc63014e30a58f3 Reviewed-on: https://code.wireshark.org/review/30658 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tshark.c')
1 files changed, 0 insertions, 8 deletions
diff --git a/tshark.c b/tshark.c
index e519387ce1..172764ad06 100644
--- a/tshark.c
+++ b/tshark.c
@@ -3108,15 +3108,7 @@ process_cap_file(capture_file *cf, char *save_file, int out_file_type,
/* Set up to write to the capture file. */
snapshot_length = wtap_snapshot_length(cf->provider.wth);
wtap_dump_params_init(&ng_params, cf->provider.wth);
- if (ng_params.idb_inf->interface_data->len > 1) {
- } else {
- linktype = wtap_file_encap(cf->provider.wth);
- }
linktype = wtap_file_encap(cf->provider.wth);
/* If we don't have an application name add Tshark */
if (wtap_block_get_string_option_value(g_array_index(ng_params.shb_hdrs, wtap_block_t, 0), OPT_SHB_USERAPPL, &shb_user_appl) != WTAP_OPTTYPE_SUCCESS) {