kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a SIP transfer deadlock.

Browse Source 
The locking in this function is very scary.  There are like 6 structs involved.

(closes issue AST-470)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@329994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2011-07-28 15:45:24 +00:00
parent 1067b58cd3
commit 31bc8710d7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_sip.c
View File

@@ -22583,8 +22583,6 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
ast_do_masquerade(target.chan1);
sip_pvt_lock(transferer); /* the transferer pvt is expected to remain locked on return */
ast_indicate(target.chan1, AST_CONTROL_UNHOLD);
if (target.chan2) {
ast_indicate(target.chan2, AST_CONTROL_UNHOLD);
@@ -22625,6 +22623,8 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
ast_channel_queue_connected_line_update(target.chan1, &connected_to_transferee, NULL);
}
sip_pvt_lock(transferer); /* the transferer pvt is expected to remain locked on return */
ast_channel_unref(current->chan1);
}