kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bridge application occasionally returning to the wrong location.

Browse Source 
* Fix do_bridge_masquerade() getting the resume location from the zombie
channel.  The code must not touch a clone channel after it has masqueraded
it.  The clone channel has become a zombie and is starting to hangup.

(closes issue ASTERISK-19985)
Reported by: jamicque
Patches:
      jira_asterisk_19985_v1.8.patch (license #5621) patch uploaded by rmudgett
Tested by: jamicque
........

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

Merged revisions 369328 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-06-25 16:07:02 +00:00
parent 453e01725d
commit d0fda07d74
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/features.c
View File

@@ -7138,8 +7138,15 @@ static char *handle_features_reload(struct ast_cli_entry *e, int cmd, struct ast
*/ */
static int do_bridge_masquerade(struct ast_channel *chan, struct ast_channel *tmpchan) static int do_bridge_masquerade(struct ast_channel *chan, struct ast_channel *tmpchan)
{ {
const char *context;
const char *exten;
int priority;
ast_moh_stop(chan); ast_moh_stop(chan);
ast_channel_lock_both(chan, tmpchan); ast_channel_lock_both(chan, tmpchan);
context = ast_strdupa(ast_channel_context(chan));
exten = ast_strdupa(ast_channel_exten(chan));
priority = ast_channel_priority(chan);
ast_setstate(tmpchan, ast_channel_state(chan)); ast_setstate(tmpchan, ast_channel_state(chan));
ast_format_copy(ast_channel_readformat(tmpchan), ast_channel_readformat(chan)); ast_format_copy(ast_channel_readformat(tmpchan), ast_channel_readformat(chan));
ast_format_copy(ast_channel_writeformat(tmpchan), ast_channel_writeformat(chan)); ast_format_copy(ast_channel_writeformat(tmpchan), ast_channel_writeformat(chan));
@@ -7153,7 +7160,7 @@ static int do_bridge_masquerade(struct ast_channel *chan, struct ast_channel *tm
ast_do_masquerade(tmpchan); ast_do_masquerade(tmpchan);
/* when returning from bridge, the channel will continue at the next priority */ /* when returning from bridge, the channel will continue at the next priority */
ast_explicit_goto(tmpchan, ast_channel_context(chan), ast_channel_exten(chan), ast_channel_priority(chan) + 1); ast_explicit_goto(tmpchan, context, exten, priority + 1);
return 0; return 0;
} }