<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6860">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_sip: Crypto attribute not last but first on SDP media level.<br><br>This matches the behavior of the other SIP channel driver, chan_pjsip.<br><br>ASTERISK-27365<br><br>Change-Id: I8f23a51290a58b75816da2999ed1965441dfc5d6<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;">diff --git a/channels/chan_sip.c b/channels/chan_sip.c<br>index 120bdd1..edaa387 100644<br>--- a/channels/chan_sip.c<br>+++ b/channels/chan_sip.c<br>@@ -13806,11 +13806,11 @@<br> case SDP_AUDIO:<br> if (needaudio) {<br> add_content(resp, ast_str_buffer(m_audio));<br>- add_content(resp, ast_str_buffer(a_audio));<br>- add_content(resp, hold);<br> if (a_crypto) {<br> add_content(resp, a_crypto);<br> }<br>+ add_content(resp, ast_str_buffer(a_audio));<br>+ add_content(resp, hold);<br> } else {<br> add_content(resp, offer->decline_m_line);<br> }<br>@@ -13856,11 +13856,11 @@<br> /* generate new SDP from scratch, no offers */<br> if (needaudio) {<br> add_content(resp, ast_str_buffer(m_audio));<br>- add_content(resp, ast_str_buffer(a_audio));<br>- add_content(resp, hold);<br> if (a_crypto) {<br> add_content(resp, a_crypto);<br> }<br>+ add_content(resp, ast_str_buffer(a_audio));<br>+ add_content(resp, hold);<br> }<br> if (needvideo) { /* only if video response is appropriate */<br> add_content(resp, ast_str_buffer(m_video));<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6860">change 6860</a>. To unsubscribe, 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/6860"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8f23a51290a58b75816da2999ed1965441dfc5d6 </div>
<div style="display:none"> Gerrit-Change-Number: 6860 </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-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>