kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert Jim's earlier "fix" :)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-05 19:23:23 +00:00
parent 5ad345f6b0
commit 68c634721a
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
channels/chan_zap.c
View File

@@ -3596,28 +3596,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
/* Call is already up, drop the last person */
if (option_debug)
ast_log(LOG_DEBUG, "Got flash with three way call up, dropping last call on %d\n", p->channel);
#if 0
jim 01/03/05
I have absolutely *NO* clue as to why the following was a
conditional. It caused a bug in which the WRONG call would
get hung up on in certain situations after a 3-way call. It
took us over *3 YEARS* to find out the exact conditions to
make the problem appear (which are first leg of call, inbound
or outbound is answered, you go over to a 3-way dialtone and
make a second call, then flash again before the second call
has answered (the channel going into STATE_UP condition).
Then, when you flash again, then first (original) call would
get dropped instead of the second one like it should.
I left the following conditional here (commented out, of course) so
that if theres any further issues with this, its here.
/* If the primary call isn't answered yet, use it */
if ((p->subs[SUB_REAL].owner->_state != AST_STATE_UP) &&
(p->subs[SUB_THREEWAY].owner->_state == AST_STATE_UP))
#endif
{
/* If the primary call isn't answered yet, use it */
if ((p->subs[SUB_REAL].owner->_state != AST_STATE_UP) && (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_UP)) {
/* Swap back -- we're droppign the real 3-way that isn't finished yet*/
swap_subs(p, SUB_THREEWAY, SUB_REAL);
p->owner = p->subs[SUB_REAL].owner;