diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-09-28 11:37:06 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-09-28 18:38:18 +0000 |
| commit | 54b733ce9a0d1cd4ab9b142479368a5e696360be (patch) | |
| tree | 1c98ec83c70ba99b383105516048d0254168d855 /wiretap/wtap.c | |
| parent | efea8ce1c6a4331bc2ff7090dd3dadd2a80f6d86 (diff) | |
Make the time stamp resolution per-packet.
Pcap-ng files don't have a per-file time stamp resolution, they have a
per-interface time stamp resolution. Add new time stamp resolution
types of "unknown" and "per-packet", add the time stamp resolution to
struct wtap_pkthdr, have the libwiretap core initialize it to the
per-file time stamp resolution, and have pcap-ng do the same thing with
the resolution that it does with the packet encapsulation.
Get rid of the TS_PREC_AUTO_XXX values; just have TS_PREC_AUTO, which
means "use the packet's resolution to determine how many significant
digits to display". Rename all the WTAP_FILE_TSPREC_XXX values to
WTAP_TSPREC_XXX, as they're also used for per-packet values.
Change-Id: If9fd8f799b19836a5104aaa0870a951498886c69
Reviewed-on: https://code.wireshark.org/review/4349
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 0ac1c655d4..a4fb756059 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -162,9 +162,9 @@ wtap_file_encap(wtap *wth) } int -wtap_file_tsprecision(wtap *wth) +wtap_file_tsprec(wtap *wth) { - return wth->tsprecision; + return wth->file_tsprec; } wtapng_section_t * @@ -996,8 +996,11 @@ wtap_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) * capture file type doesn't have to set it), and if it * *is* WTAP_ENCAP_PER_PACKET, the caller needs to set it * anyway. + * + * Do the same for the packet time stamp resolution. */ wth->phdr.pkt_encap = wth->file_encap; + wth->phdr.pkt_tsprec = wth->file_tsprec; if (!wth->subtype_read(wth, err, err_info, data_offset)) { /* |