Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@60166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Automerge Script 19 years ago
parent 6e8d96fcd1
commit aca1adfe03
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
manager.c
Unescape View File

@ -885,15 +885,15 @@ static int action_redirect(struct mansession *s, struct message *m)
astman_send_error(s, m, buf); astman_send_error(s, m, buf);
return 0; return 0;
} }
if (chan->_state != AST_STATE_UP) { if (ast_check_hangup(chan)) {
astman_send_error(s, m, "Redirect failed, channel not up.\n"); astman_send_error(s, m, "Redirect failed, channel hung up.\n");
ast_mutex_unlock(&chan->lock); ast_mutex_unlock(&chan->lock);
return 0; return 0;
} }
if (!ast_strlen_zero(name2)) if (!ast_strlen_zero(name2))
chan2 = ast_get_channel_by_name_locked(name2); chan2 = ast_get_channel_by_name_locked(name2);
if (chan2 && chan2->_state != AST_STATE_UP) { if (chan2 && ast_check_hangup(chan2)) {
astman_send_error(s, m, "Redirect failed, extra channel not up.\n"); astman_send_error(s, m, "Redirect failed, extra channel hung up.\n");
ast_mutex_unlock(&chan->lock); ast_mutex_unlock(&chan->lock);
ast_mutex_unlock(&chan2->lock); ast_mutex_unlock(&chan2->lock);
return 0; return 0;

Write Preview
Loading…
Cancel
Save