diff options
author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2020-07-09 12:29:37 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2020-07-14 08:14:02 +0000 |
commit | 759a62b5c5153e1b39c56d382a1934527f1b21f9 (patch) | |
tree | c6d8b24ea1c4ebf51870907606a1827ad475101f | |
parent | 44ed20a97cea0e387eb56752ab61bd9a707efeb6 (diff) |
RTCP: Add few remaining AVB specific fields
Bug: 16671
Change-Id: I6e73c734bade411e245dfc3282c2140d647c7034
Reviewed-on: https://code.wireshark.org/review/37812
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | epan/dissectors/packet-rtcp.c | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 8c798f23d8..5aee3d4a41 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -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_timebase_indicator = -1; +static int hf_rtcp_identity = -1; static int hf_rtcp_stream_id = -1; static int hf_rtcp_as_timestamp = -1; static int hf_rtcp_rtp_timestamp = -1; @@ -3469,12 +3471,13 @@ dissect_rtcp_avb( tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree proto_tree_add_item( tree, hf_rtcp_name_ascii, tvb, offset, 4, ENC_ASCII|ENC_NA ); offset += 4; -/* 32 bit wide -gmTimeBaseIndicator | gmIdentity - low 16 bit -gmIdentity - mid 32 bit -gmIdentity - high 32 bit -*/ - offset += 3 * 4; + /* TimeBase Indicator */ + proto_tree_add_item( tree, hf_rtcp_timebase_indicator, tvb, offset, 2, ENC_BIG_ENDIAN ); + offset += 2; + + /* Identity */ + proto_tree_add_item( tree, hf_rtcp_identity, tvb, offset, 10, ENC_NA ); + offset += 10; /* Stream id, 64 bits */ proto_tree_add_item( tree, hf_rtcp_stream_id, tvb, offset, 8, ENC_BIG_ENDIAN ); @@ -4565,6 +4568,30 @@ proto_register_rtcp(void) } }, { + &hf_rtcp_timebase_indicator, + { + "Timebase Indicator", + "rtcp.timebase_indicator", + FT_UINT16, + BASE_DEC_HEX, + NULL, + 0x0, + NULL, HFILL + } + }, + { + &hf_rtcp_identity, + { + "Identity", + "rtcp.identity", + FT_BYTES, + BASE_NONE, + NULL, + 0x0, + NULL, HFILL + } + }, + { &hf_rtcp_stream_id, { "Stream id", |