diff options
| -rw-r--r-- | apps/app_dial.c | 9 | ||||
| -rw-r--r-- | apps/app_queue.c | 13 | ||||
| -rw-r--r-- | main/stasis_channels.c | 2 |
3 files changed, 7 insertions, 17 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 3b7434608..61b2c26a0 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1001,16 +1001,9 @@ static void do_forward(struct chanlist *o, struct cause_args *num, c = o->chan = NULL; num->nochan++; } else { - ast_channel_lock_both(c, in); 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_call_forward(c)); - ast_channel_unlock(in); - ast_channel_unlock(original); + ast_channel_call_forward(original)); /* Hangup the original channel now, in case we needed it */ ast_hangup(original); diff --git a/apps/app_queue.c b/apps/app_queue.c index 4d97db405..f71ddba05 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -4671,16 +4671,11 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte 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_forward(qe->chan, original, o->chan, NULL, "CANCEL", - ast_channel_call_forward(original)); - ast_channel_unlock(original); - ast_channel_unlock(qe->chan); + ast_channel_publish_dial_forward(qe->chan, original, o->chan, NULL, + "CANCEL", ast_channel_call_forward(original)); + /* Hangup the original channel now, in case we needed it */ ast_hangup(winner); continue; diff --git a/main/stasis_channels.c b/main/stasis_channels.c index eefb7a9f8..3522fb291 100644 --- a/main/stasis_channels.c +++ b/main/stasis_channels.c @@ -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); if (forwarded) { + ast_channel_lock(forwarded); forwarded_snapshot = ast_channel_snapshot_create(forwarded); + ast_channel_unlock(forwarded); if (!forwarded_snapshot) { return; } |