<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/5965">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
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bridge_native_rtp.c: Fix direct media video RTP instance ACL check.<br><br>The video stream was using the audio stream RTP instance addresses to<br>check if the video RTP gets directed to an allowed direct media Access<br>Control List (ACL) address.  There is no guarantee that the video RTP<br>instance uses the same addresses as the audio RTP instance.<br><br>This looks like it has been a bug since v11 when direct media ACL was<br>first added to chan_sip and then faithfully reproduced through a couple<br>code refactorings into the new bridging architecture.<br><br>Change-Id: I8ddd56320e0eea769f3ceed3fa5b6bdfb51d681a<br>---<br>M bridges/bridge_native_rtp.c<br>1 file changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c<br>index 4e55a3e..e255593 100644<br>--- a/bridges/bridge_native_rtp.c<br>+++ b/bridges/bridge_native_rtp.c<br>@@ -184,10 +184,10 @@<br>              }<br>     }<br>     if (glue0->video.result == glue1->video.result && glue1->video.result == AST_RTP_GLUE_RESULT_REMOTE) {<br>-              if (glue0->cb->allow_vrtp_remote && !glue0->cb->allow_vrtp_remote(c0, glue1->audio.instance)) {<br>-                       /* if the allow_vrtp_remote indicates that remote isn't allowed, revert to local bridge */<br>+               if (glue0->cb->allow_vrtp_remote && !glue0->cb->allow_vrtp_remote(c0, glue1->video.instance)) {<br>+                       /* If the allow_vrtp_remote indicates that remote isn't allowed, revert to local bridge */<br>                        glue0->video.result = glue1->video.result = AST_RTP_GLUE_RESULT_LOCAL;<br>-         } else if (glue1->cb->allow_vrtp_remote && !glue1->cb->allow_vrtp_remote(c1, glue0->audio.instance)) {<br>+                } else if (glue1->cb->allow_vrtp_remote && !glue1->cb->allow_vrtp_remote(c1, glue0->video.instance)) {<br>                         glue0->video.result = glue1->video.result = AST_RTP_GLUE_RESULT_LOCAL;<br>          }<br>     }<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/5965">change 5965</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/5965"/><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: I8ddd56320e0eea769f3ceed3fa5b6bdfb51d681a </div>
<div style="display:none"> Gerrit-Change-Number: 5965 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@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: Joshua Colp <jcolp@digium.com> </div>