diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-06 22:04:42 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-06 22:04:42 +0000 |
commit | a56aa12de1335bd0feb3b716b534327495918efd (patch) | |
tree | ed6358e8acf3843f0166b819c4ee22030f566e61 /channel.c | |
parent | e762ec1d871bd990ea52cfa3b03b38be45f4d62a (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@37253 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -3483,7 +3483,8 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha (config->timelimit == 0) && (c0->tech->bridge == c1->tech->bridge) && !nativefailed && !c0->monitor && !c1->monitor && - !c0->spies && !c1->spies) { + !c0->spies && !c1->spies && !ast_test_flag(&(config->features_callee),AST_FEATURE_REDIRECT) && + !ast_test_flag(&(config->features_caller),AST_FEATURE_REDIRECT) ) { /* Looks like they share a bridge method and nothing else is in the way */ if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Attempting native bridge of %s and %s\n", c0->name, c1->name); |