kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 04:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 69661 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69661 | file | 2007-06-18 11:46:32 -0400 (Mon, 18 Jun 2007) | 2 lines

Few minor transfer tweaks. We can't unlock something we never locked, and better handle a specific scenario with doing an attended transfer between two non-bridged calls.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-06-18 15:48:05 +00:00
parent 2b3968410f
commit 3e4980da79
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_sip.c
View File

@@ -13669,7 +13669,7 @@ static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target
ast_softhangup_nolock(transferer->chan1, AST_SOFTHANGUP_DEV);
if (target->chan1)
ast_softhangup_nolock(target->chan1, AST_SOFTHANGUP_DEV);
return -1;
return -2;
}
return 0;
}
@@ -14587,7 +14587,8 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
if (targetcall_pvt->owner)
ast_channel_unlock(targetcall_pvt->owner);
/* Right now, we have to hangup, sorry. Bridge is destroyed */
ast_hangup(transferer->owner);
if (res != -2)
ast_hangup(transferer->owner);
} else {
/* Transfer succeeded! */
@@ -14877,7 +14878,6 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int
be accessible after the transfer! */
*nounlock = 1;
ast_channel_unlock(current.chan1);
ast_channel_unlock(current.chan2);
/* Connect the call */