From: Richard Mudgett Date: Fri, 23 Jun 2017 16:17:51 +0000 (-0500) Subject: bridge_native_rtp.c: Fix direct media video RTP instance ACL check. X-Git-Tag: 14.7.0-rc1~146^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d21eb77d22e125fcdec08127a28ba691d073d9ed;p=thirdparty%2Fasterisk.git bridge_native_rtp.c: Fix direct media video RTP instance ACL check. The video stream was using the audio stream RTP instance addresses to check if the video RTP gets directed to an allowed direct media Access Control List (ACL) address. There is no guarantee that the video RTP instance uses the same addresses as the audio RTP instance. This looks like it has been a bug since v11 when direct media ACL was first added to chan_sip and then faithfully reproduced through a couple code refactorings into the new bridging architecture. Change-Id: I8ddd56320e0eea769f3ceed3fa5b6bdfb51d681a --- diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c index cf43050cdb..899523ed3a 100644 --- a/bridges/bridge_native_rtp.c +++ b/bridges/bridge_native_rtp.c @@ -184,10 +184,10 @@ static int rtp_glue_data_get(struct ast_channel *c0, struct rtp_glue_data *glue0 } } if (glue0->video.result == glue1->video.result && glue1->video.result == AST_RTP_GLUE_RESULT_REMOTE) { - if (glue0->cb->allow_vrtp_remote && !glue0->cb->allow_vrtp_remote(c0, glue1->audio.instance)) { - /* if the allow_vrtp_remote indicates that remote isn't allowed, revert to local bridge */ + if (glue0->cb->allow_vrtp_remote && !glue0->cb->allow_vrtp_remote(c0, glue1->video.instance)) { + /* If the allow_vrtp_remote indicates that remote isn't allowed, revert to local bridge */ glue0->video.result = glue1->video.result = AST_RTP_GLUE_RESULT_LOCAL; - } else if (glue1->cb->allow_vrtp_remote && !glue1->cb->allow_vrtp_remote(c1, glue0->audio.instance)) { + } else if (glue1->cb->allow_vrtp_remote && !glue1->cb->allow_vrtp_remote(c1, glue0->video.instance)) { glue0->video.result = glue1->video.result = AST_RTP_GLUE_RESULT_LOCAL; } }