diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-05-05 14:20:22 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-05-05 14:20:22 +0000 |
| commit | df3cd034b8fbf3cdc2918144345f4ec21e84ca98 (patch) | |
| tree | 7f95208df418dea2ff1055c8fdcf2fad110a0a49 /epan/dissectors/packet-iec104.c | |
| parent | ed59c450f4a6195a7eda4e9b39dcc4e21a8d3acc (diff) | |
Fix decoding of CP56Time2a timestamp. Resolves bug 5889.
svn path=/trunk/; revision=36997
Diffstat (limited to 'epan/dissectors/packet-iec104.c')
| -rw-r--r-- | epan/dissectors/packet-iec104.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index 79c3d89d91..76f8e7f169 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -499,8 +499,8 @@ static void get_CP56Time( td_CP56Time *cp56t, tvbuff_t *tvb, guint8 *offset, pro guint16 ms; ms = tvb_get_letohs( tvb , *offset ); (*offset) += 2; - cp56t->cp56t_s = (int)floor(ms/1000); - cp56t->cp56t_ms = (int)(ms-(cp56t->cp56t_s*1000)); + cp56t->cp56t_s = ms / 1000; + cp56t->cp56t_ms = ms % 1000; cp56t->cp56t_min = tvb_get_guint8(tvb, *offset); /* "Invalid" -- Todo: test */ |