kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 84274 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84274 | dhubbard | 2007-10-01 16:25:37 -0500 (Mon, 01 Oct 2007) | 1 line

moved get_base_channel() code from action_redirect to ast_channel_masquerade() for issue 7706 and BE-160
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Dwayne M. Hubbard
2007-10-01 21:31:16 +00:00
parent 9334e72e76
commit 71a0672560
3 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/manager.c
View File

@@ -1787,7 +1787,7 @@ static int action_redirect(struct mansession *s, const struct message *m)
const char *exten = astman_get_header(m, "Exten");
const char *context = astman_get_header(m, "Context");
const char *priority = astman_get_header(m, "Priority");
struct ast_channel *base, *chan, *chan2 = NULL;
struct ast_channel *chan, *chan2 = NULL;
int pi = 0;
int res;
@@ -1809,14 +1809,6 @@ static int action_redirect(struct mansession *s, const struct message *m)
astman_send_error(s, m, buf);
return 0;
}
if (chan->tech->get_base_channel) {
base = chan->tech->get_base_channel(chan);
if (base) {
ast_mutex_unlock(&chan->lock);
chan = base;
ast_mutex_lock(&chan->lock);
}
}
if (ast_check_hangup(chan)) {
astman_send_error(s, m, "Redirect failed, channel not up.\n");
ast_channel_unlock(chan);
@@ -1830,14 +1822,6 @@ static int action_redirect(struct mansession *s, const struct message *m)
ast_channel_unlock(chan2);
return 0;
}
if (chan2 && chan2->tech->get_base_channel) {
base = chan2->tech->get_base_channel(chan2);
if (base) {
ast_mutex_unlock(&chan2->lock);
chan2 = base;
ast_mutex_lock(&chan2->lock);
}
}
res = ast_async_goto(chan, context, exten, pi);
if (!res) {
if (!ast_strlen_zero(name2)) {