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

WOWW: Make tree only take the data that belongs to it 

Previously, any remaining data would be highlighted as belonging to the
first opcode.
This commit is contained in:
Gtker 2021-07-21 16:43:21 +02:00 committed by Wireshark GitLab Utility
parent 022b4f857f
commit d5f7f80d7b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-woww.c
View File

@ -2096,7 +2096,11 @@ add_header_to_tree(guint8 decrypted_header[],
packet_info* pinfo,
guint8 headerSize)
{
proto_tree* ti = proto_tree_add_item(tree, proto_woww, tvb, 0, -1, ENC_NA);
const guint16 size_field_width = 2;
// Size field does not count in the reported size, so we need to add it.
const guint16 packet_size = (decrypted_header[0] << 8 | decrypted_header[1]) + size_field_width;
proto_tree* ti = proto_tree_add_item(tree, proto_woww, tvb, 0, packet_size, ENC_NA);
proto_tree* woww_tree = proto_item_add_subtree(ti, ett_woww);
@ -2106,7 +2110,7 @@ add_header_to_tree(guint8 decrypted_header[],
// We're indexing into another tvb
gint offset = 0;
gint len = 2;
gint len = size_field_width;
proto_tree_add_item(woww_tree, hf_woww_size_field, next_tvb,
offset, len, ENC_BIG_ENDIAN);
offset += len;