diff options
author | Graham Bloice <graham.bloice@trihedral.com> | 2014-12-17 15:42:57 +0000 |
---|---|---|
committer | Graham Bloice <graham.bloice@trihedral.com> | 2014-12-17 21:36:45 +0000 |
commit | 1a569900cc4197bf3f2e90028b51781f5c80b0a5 (patch) | |
tree | 91e0bc604df203f9ecb52bd7b0ac251a4f4bdff4 /epan/dissectors/packet-zbee-zcl-se.c | |
parent | db4232a69a0196c7cafab1afae9b2f45f58e4ebe (diff) |
Fix zbee errors introduced by change 5565, commit df639f509e812fff3c5eb4bdf4f77988c6ec122b
Reworked zbee_mfr_code_names to be in monotonic order.
Fixed implicit shortening of time value with a cast.
Change-Id: I629948fbe32543fd2672bbc40af790333b970b10
Reviewed-on: https://code.wireshark.org/review/5808
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-se.c')
-rw-r--r-- | epan/dissectors/packet-zbee-zcl-se.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index 518b3b961e..12ad70ddef 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -1674,7 +1674,7 @@ dissect_zcl_ke_suite2_certificate(tvbuff_t *tvb, proto_tree *tree, guint *offset proto_tree_add_item(tree, hf_zbee_zcl_ke_cert_issuer, tvb, *offset, 8, ENC_NA); *offset += 8; - valid_from_time.secs = tvb_get_ntoh40(tvb, *offset); + valid_from_time.secs = (time_t)tvb_get_ntoh40(tvb, *offset); valid_from_time.nsecs = 0; proto_tree_add_time(tree, hf_zbee_zcl_ke_cert_valid_from, tvb, *offset, 5, &valid_from_time); *offset += 5; |