URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8be430122ce34ecd0e55a56655b78dd842017499
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark
Commits:
8be4301 by Pascal Quantin (pascal.quantin@xxxxxxxxx):
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@xxxxxxxxx>
Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit 5bc38611fdb9b497be2dae23b1b16bbf44097717)
Conflicts:
file.c
mergecap.c
Reviewed-on: https://code.wireshark.org/review/9150
Actions performed:
from 6c23012 editcap: keep timestamp resolution when converting a nseclibpcap file to pcapng
adds 8be4301 mergecap: check input files time precision before exporting to pcapng format
Summary of changes:
file.c | 2 +-
mergecap.c | 39 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 39 insertions(+), 2 deletions(-)