kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-01-06 10:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

When a transferer hangs up during an attended transfer BEFORE the transfer is answered, don't stop playing MOH.

Browse Source 
(closes issue #16513)
 Reported by: litnimax
 Patches: 
       atxfer_moh_16513.patch uploaded by gknispel proformatique (license 261)
 Tested by: litnimax


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@244151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-02-01 18:38:37 +00:00
parent 72af53a885
commit bad37b9a69
1 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
res/res_features.c
View File

@@ -967,22 +967,55 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
return FEATURE_RETURN_SUCCESS; return FEATURE_RETURN_SUCCESS;
} }
if (check_compat(transferer, newchan)) { if (!ast_check_hangup(transferer)) {
/* we do mean transferee here, NOT transferer */ if (check_compat(transferer, newchan)) {
finishup(transferee); /* we do mean transferee here, NOT transferer */
return -1; finishup(transferee);
} return -1;
memset(&bconfig,0,sizeof(struct ast_bridge_config)); }
ast_set_flag(&(bconfig.features_caller), AST_FEATURE_DISCONNECT); memset(&bconfig,0,sizeof(struct ast_bridge_config));
ast_set_flag(&(bconfig.features_callee), AST_FEATURE_DISCONNECT); ast_set_flag(&(bconfig.features_caller), AST_FEATURE_DISCONNECT);
res = ast_bridge_call(transferer, newchan, &bconfig); ast_set_flag(&(bconfig.features_callee), AST_FEATURE_DISCONNECT);
if (newchan->_softhangup || !transferer->_softhangup) { res = ast_bridge_call(transferer, newchan, &bconfig);
ast_hangup(newchan); if (newchan->_softhangup || !transferer->_softhangup) {
if (ast_stream_and_wait(transferer, xfersound, transferer->language, "")) ast_hangup(newchan);
ast_log(LOG_WARNING, "Failed to play transfer sound!\n"); if (ast_stream_and_wait(transferer, xfersound, transferer->language, ""))
finishup(transferee); ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
transferer->_softhangup = 0; finishup(transferee);
return FEATURE_RETURN_SUCCESS; transferer->_softhangup = 0;
return FEATURE_RETURN_SUCCESS;
}
} else {
ast_log(LOG_DEBUG, "transferer hangup; outstate = %d\n", outstate);
switch (outstate) {
case AST_CONTROL_RINGING:
{
int connected = 0;
while (!connected && (ast_waitfor(newchan, -1) >= 0)) {
if ((f = ast_read(newchan)) == NULL) {
break;
}
if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_ANSWER) {
connected = 1;
}
ast_frfree(f);
}
if (!connected) {
ast_hangup(newchan);
finishup(transferee);
return -1;
}
/* fall through */
}
case AST_CONTROL_ANSWER:
ast_log(LOG_DEBUG, "transferer hangup; callee answered\n");
break;
default:
ast_hangup(newchan);
finishup(transferee);
return FEATURE_RETURN_SUCCESS;
}
} }
if (check_compat(transferee, newchan)) { if (check_compat(transferee, newchan)) {