diff options
| author | dhubbard <dhubbard@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-27 23:12:25 +0000 |
|---|---|---|
| committer | dhubbard <dhubbard@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-27 23:12:25 +0000 |
| commit | 53054e222d379cc07e349447b9bff55bcdd453c4 (patch) | |
| tree | c5776c74d0d08493dbdbf62a46e45f0d5b711cc9 /main/manager.c | |
| parent | a77c245d43c66fa36d15951796cc954826476d67 (diff) | |
if an Agent is redirected, the base channel should actually be redirected. This was causing multiple issues, especially issue 7706 and BE-160
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@84018 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index d39de8061..6a6deb643 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1550,7 +1550,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 *chan, *chan2 = NULL; + struct ast_channel *base, *chan, *chan2 = NULL; int pi = 0; int res; @@ -1572,6 +1572,14 @@ 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); @@ -1585,6 +1593,14 @@ 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)) { |