<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6028">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Matthew Fredrickson: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_rtp_asterisk: Use RTP component for ICE if RTCP-MUX is in use.<br><br>This change makes it so that if an RTCP packet is being sent<br>the RTP ICE component is used for sending if RTCP-MUX is in use.<br><br>ASTERISK-27133<br><br>Change-Id: I6200f611ede709602ee9b89501720c29545ed68b<br>---<br>M res/res_rtp_asterisk.c<br>1 file changed, 7 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c<br>index 9d3969f..a2e63ec 100644<br>--- a/res/res_rtp_asterisk.c<br>+++ b/res/res_rtp_asterisk.c<br>@@ -2650,8 +2650,14 @@<br> <br> #ifdef HAVE_PJPROJECT<br>      if (transport_rtp->ice) {<br>+         enum ast_rtp_ice_component_type component = rtcp ? AST_RTP_ICE_COMPONENT_RTCP : AST_RTP_ICE_COMPONENT_RTP;<br>            pj_status_t status;<br>           struct ice_wrap *ice;<br>+<br>+             /* If RTCP is sharing the same socket then use the same component */<br>+         if (rtcp && rtp->rtcp->s == rtp->s) {<br>+                       component = AST_RTP_ICE_COMPONENT_RTP;<br>+               }<br> <br>          pj_thread_register_check();<br> <br>@@ -2661,8 +2667,7 @@<br>                 if (instance == transport) {<br>                  ao2_unlock(instance);<br>                 }<br>-            status = pj_ice_sess_send_data(ice->real_ice,<br>-                     rtcp ? AST_RTP_ICE_COMPONENT_RTCP : AST_RTP_ICE_COMPONENT_RTP, temp, len);<br>+           status = pj_ice_sess_send_data(ice->real_ice, component, temp, len);<br>               ao2_ref(ice, -1);<br>             if (instance == transport) {<br>                  ao2_lock(instance);<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6028">change 6028</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/6028"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6200f611ede709602ee9b89501720c29545ed68b </div>
<div style="display:none"> Gerrit-Change-Number: 6028 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@digium.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: Matthew Fredrickson <creslin@digium.com> </div>