diff options
| author | Robert Jongbloed <robertj@voxlucida.com.au> | 2018-01-23 12:13:43 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-01-30 05:43:54 +0000 |
| commit | 94d7500a7d2589548f210ef0e9cb6d9eba796239 (patch) | |
| tree | a6c08f1c5a8290090f6f9f18c1424a6d90694560 /epan/dissectors/packet-zrtp.c | |
| parent | d328a58fc6ef90db94bb591b949802abbc91a332 (diff) | |
SDP/RTP: Support for "bundled" media.
Modern SDP usage (e.g. SIP, WebRTC) can "bundle" multiple RTP media streams on
a single port. Thus the RTP dissector has to be able to handle audio and video
at the same time, so the gboolean flag in _rtp_info was changed to a bit mask.
The SDP parsing was then changed to detect multiple "m=" lines using the same
port, and combine their audio/video bit masks, and the rtp_dyn_payload used
has all the audio and video payload descriptions.
Change-Id: Ifa3c034260f892ed005fe28647d28f3b0b1b05cf
Reviewed-on: https://code.wireshark.org/review/25431
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zrtp.c')
| -rw-r--r-- | epan/dissectors/packet-zrtp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index b899b88b6b..262abd65de 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -455,10 +455,10 @@ dissect_Conf2ACK(packet_info *pinfo) { dummy_srtp_info->auth_tag_len = 4; srtp_add_address(pinfo, PT_UDP, &pinfo->net_src, pinfo->srcport, pinfo->destport, - "ZRTP", pinfo->num, FALSE, NULL, dummy_srtp_info); + "ZRTP", pinfo->num, RTP_MEDIA_AUDIO, NULL, dummy_srtp_info); srtp_add_address(pinfo, PT_UDP, &pinfo->net_dst, pinfo->destport, pinfo->srcport, - "ZRTP", pinfo->num, FALSE, NULL, dummy_srtp_info); + "ZRTP", pinfo->num, RTP_MEDIA_AUDIO, NULL, dummy_srtp_info); srtcp_add_address(pinfo, &pinfo->net_src, pinfo->srcport+1, pinfo->destport+1, "ZRTP", pinfo->num, dummy_srtp_info); |