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 | |
| parent | db4232a69a0196c7cafab1afae9b2f45f58e4ebe (diff) | |
| download | wireshark-1a569900cc4197bf3f2e90028b51781f5c80b0a5.tar.gz | |
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>
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-se.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-zbee.h | 4 |
3 files changed, 1 insertions, 10 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; diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index b9de144183..213d3e9477 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -342,7 +342,6 @@ const value_string zbee_mfr_code_names[] = { { ZBEE_MFG_CODE_SYCHIP, ZBEE_MFG_SYCHIP }, { ZBEE_MFG_CODE_OPEN_PEAK, ZBEE_MFG_OPEN_PEAK }, { ZBEE_MFG_CODE_PASSIVE, ZBEE_MFG_PASSIVE }, - { ZBEE_MFG_CODE_G4S_JUSTICE, ZBEE_MFG_G4S_JUSTICE }, { ZBEE_MFG_CODE_MMB, ZBEE_MFG_MMB }, { ZBEE_MFG_CODE_LEVITON, ZBEE_MFG_LEVITON }, { ZBEE_MFG_CODE_KOREA_ELEC, ZBEE_MFG_KOREA_ELEC }, @@ -427,10 +426,6 @@ const value_string zbee_mfr_code_names[] = { { ZBEE_MFG_CODE_ABB, ZBEE_MFG_ABB }, { ZBEE_MFG_CODE_SONY, ZBEE_MFG_SONY }, { ZBEE_MFG_CODE_GENUS, ZBEE_MFG_GENUS }, - { ZBEE_MFG_CODE_EMBEDDED, ZBEE_MFG_EMBEDDED }, - { ZBEE_MFG_CODE_ABB, ZBEE_MFG_ABB }, - { ZBEE_MFG_CODE_SONY, ZBEE_MFG_SONY }, - { ZBEE_MFG_CODE_GENUS, ZBEE_MFG_GENUS }, { ZBEE_MFG_CODE_UNIVERSAL1, ZBEE_MFG_UNIVERSAL }, { ZBEE_MFG_CODE_UNIVERSAL2, ZBEE_MFG_UNIVERSAL }, { ZBEE_MFG_CODE_METRUM, ZBEE_MFG_METRUM }, diff --git a/epan/dissectors/packet-zbee.h b/epan/dissectors/packet-zbee.h index 0c9a54e82e..095fdc3fa5 100644 --- a/epan/dissectors/packet-zbee.h +++ b/epan/dissectors/packet-zbee.h @@ -681,10 +681,6 @@ #define ZBEE_MFG_CODE_ABB 0x10eb #define ZBEE_MFG_CODE_SONY 0x10ec #define ZBEE_MFG_CODE_GENUS 0x10ed -#define ZBEE_MFG_CODE_EMBEDDED 0x10ea -#define ZBEE_MFG_CODE_ABB 0x10eb -#define ZBEE_MFG_CODE_SONY 0x10ec -#define ZBEE_MFG_CODE_GENUS 0x10ed #define ZBEE_MFG_CODE_UNIVERSAL1 0x10ee #define ZBEE_MFG_CODE_UNIVERSAL2 0x10ef #define ZBEE_MFG_CODE_METRUM 0x10f0 |