diff options
| author | tringenbach <tringenbach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-16 23:37:28 +0000 |
|---|---|---|
| committer | tringenbach <tringenbach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-16 23:37:28 +0000 |
| commit | 519a8173ce503744202953c51483b6340cd10346 (patch) | |
| tree | 20fa43ffa1259885a0bc01f74acb8fda0dba4782 | |
| parent | 8f40844b358cbcfd5e40c89acc7b07bb511222c6 (diff) | |
Merged revisions 277657 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r277657 | tringenbach | 2010-07-16 18:23:15 -0500 (Fri, 16 Jul 2010) | 16 lines
Merged revisions 277625 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r277625 | tringenbach | 2010-07-16 17:43:39 -0500 (Fri, 16 Jul 2010) | 9 lines
Save and restore AST_FLAG_BRIDGE_HANGUP_DONT on attended transfer.
ast_bridge_call() clears AST_FLAG_BRIDGE_HANGUP_DONT. But during an attended
transfer, ast_bridge_call() is called for a second bridge on the same channel,
and it clears that flag, which still needs to get set for when the original
ast_bridge_call() gets control back and checks it.
Review: https://reviewboard.asterisk.org/r/741
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@277666 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/features.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c index 7c0fbaef1..260f7f5c9 100644 --- a/main/features.c +++ b/main/features.c @@ -1480,6 +1480,8 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st xferto, atxfernoanswertimeout, &outstate, transferer->cid.cid_num, transferer->cid.cid_name, 1, transferer->language); if (!ast_check_hangup(transferer)) { + int hangup_dont = 0; + /* Transferer is up - old behaviour */ ast_indicate(transferer, -1); if (!newchan) { @@ -1501,7 +1503,18 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st memset(&bconfig,0,sizeof(struct ast_bridge_config)); ast_set_flag(&(bconfig.features_caller), AST_FEATURE_DISCONNECT); ast_set_flag(&(bconfig.features_callee), AST_FEATURE_DISCONNECT); + + /* ast_bridge_call clears AST_FLAG_BRIDGE_HANGUP_DONT, but we don't + want that to happen here because we're also in another bridge already + */ + if (ast_test_flag(chan, AST_FLAG_BRIDGE_HANGUP_DONT)) { + hangup_dont = 1; + } res = ast_bridge_call(transferer, newchan, &bconfig); + if (hangup_dont) { + ast_set_flag(chan, AST_FLAG_BRIDGE_HANGUP_DONT); + } + if (ast_check_hangup(newchan) || !ast_check_hangup(transferer)) { ast_hangup(newchan); if (ast_stream_and_wait(transferer, xfersound, "")) |