From 5b83da2b789e7d002f43434bf77651344d3f57b7 Mon Sep 17 00:00:00 2001 From: file Date: Mon, 8 Oct 2007 15:05:05 +0000 Subject: Merged revisions 84990 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r84990 | file | 2007-10-08 12:03:07 -0300 (Mon, 08 Oct 2007) | 4 lines 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: http://svn.digium.com/svn/asterisk/trunk@84991 f38db490-d61c-443f-a65b-d21fe96a405b --- main/channel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'main') diff --git a/main/channel.c b/main/channel.c index 1976e111a..9d8fd0dd1 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4166,7 +4166,8 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha !nativefailed && !c0->monitor && !c1->monitor && !c0->audiohooks && !c1->audiohooks && !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); -- cgit v1.2.3