sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hangup affected channel in error paths of bridge_call_thread(). 

........

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@363377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett 2012-04-25 00:03:52 +00:00
parent 18045c9a07
commit 56d10c5677
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/features.c
View File

@ -967,17 +967,23 @@ static void *bridge_call_thread(void *data)
if (!ast_check_hangup(tobj->peer)) {
ast_log(LOG_VERBOSE, "putting peer %s into PBX again\n", ast_channel_name(tobj->peer));
res = ast_pbx_start(tobj->peer);
if (res != AST_PBX_SUCCESS)
if (res != AST_PBX_SUCCESS) {
ast_log(LOG_WARNING, "FAILED continuing PBX on peer %s\n", ast_channel_name(tobj->peer));
} else
ast_hangup(tobj->peer);
}
} else {
ast_hangup(tobj->peer);
}
if (!ast_check_hangup(tobj->chan)) {
ast_log(LOG_VERBOSE, "putting chan %s into PBX again\n", ast_channel_name(tobj->chan));
res = ast_pbx_start(tobj->chan);
if (res != AST_PBX_SUCCESS)
if (res != AST_PBX_SUCCESS) {
ast_log(LOG_WARNING, "FAILED continuing PBX on chan %s\n", ast_channel_name(tobj->chan));
} else
ast_hangup(tobj->chan);
}
} else {
ast_hangup(tobj->chan);
}
} else {
ast_hangup(tobj->chan);
ast_hangup(tobj->peer);