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

rtcp: Extend AVB RTCP (IEEE1733) to decode AS Timestamp and Sequence Id 

AS Timestamp and Sequence Id are not decoded in AVP RTCP (IEEE17333) packets.

This adds a unsigned 32 bit field for AS Timestamp and a unsigned 64 bit
field for Sequence Id to the rtcp dissector.

Change-Id: I9f47001d60985b90d0f4a67ca1b1188ceba45923
Reviewed-on: https://code.wireshark.org/review/35537
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Alexander Meier 2019-12-21 17:59:20 +01:00 committed by Michael Mann
parent e306618d56
commit b1910fcdc8
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
epan/dissectors/packet-rtcp.c
View File

@ -484,6 +484,8 @@ static int hf_rtcp_ssrc_media_source = -1;
static int hf_rtcp_ntp = -1;
static int hf_rtcp_ntp_msw = -1;
static int hf_rtcp_ntp_lsw = -1;
static int hf_rtcp_stream_id = -1;
static int hf_rtcp_as_timestamp = -1;
static int hf_rtcp_rtp_timestamp = -1;
static int hf_rtcp_sender_pkt_cnt = -1;
static int hf_rtcp_sender_oct_cnt = -1;
@ -3431,11 +3433,16 @@ dissect_rtcp_avb( tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree
gmTimeBaseIndicator | gmIdentity - low 16 bit
gmIdentity - mid 32 bit
gmIdentity - high 32 bit
stream_id - lower 32 bit
stream_id - higher 32 bit
as_timestamp
*/
offset += 6 * 4;
offset += 3 * 4;
/* Stream id, 64 bits */
proto_tree_add_item( tree, hf_rtcp_stream_id, tvb, offset, 8, ENC_BIG_ENDIAN );
offset += 8;
/* AS timestamp, 32 bits */
proto_tree_add_item( tree, hf_rtcp_as_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN );
offset += 4;
/* RTP timestamp, 32 bits */
proto_tree_add_item( tree, hf_rtcp_rtp_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN );
@ -4517,6 +4524,30 @@ proto_register_rtcp(void)
NULL, HFILL
}
},
{
&hf_rtcp_stream_id,
{
"Stream id",
"rtcp.stream_id",
FT_UINT64,
BASE_HEX,
NULL,
0x0,
NULL, HFILL
}
},
{
&hf_rtcp_as_timestamp,
{
"AS timestamp",
"rtcp.timestamp.as",
FT_UINT32,
BASE_DEC,
NULL,
0x0,
NULL, HFILL
}
},
{
&hf_rtcp_rtp_timestamp,
{