osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Erwin Rol 2019-12-24 10:52:37 +01:00 committed by Alexis La Goutte
parent b3c9244c82
commit 824fef51aa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-artnet.c
View File

@ -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,