channel.c: MOH is not working for transferee after attended transfer

Updated the code to check to see if MOH is playing on the transferor and if
so then start it on the channel that replaces it during a masquerade.

Example scenario of the problem:
Alice calls Bob and then Bob begins the attended transfer process into a queue.
Upon going on hold Alice hears music and so does Bob once he is in the queue.
Bob then transfers Alice into the queue and then music for Alice stops even
though she should be hearing it since has now replaced Bob in the queue.

The problem that was occurring is that once the channel was masqueraded the app
(queues, confbridge, etc...) had no way of knowing that the channel had just
been swapped out thus it did not start music for the present channel.

Credit to Olle Johansson for pointing me in the right direction on this issue.

(closes issue ASTERISK-19499)
Reported by: Timo Teräs
Review: https://reviewboard.asterisk.org/r/3226/
........

Merged revisions 408642 from http://svn.asterisk.org/svn/asterisk/branches/1.8

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@408643 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 32439d9e1edd1cc8f988244b1bf3815739d9a5a5..0c61fcda87e0da512a890271d74f0719d33ab6da 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -24446,7 +24446,9 @@ static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target
 
        if (peera && peerb && peerc && (peerb != peerc)) {
                ast_quiet_chan(peera);          /* Stop generators */
-               ast_quiet_chan(peerb);
+               /* no need to quiet peerb since it should be hungup after the
+                  transfer and the masquerade needs to be able to see if MOH is
+                  playing on it */
                ast_quiet_chan(peerc);
                if (peerd)
                        ast_quiet_chan(peerd);
@@ -26103,7 +26105,6 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
 
                ast_do_masquerade(target.chan1);
 
-               ast_indicate(target.chan1, AST_CONTROL_UNHOLD);
                if (target.chan2) {
                        ast_indicate(target.chan2, AST_CONTROL_UNHOLD);
                }

diff --git a/main/channel.c b/main/channel.c
index de0affdc6a3865fcdaf9df9e2cf311bfaf1538f9..a100aea53440cb31865addd7891bc4130ff38c13 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -6821,6 +6821,7 @@ int ast_do_masquerade(struct ast_channel *original)
        unsigned int orig_disablestatecache;
        unsigned int clone_disablestatecache;
        int visible_indication;
+       int moh_is_playing;
        int clone_was_zombie = 0;/*!< TRUE if the clonechan was a zombie before the masquerade. */
        struct ast_frame *current;
        const struct ast_channel_tech *t;
@@ -6915,6 +6916,8 @@ int ast_do_masquerade(struct ast_channel *original)
                xfer_colp = NULL;
        }
 
+       moh_is_playing = ast_test_flag(ast_channel_flags(original), AST_FLAG_MOH);
+
        /*
         * Stop any visible indication on the original channel so we can
         * transfer it to the clonechan taking the original's place.
@@ -7258,6 +7261,12 @@ int ast_do_masquerade(struct ast_channel *original)
                ast_indicate(original, visible_indication);
        }
 
+       /* if moh is playing on the original channel then it needs to be
+          maintained on the channel that is replacing it. */
+       if (moh_is_playing) {
+               ast_moh_start(original, NULL, NULL);
+       }
+
        ast_channel_lock(original);
 
        /* Signal any blocker */