aboutsummaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-06-25 10:59:46 -0700
committerAnders Broman <a.broman58@gmail.com>2015-06-25 20:28:13 +0000
commit5bc38611fdb9b497be2dae23b1b16bbf44097717 (patch)
treed1ee1137a6e98f2c164f69fdb2a784a79ef5b084 /file.c
parentb0584aec1b0c18ed3a8919718a374e963ad1736a (diff)
mergecap: check input files time precision before exporting to pcapng format
Bug: 11202 Change-Id: I0891235e9fd41687a12eb8c7e05048e25de3d8b9 Reviewed-on: https://code.wireshark.org/review/9137 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'file.c')
-rw-r--r--file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/file.c b/file.c
index 39f500448c..c13f4c6265 100644
--- a/file.c
+++ b/file.c
@@ -1345,7 +1345,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
int_data.opt_comment = NULL;
int_data.if_description = NULL;
int_data.if_speed = 0;
- int_data.if_tsresol = 6;
+ int_data.if_tsresol = file_int_data->if_tsresol;
int_data.if_filter_str = NULL;
int_data.bpf_filter_len = 0;
int_data.if_filter_bpf_bytes = NULL;