osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

rtmpt: fix extended timestamps on type 3 chunks 

This fix does not handle the less common case where a type 3 chunk starts a new message
and an extended timestamp is present.

This fixes the dissection of rtmp-cal-to-ams-4.pcap attached to the issue. Closes #15718
This commit is contained in:
Alex Converse 2021-02-01 09:03:36 -08:00 committed by Wireshark GitLab Utility
parent 5f31971e68
commit fdcddd4b78
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2190,6 +2190,14 @@ dissect_rtmpt_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rtmpt_
tp->chunkwant = tp->want - tp->have;
}
} else {
if (header_type == 3 && tp->resident && tp->have > tp->bhlen + 3
&& pntoh24(tp->data.p+tp->bhlen) == 0xffffff) {
/* Header type 3 resends the extended time stamp if the last message on the chunk
* stream had an extended timestamp.
* See: https://gitlab.com/wireshark/wireshark/-/issues/15718
*/
message_hlen += 4;
}
RTMPT_DEBUG("Old packet cdir=%d seq=%d ti=%p tp=%p header_len=%d id=%d tph=%d tpw=%d len=%d cs=%d\n",
cdir, seq+offset,
ti, tp, basic_hlen+message_hlen, id, tp?tp->have:0, tp?tp->want:0, body_len, chunk_size);