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

* 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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 3b7434608968d4b937bf4739772b67d2821d4f4c..61b2c26a090fc2d94095b27f6a9a1d0cc1958593 100644 (file)
--- 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 4d97db4059a1ada808be1a0cc059099ade1c17d4..f71ddba05f581bd3fdaa97776429c27b594168d5 100644 (file)
--- 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 eefb7a9f8f18c32d3356bc293f6f2ea696492f84..3522fb2910a612bbcb5ce7b3657134995c6f3ee7 100644 (file)
--- 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;
                }