aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorBradford Boyle <bradford.d.boyle@gmail.com>2015-10-16 00:15:55 -0400
committerAnders Broman <a.broman58@gmail.com>2015-10-16 06:43:54 +0000
commit12fa38774ae6ee3acfe894c3f5057e72c4fbb096 (patch)
tree4e21eeeda44f6098beddc70151da49cf25404879 /epan
parent1e623d6985bb5ed54d56df288b305517eb6b1bf9 (diff)
Correctly convert clfow.sysuptime to seconds
Change-Id: I4f2f90ab87eafda954f6161a319976b56c7c3cf1 Reviewed-on: https://code.wireshark.org/review/11081 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-netflow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 1797951f04..6bc644cb0f 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -2405,7 +2405,7 @@ dissect_netflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
nstime_t nsuptime;
nsuptime.secs = sysuptime / 1000;
- nsuptime.nsecs = sysuptime * 1000;
+ nsuptime.nsecs = (sysuptime % 1000) * 1000000;
proto_tree_add_time(netflow_tree, hf_cflow_sysuptime, tvb,
offset, 4, &nsuptime);
offset += 4;