diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-04-09 23:06:47 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-04-10 14:55:45 +0000 |
| commit | c7970d9356a494d847101c2bd92e4ca97a7d3d58 (patch) | |
| tree | e894b469ecc2c26563fbce3a9512af9bad66c594 /epan/dissectors/packet-zbee-zcl-misc.c | |
| parent | 2cb93e2121eea20c1e443558d7175f1cab8e1f70 (diff) | |
Add, and use, "fetch signed value" for lengths < 40 bits.
Add 8-bit, 16-bit, 24-bit, and 32-bit "fetch signed value" routines, and
use them rather than casting the result of the 8/16/24/32-bit "fetch
unsigned value" routines to a signed type (which, BTW, isn't sufficient
for 24-bit values, so this appears to fix a bug
in epan/dissectors/packet-zbee-zcl.c).
Use numbers rather than sizeof()s in various tvb_get_ routines.
Change-Id: I0e48a57fac9f70fe42de815c3fa915f1592548bd
Reviewed-on: https://code.wireshark.org/review/26844
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-misc.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c index c1091c4a71..25dbda1d97 100644 --- a/epan/dissectors/packet-zbee-zcl-misc.c +++ b/epan/dissectors/packet-zbee-zcl-misc.c @@ -322,13 +322,13 @@ dissect_zcl_thermostat_schedule(proto_tree *tree, tvbuff_t *tvb, guint offset) offset += 2; if (mode_sequence & ZBEE_ZCL_CMD_THERMOSTAT_SCHEDULE_MODE_SEQUENCE_HEAT) { - float setpoint = (gint16)tvb_get_letohs(tvb, offset); + float setpoint = tvb_get_letohis(tvb, offset); proto_tree_add_float(tree, hf_zbee_zcl_thermostat_schedule_heat, tvb, offset, 2, (setpoint / 100.0f)); offset += 2; } if (mode_sequence & ZBEE_ZCL_CMD_THERMOSTAT_SCHEDULE_MODE_SEQUENCE_COOL) { - float setpoint = (gint16)tvb_get_letohs(tvb, offset); + float setpoint = tvb_get_letohis(tvb, offset); proto_tree_add_float(tree, hf_zbee_zcl_thermostat_schedule_cool, tvb, offset, 2, (setpoint / 100.0f)); offset += 2; @@ -379,7 +379,7 @@ dissect_zbee_zcl_thermostat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_zbee_zcl_thermostat_setpoint_mode, tvb, offset, 1, ENC_NA); offset++; - amount = (gint8)tvb_get_guint8(tvb, offset); + amount = tvb_get_gint8(tvb, offset); proto_tree_add_float(tree, hf_zbee_zcl_thermostat_setpoint_amount, tvb, offset, 1, (amount / 100.0f)); offset++; |