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 /channels | |
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 'channels')
-rw-r--r-- | channels/chan_agent.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 79c3d230b..a83eb66b0 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -251,6 +251,8 @@ static int agent_indicate(struct ast_channel *ast, int condition, const void *da static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan); static struct ast_channel *agent_bridgedchannel(struct ast_channel *chan, struct ast_channel *bridge); static void set_agentbycallerid(const char *callerid, const char *agent); +static struct ast_channel* agent_get_base_channel(struct ast_channel *chan); +static int agent_set_base_channel(struct ast_channel *chan, struct ast_channel *base); /*! \brief Channel interface description for PBX integration */ static const struct ast_channel_tech agent_tech = { @@ -273,6 +275,8 @@ static const struct ast_channel_tech agent_tech = { .indicate = agent_indicate, .fixup = agent_fixup, .bridged_channel = agent_bridgedchannel, + .get_base_channel = agent_get_base_channel, + .set_base_channel = agent_set_base_channel, }; /*! @@ -726,6 +730,37 @@ static void set_agentbycallerid(const char *callerid, const char *agent) pbx_builtin_setvar_helper(NULL, buf, agent); } +struct ast_channel* agent_get_base_channel(struct ast_channel *chan) +{ + struct agent_pvt *p = NULL; + struct ast_channel *base = NULL; + + if (!chan || !chan->tech_pvt) { + ast_log(LOG_ERROR, "whoa, you need a channel (0x%ld) with a tech_pvt (0x%ld) to get a base channel.\n", (long)chan, (chan)?(long)chan->tech_pvt:(long)NULL); + } else { + p = chan->tech_pvt; + base = p->chan; + } + return base; +} + +int agent_set_base_channel(struct ast_channel *chan, struct ast_channel *base) +{ + struct agent_pvt *p = NULL; + + if (!chan || !base) { + ast_log(LOG_ERROR, "whoa, you need a channel (0x%ld) and a base channel (0x%ld) for setting.\n", (long)chan, (long)base); + return -1; + } + p = chan->tech_pvt; + if (!p) { + ast_log(LOG_ERROR, "whoa, channel %s is missing his tech_pvt structure!!.\n", chan->name); + return -1; + } + p->chan = base; + return 0; +} + static int agent_hangup(struct ast_channel *ast) { struct agent_pvt *p = ast->tech_pvt; |