aboutsummaryrefslogtreecommitdiffstats
path: root/epan/packet.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-01-22 20:09:35 -0800
committerGuy Harris <guy@alum.mit.edu>2016-01-23 04:10:20 +0000
commite119532e11e5514ee7a397b80ef8edc4372b2406 (patch)
tree7f280b2167d30ac6ef037e8b2f3a612940bd2c05 /epan/packet.c
parenta7f470fa2476459c2013f0ee3ffe09f94fb036c2 (diff)
Set the pinfo time stamps based on the frame_data time stamps.
That takes into account any time-shifting that's been done. Change-Id: Ib4c01e7b055f5ac2f1111bcbe946c6094dcb70ae Reviewed-on: https://code.wireshark.org/review/13502 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/packet.c')
-rw-r--r--epan/packet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/packet.c b/epan/packet.c
index 8915e2a215..fda35e95db 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -462,9 +462,9 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype,
edt->pi.current_proto = "<Missing Protocol Name>";
edt->pi.cinfo = cinfo;
edt->pi.presence_flags = 0;
- if (phdr->presence_flags & WTAP_HAS_TS) {
+ if (fd->flags.has_ts) {
edt->pi.presence_flags |= PINFO_HAS_TS;
- edt->pi.abs_ts = phdr->ts;
+ edt->pi.abs_ts = fd->abs_ts;
}
edt->pi.pkt_encap = phdr->pkt_encap;
edt->pi.fd = fd;