diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-07-10 10:53:11 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-07-10 10:53:11 -0500 |
commit | 789475336bd24f30c53fda390a79f3c98f660b9c (patch) | |
tree | bdef839ba93fbe97a2252ce15a33d334dc668d60 | |
parent | 17103ca898f077846c4b1430091ba37454476844 (diff) | |
parent | 1028f64be478d7197dff3f7be6615c802d773a60 (diff) |
Merge "bridge_native_rtp.c: Fix direct media video RTP instance ACL check."
-rw-r--r-- | bridges/bridge_native_rtp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c index a459c9ce7..02b27e123 100644 --- a/bridges/bridge_native_rtp.c +++ b/bridges/bridge_native_rtp.c @@ -182,10 +182,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; } } |