mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Fix order and redundancy of channel rename manager events in ast_do_masquerade.
Patch contributed by Mark Spencer. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@210027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -5024,19 +5024,15 @@ int ast_do_masquerade(struct ast_channel *original)
|
||||
/* Create the masq name */
|
||||
snprintf(masqn, sizeof(masqn), "%s<MASQ>", newn);
|
||||
|
||||
/* Copy the name from the clone channel */
|
||||
ast_change_name(original, 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);
|
||||
|
||||
/* 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;
|
||||
original->tech = clonechan->tech;
|
||||
|
Reference in New Issue
Block a user