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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res/res_pjsip_sdp_rtp:  put rtcp-mux in answer only if offered<br><br>If in the initial sdp the caller doesn't include the line<br>a=rtcp-mux<br><br>Then asterisk shoud not include rtcp-mux in the response regardless<br>of rtcp-mux being enabled on the endpoint<br><br>ASTERISK-28007 #close<br><br>Change-Id: I58e9b9f40a139afc0da5de41906cc608fb62adc7<br>---<br>M res/res_pjsip_sdp_rtp.c<br>M res/res_pjsip_session.c<br>2 files changed, 3 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c</span><br><span>index 03e5063..359d9c1 100644</span><br><span>--- a/res/res_pjsip_sdp_rtp.c</span><br><span>+++ b/res/res_pjsip_sdp_rtp.c</span><br><span>@@ -1796,8 +1796,8 @@</span><br><span>        attr->name = !session_media->locally_held ? STR_SENDRECV : STR_SENDONLY;</span><br><span>       media->attr[media->attr_count++] = attr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      /* If we've got rtcp-mux enabled, just unconditionally offer it in all SDPs */</span><br><span style="color: hsl(0, 100%, 40%);">-      if (session->endpoint->media.rtcp_mux) {</span><br><span style="color: hsl(120, 100%, 40%);">+        /* If we've got rtcp-mux enabled, add it unless we received an offer without it */</span><br><span style="color: hsl(120, 100%, 40%);">+        if (session->endpoint->media.rtcp_mux && session_media->remote_rtcp_mux) {</span><br><span>          attr = pjmedia_sdp_attr_create(pool, "rtcp-mux", NULL);</span><br><span>            pjmedia_sdp_attr_add(&media->attr_count, media->attr, attr);</span><br><span>       }</span><br><span>diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c</span><br><span>index 3bb1ef4..244b8cc 100644</span><br><span>--- a/res/res_pjsip_session.c</span><br><span>+++ b/res/res_pjsip_session.c</span><br><span>@@ -445,6 +445,7 @@</span><br><span> </span><br><span>                 session_media->encryption = session->endpoint->media.rtp.encryption;</span><br><span>                session_media->remote_ice = session->endpoint->media.rtp.ice_support;</span><br><span style="color: hsl(120, 100%, 40%);">+                session_media->remote_rtcp_mux = session->endpoint->media.rtcp_mux;</span><br><span>                 session_media->keepalive_sched_id = -1;</span><br><span>           session_media->timeout_sched_id = -1;</span><br><span>             session_media->type = type;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9891">change 9891</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/9891"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I58e9b9f40a139afc0da5de41906cc608fb62adc7 </div>
<div style="display:none"> Gerrit-Change-Number: 9891 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Torrey Searle <tsearle@gmail.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>