mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-24 22:58:21 +00:00
Finish up on transferee channel before return on failure.
Issue 10821, patch by Ivan git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -816,8 +816,11 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
|
||||
return FEATURE_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
if (check_compat(transferer, newchan))
|
||||
if (check_compat(transferer, newchan)) {
|
||||
/* we do mean transferee here, NOT transferer */
|
||||
finishup(transferee);
|
||||
return -1;
|
||||
};
|
||||
memset(&bconfig,0,sizeof(struct ast_bridge_config));
|
||||
ast_set_flag(&(bconfig.features_caller), AST_FEATURE_DISCONNECT);
|
||||
ast_set_flag(&(bconfig.features_callee), AST_FEATURE_DISCONNECT);
|
||||
@@ -831,8 +834,10 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
|
||||
return FEATURE_RETURN_SUCCESS;
|
||||
}
|
||||
|
||||
if (check_compat(transferee, newchan))
|
||||
if (check_compat(transferee, newchan)) {
|
||||
finishup(transferee);
|
||||
return -1;
|
||||
};
|
||||
|
||||
ast_indicate(transferee, AST_CONTROL_UNHOLD);
|
||||
|
||||
|
Reference in New Issue
Block a user