From: Jonathan Rose Date: Fri, 15 Feb 2013 17:33:32 +0000 (+0000) Subject: chan_sip: Use video and text crypto attributes to append RTP profiles to SDP X-Git-Tag: 13.0.0-beta1~2089 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f008baddac22ba72415909ea65ac25a8a076836b;p=thirdparty%2Fasterisk.git chan_sip: Use video and text crypto attributes to append RTP profiles to SDP Some bad copy/pasting resulted in using the audio crypto attribute for both text and video RTP. Also the audio crypto isn't set until after these, so it was really just bad all around. (closes ASTERISK-20905) Reported by: Kristopher Lalletti patches: rtp_crypto_video_text.diff uploaded by Jonathan Rose (license 6182) ........ Merged revisions 381553 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381556 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f6c8b90c06..ab30761af5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13165,7 +13165,7 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int if (needvideo) { get_crypto_attrib(p, p->vsrtp, &v_a_crypto); ast_str_append(&m_video, 0, "m=video %d %s", ast_sockaddr_port(&vdest), - get_sdp_rtp_profile(p, a_crypto ? 1 : 0, p->vrtp)); + get_sdp_rtp_profile(p, v_a_crypto ? 1 : 0, p->vrtp)); /* Build max bitrate string */ if (p->maxcallbitrate) @@ -13190,7 +13190,7 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int ast_verbose("Lets set up the text sdp\n"); get_crypto_attrib(p, p->tsrtp, &t_a_crypto); ast_str_append(&m_text, 0, "m=text %d %s", ast_sockaddr_port(&tdest), - get_sdp_rtp_profile(p, a_crypto ? 1 : 0, p->trtp)); + get_sdp_rtp_profile(p, t_a_crypto ? 1 : 0, p->trtp)); if (debug) { /* XXX should I use tdest below ? */ ast_verbose("Text is at %s\n", ast_sockaddr_stringify(&taddr)); }