kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Even more changes concerning r187426. Revised where locks are placed yet once again. ast_call() should not be called with a channel locked. could cause deadlock issues with local channels.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187673 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-04-10 15:49:16 +00:00
parent 2f048030bd
commit bd23adbc8a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/app_dial.c
View File

@@ -790,9 +790,10 @@ static void do_forward(struct chanlist *o,
ast_clear_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE); ast_clear_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE);
ast_channel_unlock(in);
ast_channel_unlock(c);
if (ast_call(c, tmpchan, 0)) { if (ast_call(c, tmpchan, 0)) {
ast_channel_unlock(in);
ast_channel_unlock(c);
ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan); ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan);
ast_clear_flag64(o, DIAL_STILLGOING); ast_clear_flag64(o, DIAL_STILLGOING);
ast_hangup(original); ast_hangup(original);
@@ -800,6 +801,10 @@ static void do_forward(struct chanlist *o,
c = o->chan = NULL; c = o->chan = NULL;
num->nochan++; num->nochan++;
} else { } else {
ast_channel_lock(c);
while (ast_channel_trylock(in)) {
CHANNEL_DEADLOCK_AVOIDANCE(c);
}
senddialevent(in, c, stuff); senddialevent(in, c, stuff);
if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID)) { if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID)) {
char cidname[AST_MAX_EXTENSION] = ""; char cidname[AST_MAX_EXTENSION] = "";