summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt O'Gorman <mogorman@digium.com>2006-07-06 21:36:17 +0000
committerMatt O'Gorman <mogorman@digium.com>2006-07-06 21:36:17 +0000
commitcf86ee84cabc059434f71d2c8b1cff12328ba069 (patch)
tree1bdb82715de49942df368bba99b33d9a57a4d369
parent748431f7b6375e0006937e8c9fbcdaed5779ca0a (diff)
patch resolves issue with when to decide if its right time
to native bridge, feature redirect was not being checked. patch from bug #7296 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37223 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/channel.c b/channel.c
index 86eae160b..e431bd112 100644
--- a/channel.c
+++ b/channel.c
@@ -3593,7 +3593,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 */
ast_set_flag(c0, AST_FLAG_NBRIDGE);
ast_set_flag(c1, AST_FLAG_NBRIDGE);