diff options
| author | Erwin Rol <erwin@erwinrol.com> | 2019-12-24 10:52:37 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2020-01-23 05:26:07 +0000 |
| commit | 824fef51aa3efc7a146ea57de90b1a6135614496 (patch) | |
| tree | 8a1ba2c941b23fa205b9c2f6aedda48ad0ec89d4 /epan/dissectors/packet-artnet.c | |
| parent | b3c9244c8294a316d640259db605f7b9c12841e6 (diff) | |
artnet: Fix ArtPollReply universe calculation
The SubSwitch field holds bit 7-4 of the 15bit port address, but
it holds it in bit 3-0 so we have to shift it 4 bits instead of
taking bit 7-4 of the SubSwitch field.
Change-Id: I7841d64749e8a561e4ee928a23a3c46cb5be34cb
Signed-off-by: Erwin Rol <erwin@erwinrol.com>
Reviewed-on: https://code.wireshark.org/review/35910
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-artnet.c')
| -rw-r--r-- | epan/dissectors/packet-artnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index e6a0ea64ae..f104b1f710 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -2018,7 +2018,7 @@ dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) proto_tree_add_item(tree, hf_artnet_poll_reply_subswitch, tvb, offset, 1, ENC_BIG_ENDIAN); - universe |= tvb_get_guint8(tvb, offset) & 0xF0; + universe |= (tvb_get_guint8(tvb, offset) & 0x0F) << 4; offset += 1; proto_tree_add_item(tree, hf_artnet_poll_reply_oem, tvb, |