[svn-commits] russell: branch russell/issue_13747 r163693 - /team/russell/issue_13747/main/

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Dec 12 13:20:27 2008
New Revision: 163693

URL: http://svn.digium.com/view/asterisk?view=rev&rev=163693
Log:
Expand on the comment about the indication handling in do_masq

Modified:
    team/russell/issue_13747/main/channel.c

Modified: team/russell/issue_13747/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/russell/issue_13747/main/channel.c?view=diff&rev=163693&r1=163692&r2=163693
==============================================================================
--- team/russell/issue_13747/main/channel.c (original)
+++ team/russell/issue_13747/main/channel.c Fri Dec 12 13:20:27 2008
@@ -3695,9 +3695,17 @@
 		ast_log(LOG_WARNING, "Channel type '%s' does not have a fixup routine (for %s)!  Bad things may happen.\n",
 			original->tech->type, original->name);
 
-	/* If an indication is currently playing maintain it on the channel that is taking the place of original */
-	if (original->visible_indication)
+	/* 
+	 * If an indication is currently playing, maintain it on the channel 
+	 * that is taking the place of original 
+	 *
+	 * This is needed because the masquerade is swapping out in the internals
+	 * of this channel, and the new channel private data needs to be made
+	 * aware of the current visible indication (RINGING, CONGESTION, etc.)
+	 */
+	if (original->visible_indication) {
 		ast_indicate(original, original->visible_indication);
+	}
 	
 	/* Now, at this point, the "clone" channel is totally F'd up.  We mark it as
 	   a zombie so nothing tries to touch it.  If it's already been marked as a