From 2baeb29ae420044297ac6b1875e27dce5fbb5d10 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 8 Oct 2007 15:03:07 +0000 Subject: [PATCH] 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 --- main/channel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/channel.c b/main/channel.c index 0b7fe4027d..68bc047c40 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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);