Pcap: wtap does not set interface timestamp precision when reading pcap
Like bug 11447, when wiretap reads a legacy PCAP file it needs to set the interface description's tsprecision member. And like bug 11447, I'm wondering why we have the field to begin with. But I'm fixing this so that the Windows buildbots can get going again. Change-Id: I71d0fe2e999ee7d11f1f5cc424681a99e17b1b1b Reviewed-on: https://code.wireshark.org/review/10139 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
This commit is contained in:
parent
fc0a2f5d89
commit
b3daf70714
|
@ -1120,9 +1120,11 @@ success:
|
|||
if (wth->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_PCAP_NSEC) {
|
||||
descr.time_units_per_second = 1000000000; /* nanosecond resolution */
|
||||
descr.if_tsresol = 9;
|
||||
descr.tsprecision = WTAP_TSPREC_NSEC;
|
||||
} else {
|
||||
descr.time_units_per_second = 1000000; /* default microsecond resolution */
|
||||
descr.if_tsresol = 6;
|
||||
descr.tsprecision = WTAP_TSPREC_USEC;
|
||||
}
|
||||
descr.link_type = wtap_wtap_encap_to_pcap_encap(wth->file_encap);
|
||||
descr.snap_len = wth->snapshot_length;
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "wsutil/os_version_info.h"
|
||||
|
||||
|
||||
#if 1
|
||||
#if 0
|
||||
#define merge_debug0(str) g_warning(str)
|
||||
#define merge_debug1(str,p1) g_warning(str,p1)
|
||||
#define merge_debug2(str,p1,p2) g_warning(str,p1,p2)
|
||||
|
|
Loading…
Reference in New Issue