diff options
| author | tringenbach <tringenbach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-16 23:23:15 +0000 |
|---|---|---|
| committer | tringenbach <tringenbach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-16 23:23:15 +0000 |
| commit | 4ed518d103fd76fa5ee1eb31958506dc5de5f39e (patch) | |
| tree | b3a390f61099e46262efe88efb03c4de701087eb /main | |
| parent | a6d19661c7277e91e4f4096766418dbd88bc7415 (diff) | |
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/trunk@277657 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -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 d5fc289f2..eaef42b1f 100644 --- a/main/features.c +++ b/main/features.c @@ -1839,6 +1839,8 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st ast_party_connected_line_init(&connected_line); if (!ast_check_hangup(transferer)) { + int hangup_dont = 0; + /* Transferer is up - old behaviour */ ast_indicate(transferer, -1); if (!newchan) { @@ -1871,7 +1873,18 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st ast_channel_lock(transferer); ast_party_connected_line_copy(&connected_line, &transferer->connected); ast_channel_unlock(transferer); + + /* 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, "")) |