diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-08 15:03:07 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-08 15:03:07 +0000 |
| commit | e4d3ecbb98d506cd1b3de8deaa1de1219007ca42 (patch) | |
| tree | fb71500ed3e0077a991bb5be3b4033285b314147 /main/channel.c | |
| parent | 97ee3bf3826c7ff2131b965ff6609508a65e0bdc (diff) | |
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/branches/1.4@84990 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 0b7fe4027..68bc047c4 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); |