[asterisk-commits] mmichelson: trunk r210027 - /trunk/main/channel.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Aug  3 09:29:17 2009
New Revision: 210027

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=210027
Log:
Fix order and redundancy of channel rename manager events in ast_do_masquerade.

Patch contributed by Mark Spencer.


Modified:
    trunk/main/channel.c

Modified: trunk/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/channel.c?view=diff&rev=210027&r1=210026&r2=210027
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Aug  3 09:29:17 2009
@@ -5024,18 +5024,14 @@
 	/* Create the masq name */
 	snprintf(masqn, sizeof(masqn), "%s<MASQ>", newn);
 
+	/* Mangle the name of the clone channel */
+	ast_change_name(clonechan, masqn);
+
 	/* Copy the name from the clone channel */
 	ast_change_name(original, newn);
 
-	/* Mangle the name of the clone channel */
-	ast_change_name(clonechan, masqn);
-
 	/* share linked id's */
 	ast_channel_set_linkgroup(original, clonechan);
-
-	/* Notify any managers of the change, first the masq then the other */
-	manager_event(EVENT_FLAG_CALL, "Rename", "Channel: %s\r\nNewname: %s\r\nUniqueid: %s\r\n", newn, masqn, clonechan->uniqueid);
-	manager_event(EVENT_FLAG_CALL, "Rename", "Channel: %s\r\nNewname: %s\r\nUniqueid: %s\r\n", orig, newn, original->uniqueid);
 
 	/* Swap the technologies */
 	t = original->tech;