<p>Torrey Searle has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/9376">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip_sdp_rtp: include ice in ANSWER only if offered<br><br>Keep track if ICE candidates were in the SDP offer & only put them<br>in the corresponding SDP answer if the offer condaind ICE candidates<br><br>ASTERISK-27957 #close<br><br>Change-Id: Idf2597ee48e9a287e07aa4030bfa705430a13a92<br>---<br>M include/asterisk/res_pjsip_session.h<br>M res/res_pjsip_sdp_rtp.c<br>M res/res_pjsip_session.c<br>3 files changed, 40 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/76/9376/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h</span><br><span>index 464167c..315aa46 100644</span><br><span>--- a/include/asterisk/res_pjsip_session.h</span><br><span>+++ b/include/asterisk/res_pjsip_session.h</span><br><span>@@ -85,6 +85,8 @@</span><br><span>         unsigned int held:1;</span><br><span>         /*! \brief Does remote support rtcp_mux */</span><br><span>   unsigned int remote_rtcp_mux:1;</span><br><span style="color: hsl(120, 100%, 40%);">+       /*! \brief Does remote support ice */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int remote_ice:1;</span><br><span>   /*! \brief Stream type this session media handles */</span><br><span>         char stream_type[1];</span><br><span> };</span><br><span>diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c</span><br><span>index 5852027..fe50e7a 100644</span><br><span>--- a/res/res_pjsip_sdp_rtp.c</span><br><span>+++ b/res/res_pjsip_sdp_rtp.c</span><br><span>@@ -531,6 +531,10 @@</span><br><span>           return;</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!session_media->remote_ice) {</span><br><span style="color: hsl(120, 100%, 40%);">+          return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  if ((username = ice->get_ufrag(session_media->rtp))) {</span><br><span>                 attr = pjmedia_sdp_attr_create(pool, "ice-ufrag", pj_cstr(&stmp, username));</span><br><span>           media->attr[media->attr_count++] = attr;</span><br><span>@@ -576,6 +580,36 @@</span><br><span>        ao2_ref(candidates, -1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Function which checks for ice attributes in an audio stream */</span><br><span style="color: hsl(120, 100%, 40%);">+static void check_ice_support(struct ast_sip_session *session, struct ast_sip_session_media *session_media,</span><br><span style="color: hsl(120, 100%, 40%);">+                                const struct pjmedia_sdp_session *remote, const struct pjmedia_sdp_media *remote_stream)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        struct ast_rtp_engine_ice *ice;</span><br><span style="color: hsl(120, 100%, 40%);">+       const pjmedia_sdp_attr *attr;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int attr_i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!session->endpoint->media.rtp.ice_support || !(ice = ast_rtp_instance_get_ice(session_media->rtp))) {</span><br><span style="color: hsl(120, 100%, 40%);">+            session_media->remote_ice = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+             return;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   /* Find all of the candidates */</span><br><span style="color: hsl(120, 100%, 40%);">+      for (attr_i = 0; attr_i < remote_stream->attr_count; ++attr_i) {</span><br><span style="color: hsl(120, 100%, 40%);">+                attr = remote_stream->attr[attr_i];</span><br><span style="color: hsl(120, 100%, 40%);">+                if (!pj_strcmp2(&attr->name, "candidate")) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 session_media->remote_ice = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                     break;</span><br><span style="color: hsl(120, 100%, 40%);">+                }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if (attr_i == remote_stream->attr_count) {</span><br><span style="color: hsl(120, 100%, 40%);">+         session_media->remote_ice = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! \brief Function which processes ICE attributes in an audio stream */</span><br><span> static void process_ice_attributes(struct ast_sip_session *session, struct ast_sip_session_media *session_media,</span><br><span>                                    const struct pjmedia_sdp_session *remote, const struct pjmedia_sdp_media *remote_stream)</span><br><span>@@ -1033,6 +1067,9 @@</span><br><span>          pj_strdup(session->inv_session->pool, &session_media->transport, &stream->desc.transport);</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* If ICE support is enabled find all the needed attributes */</span><br><span style="color: hsl(120, 100%, 40%);">+        check_ice_support(session, session_media, sdp, stream);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    if (set_caps(session, session_media, stream)) {</span><br><span>              return 0;</span><br><span>    }</span><br><span>diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c</span><br><span>index 086da62..8eaeb31 100644</span><br><span>--- a/res/res_pjsip_session.c</span><br><span>+++ b/res/res_pjsip_session.c</span><br><span>@@ -1341,6 +1341,7 @@</span><br><span>           return CMP_STOP;</span><br><span>     }</span><br><span>    session_media->encryption = session->endpoint->media.rtp.encryption;</span><br><span style="color: hsl(120, 100%, 40%);">+ session_media->remote_ice = session->endpoint->media.rtp.ice_support;</span><br><span>       session_media->keepalive_sched_id = -1;</span><br><span>   session_media->timeout_sched_id = -1;</span><br><span>     /* Safe use of strcpy */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9376">change 9376</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/9376"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Idf2597ee48e9a287e07aa4030bfa705430a13a92 </div>
<div style="display:none"> Gerrit-Change-Number: 9376 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Torrey Searle <tsearle@gmail.com> </div>