diff options
| author | Richard Sharpe <realrichardsharpe@gmail.com> | 2019-11-18 22:31:29 -0500 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-11-19 06:34:05 +0000 |
| commit | 6c59aa01346371b8bc36a7f916232bae02d1dcb6 (patch) | |
| tree | f1ef4d276d2bfad909e42e79843eeacf5a7ae631 | |
| parent | 800a029d25e2c43c9d80bde16cf90000f04eb62c (diff) | |
SMB2: Fix an error with the timestamp for TimeWarp ECPs during CREATE.
My previous commit had an error in the formatting of the timestamp.
Change-Id: I66f1489b75667d84c3beeca6aae73e692c4360b6
Reviewed-on: https://code.wireshark.org/review/35130
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-smb2.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 49cb32f4da..4c14004768 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -7606,13 +7606,16 @@ add_timestamp_to_info_col(tvbuff_t *tvb, packet_info *pinfo, smb2_info_t *si, int offset) { guint32 filetime_high, filetime_low; + guint64 ft; nstime_t ts; filetime_low = tvb_get_letohl(tvb, offset); filetime_high = tvb_get_letohl(tvb, offset + 4); - ts.secs = filetime_low; - ts.nsecs = filetime_high; + ft = ((guint64)filetime_high << 32) | filetime_low; + if (!filetime_to_nstime(&ts, ft)) { + return; + } col_append_fstr(pinfo->cinfo, COL_INFO, "@%s", abs_time_to_str(wmem_packet_scope(), &ts, ABSOLUTE_TIME_UTC, |