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

app_dial and app_queue: Make lock the forwarding channel while taking the channel snapshot.

Browse Source 
* Fixed ast_channel_publish_dial_forward() not locking the forwarded
channel when taking the channel snapshot.

* Fixed app_dial.c:do_forward() using the wrong channel to get the
original call forwarding string.

* Removed unnecessary locking when calling ast_channel_publish_dial() and
ast_channel_publish_dial_forward() in app_dial and app_queue.  Holding
channel locks when calling ast_channel_publish_dial_forward() with a
forwarded channel could result in pausing the system while the stasis bus
completes processsing a forwarded channel subscription.

Review: https://reviewboard.asterisk.org/r/3451/
........

Merged revisions 412579 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-04-18 16:27:31 +00:00
parent 9a85fc0aa0
commit cbe7f65674
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/app_dial.c
View File

@@ -1001,16 +1001,9 @@ static void do_forward(struct chanlist *o, struct cause_args *num,
c = o->chan = NULL; c = o->chan = NULL;
num->nochan++; num->nochan++;
} else { } else {
ast_channel_lock_both(c, in);
ast_channel_publish_dial(in, c, stuff, NULL); ast_channel_publish_dial(in, c, stuff, NULL);
ast_channel_unlock(in);
ast_channel_unlock(c);
ast_channel_lock_both(original, in);
ast_channel_publish_dial_forward(in, original, c, NULL, "CANCEL", ast_channel_publish_dial_forward(in, original, c, NULL, "CANCEL",
ast_channel_call_forward(c)); ast_channel_call_forward(original));
ast_channel_unlock(in);
ast_channel_unlock(original);
/* Hangup the original channel now, in case we needed it */ /* Hangup the original channel now, in case we needed it */
ast_hangup(original); ast_hangup(original);

13
apps/app_queue.c
View File

@@ -4671,16 +4671,11 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
numnochan++; numnochan++;
} }
} }
ast_channel_lock_both(qe->chan, o->chan);
ast_channel_publish_dial(qe->chan, o->chan, stuff, NULL);
ast_channel_unlock(o->chan);
ast_channel_unlock(qe->chan);
ast_channel_lock_both(qe->chan, original); ast_channel_publish_dial(qe->chan, o->chan, stuff, NULL);
ast_channel_publish_dial_forward(qe->chan, original, o->chan, NULL, "CANCEL", ast_channel_publish_dial_forward(qe->chan, original, o->chan, NULL,
ast_channel_call_forward(original)); "CANCEL", ast_channel_call_forward(original));
ast_channel_unlock(original);
ast_channel_unlock(qe->chan);
/* Hangup the original channel now, in case we needed it */ /* Hangup the original channel now, in case we needed it */
ast_hangup(winner); ast_hangup(winner);
continue; continue;

2
main/stasis_channels.c
View File

@@ -336,7 +336,9 @@ void ast_channel_publish_dial_forward(struct ast_channel *caller, struct ast_cha
ast_multi_channel_blob_add_channel(payload, "peer", peer_snapshot); ast_multi_channel_blob_add_channel(payload, "peer", peer_snapshot);
if (forwarded) { if (forwarded) {
ast_channel_lock(forwarded);
forwarded_snapshot = ast_channel_snapshot_create(forwarded); forwarded_snapshot = ast_channel_snapshot_create(forwarded);
ast_channel_unlock(forwarded);
if (!forwarded_snapshot) { if (!forwarded_snapshot) {
return; return;
} }