<p>Alexander Traud has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15271">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_sip: Hold/Resume an sRTP call which had other/less media streams.<br><br>For example, when resuming a call with audio+video, but the session<br>was audio-only before the hold, Asterisk ended the call.<br><br>ASTERISK-29222<br><br>Change-Id: Ie49e4e2a11f0265f914b684738348ba8c0f89755<br>---<br>M channels/chan_sip.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/71/15271/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_sip.c b/channels/chan_sip.c</span><br><span>index 7218889..b2de5ff 100644</span><br><span>--- a/channels/chan_sip.c</span><br><span>+++ b/channels/chan_sip.c</span><br><span>@@ -10878,11 +10878,11 @@</span><br><span>             }</span><br><span> </span><br><span>                /* Ensure crypto lines are provided where necessary */</span><br><span style="color: hsl(0, 100%, 40%);">-          if (audio && secure_audio && !processed_crypto) {</span><br><span style="color: hsl(120, 100%, 40%);">+             if (p->rtp && audio && secure_audio && !processed_crypto) {</span><br><span>                       ast_log(LOG_WARNING, "Rejecting secure audio stream without encryption details: %s\n", m);</span><br><span>                         res = -1;</span><br><span>                    goto process_sdp_cleanup;</span><br><span style="color: hsl(0, 100%, 40%);">-               } else if (video && secure_video && !processed_crypto) {</span><br><span style="color: hsl(120, 100%, 40%);">+              } else if (p->vrtp && video && secure_video && !processed_crypto) {</span><br><span>                       ast_log(LOG_WARNING, "Rejecting secure video stream without encryption details: %s\n", m);</span><br><span>                         res = -1;</span><br><span>                    goto process_sdp_cleanup;</span><br><span>@@ -10911,7 +10911,7 @@</span><br><span>          p->srtp = NULL;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (secure_audio && !(p->srtp && (ast_test_flag(p->srtp, AST_SRTP_CRYPTO_OFFER_OK)))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (p->rtp && secure_audio && !(p->srtp && ast_test_flag(p->srtp, AST_SRTP_CRYPTO_OFFER_OK))) {</span><br><span>             ast_log(LOG_WARNING, "Can't provide secure audio requested in SDP offer\n");</span><br><span>           res = -1;</span><br><span>            goto process_sdp_cleanup;</span><br><span>@@ -10923,7 +10923,7 @@</span><br><span>          goto process_sdp_cleanup;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (secure_video && !(p->vsrtp && (ast_test_flag(p->vsrtp, AST_SRTP_CRYPTO_OFFER_OK)))) {</span><br><span style="color: hsl(120, 100%, 40%);">+       if (p->vrtp && secure_video && !(p->vsrtp && ast_test_flag(p->vsrtp, AST_SRTP_CRYPTO_OFFER_OK))) {</span><br><span>          ast_log(LOG_WARNING, "Can't provide secure video requested in SDP offer\n");</span><br><span>           res = -1;</span><br><span>            goto process_sdp_cleanup;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15271">change 15271</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15271"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: Ie49e4e2a11f0265f914b684738348ba8c0f89755 </div>
<div style="display:none"> Gerrit-Change-Number: 15271 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>