<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/5817">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  Kevin Harwell: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">SDP: Search for the ice-lite attribute in the right place.<br><br>* Pulled finding the rtcp-mux attribute flag out of the ICE candidate for<br>loop.  Also ordered the RTCP ICE candidate skip test to fail earlier.<br><br>Change-Id: I8905d9c68563027a46cd3ae14dbcc27e9c814809<br>---<br>M main/sdp_state.c<br>1 file changed, 7 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/sdp_state.c b/main/sdp_state.c<br>index f27da21..0f06bf9 100644<br>--- a/main/sdp_state.c<br>+++ b/main/sdp_state.c<br>@@ -875,6 +875,7 @@<br> {<br>      struct ast_rtp_engine_ice *ice;<br>       const struct ast_sdp_a_line *attr;<br>+   const struct ast_sdp_a_line *attr_rtcp_mux;<br>   unsigned int attr_i;<br> <br>       /* If ICE support is not enabled or available exit early */<br>@@ -902,9 +903,11 @@<br>             return;<br>       }<br> <br>- if (ast_sdp_m_find_attribute(remote_m_line, "ice-lite", -1)) {<br>+     if (ast_sdp_find_attribute(remote_sdp, "ice-lite", -1)) {<br>           ice->ice_lite(rtp);<br>        }<br>+<br>+ attr_rtcp_mux = ast_sdp_m_find_attribute(remote_m_line, "rtcp-mux", -1);<br> <br>         /* Find all of the candidates */<br>      for (attr_i = 0; attr_i < ast_sdp_m_get_a_count(remote_m_line); ++attr_i) {<br>@@ -931,9 +934,9 @@<br>                   continue;<br>             }<br> <br>-         if (ast_sdp_options_get_rtcp_mux(options)<br>-                    && ast_sdp_m_find_attribute(remote_m_line, "rtcp-mux", -1)<br>-                 && candidate.id > 1) {<br>+            if (candidate.id > 1<br>+                      && attr_rtcp_mux<br>+                     && ast_sdp_options_get_rtcp_mux(options)) {<br>                   /* Remote side may have offered RTP and RTCP candidates. However, if we're using RTCP MUX,<br>                         * then we should ignore RTCP candidates.<br>                      */<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/5817">change 5817</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/5817"/><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: I8905d9c68563027a46cd3ae14dbcc27e9c814809 </div>
<div style="display:none"> Gerrit-Change-Number: 5817 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>