diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-07-10 10:51:02 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-07-10 10:51:02 -0500 |
| commit | baa51a3bb513651cf429b1739cdcf481c4dc6cb8 (patch) | |
| tree | 2f24ffafcc51f6fbe56a7a44de466b949db398e7 | |
| parent | 66eb4f34cf822e89b8d19def31f64b2e4265bac0 (diff) | |
| parent | 22c4c1a0bac1bf42b2979bc689957f7e1a09c921 (diff) | |
Merge "bridge_native_rtp.c: Fix direct media video RTP instance ACL check." into 13
| -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 4e55a3e88..e25559363 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; } } |