sysmocom/asterisk
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "chan_sip: Prevent deadlock when performing BYE with Also transfer." into 11

Browse source
This commit is contained in:
Matt Jordan 2015-06-16 09:59:31 -05:00 committed by Gerrit Code Review
commit 353dd68cd0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
channels/chan_sip.c
View file

@ -26986,11 +26986,14 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req)
if (bridged_to) { if (bridged_to) {
/* Don't actually hangup here... */ /* Don't actually hangup here... */
ast_queue_control(c, AST_CONTROL_UNHOLD); ast_queue_control(c, AST_CONTROL_UNHOLD);
sip_pvt_unlock(p);
ast_channel_unlock(c); /* async_goto can do a masquerade, no locks can be held during a masq */ ast_channel_unlock(c); /* async_goto can do a masquerade, no locks can be held during a masq */
ast_async_goto(bridged_to, p->context, p->refer->refer_to, 1); ast_async_goto(bridged_to, p->context, p->refer->refer_to, 1);
ast_channel_lock(c); ast_channel_lock(c);
} else sip_pvt_lock(p);
} else {
ast_queue_hangup(p->owner); ast_queue_hangup(p->owner);
}
} }
} else { } else {
ast_log(LOG_WARNING, "Invalid transfer information from '%s'\n", ast_sockaddr_stringify(&p->recv)); ast_log(LOG_WARNING, "Invalid transfer information from '%s'\n", ast_sockaddr_stringify(&p->recv));