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

if an Agent is redirected, the base channel should actually be redirected. This was causing multiple issues, especially issue 7706 and BE-160

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Dwayne M. Hubbard
2007-09-27 23:12:25 +00:00
parent a4dcd03dcb
commit 7c4e477fde
3 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
channels/chan_agent.c
View File

@@ -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;