diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-04 17:40:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-04 17:40:10 +0000 |
| commit | 8f41334189db0e46d004882685c2e7afd0c15811 (patch) | |
| tree | e1ff740f9492cc401fc7808e881f4ec70fea58f4 | |
| parent | 3f085622f5ade40ac171f4622adde23cd2afe790 (diff) | |
Merged revisions 60134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r60134 | russell | 2007-04-04 12:38:47 -0500 (Wed, 04 Apr 2007) | 6 lines
It is valid to redirect channels via the manager interface that are not in the
UP state. Instead of checking for that to prevent to ensure a dead channel
doesn't get redirected, just use the ast_check_hangup() API call.
(issue #9457, reported by Callmewind, patch by me)
(related to issue #8977)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@60137 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/manager.c b/main/manager.c index 4e4abd064..04c84cb4b 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1558,14 +1558,14 @@ static int action_redirect(struct mansession *s, const struct message *m) astman_send_error(s, m, buf); return 0; } - if (chan->_state != AST_STATE_UP) { + if (ast_check_hangup(chan)) { astman_send_error(s, m, "Redirect failed, channel not up.\n"); ast_channel_unlock(chan); return 0; } if (!ast_strlen_zero(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"); ast_channel_unlock(chan); ast_channel_unlock(chan2); |