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 /epan/frame_data.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 'epan/frame_data.c')
| -rw-r--r-- | epan/frame_data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/frame_data.c b/epan/frame_data.c index bf403684f1..bfce771779 100644 --- a/epan/frame_data.c +++ b/epan/frame_data.c @@ -311,6 +311,7 @@ frame_data_init(frame_data *fdata, guint32 num, fdata->flags.has_ts = (phdr->presence_flags & WTAP_HAS_TS) ? 1 : 0; fdata->flags.has_phdr_comment = (phdr->opt_comment != NULL); fdata->flags.has_user_comment = 0; + fdata->tsprec = (gint16)phdr->pkt_tsprec; fdata->color_filter = NULL; fdata->abs_ts.secs = phdr->ts.secs; fdata->abs_ts.nsecs = phdr->ts.nsecs; |