mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 20:04:50 +00:00
Don't keep trying to native bridge if either of the channels are involved in a masquerade operation to be done.
(closes issue #10696) Reported by: tbelder git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -4270,7 +4270,8 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
|
||||
(c0->tech->bridge == c1->tech->bridge) &&
|
||||
!nativefailed && !c0->monitor && !c1->monitor &&
|
||||
!c0->spies && !c1->spies && !ast_test_flag(&(config->features_callee),AST_FEATURE_REDIRECT) &&
|
||||
!ast_test_flag(&(config->features_caller),AST_FEATURE_REDIRECT) ) {
|
||||
!ast_test_flag(&(config->features_caller),AST_FEATURE_REDIRECT) &&
|
||||
!c0->masq && !c0->masqr && !c1->masq && !c1->masqr) {
|
||||
/* Looks like they share a bridge method and nothing else is in the way */
|
||||
ast_set_flag(c0, AST_FLAG_NBRIDGE);
|
||||
ast_set_flag(c1, AST_FLAG_NBRIDGE);
|
||||
|
Reference in New Issue
Block a user