[Asterisk-cvs] asterisk channel.c,1.162,1.163

markster at lists.digium.com markster at lists.digium.com
Sun Jan 9 22:19:21 CST 2005


Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv28698

Modified Files:
	channel.c 
Log Message:
Handle masq properly with music (bug #3235)


Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- channel.c	9 Jan 2005 09:42:54 -0000	1.162
+++ channel.c	10 Jan 2005 04:23:39 -0000	1.163
@@ -2336,7 +2336,7 @@
 	char orig[100];
 	char masqn[100];
 	char zombn[100];
-	
+
 #if 1
 	ast_log(LOG_DEBUG, "Actually Masquerading %s(%d) into the structure of %s(%d)\n",
 		clone->name, clone->_state, original->name, original->_state);
@@ -2478,6 +2478,9 @@
 	/* Set the read format */
 	ast_set_read_format(original, rformat);
 
+	/* Copy the music class */
+	strncpy(original->musicclass, clone->musicclass, sizeof(original->musicclass) - 1);
+
 	ast_log(LOG_DEBUG, "Putting channel %s in %d/%d formats\n", original->name, wformat, rformat);
 
 	/* Okay.  Last thing is to let the channel driver know about all this mess, so he




More information about the svn-commits mailing list