Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv30527/channels
Modified Files:
chan_agent.c
Log Message:
ensure that the AGENTBYCALLERID_* variable is cleared when an agent logs in to
a different device (issue #5213)
Index: chan_agent.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_agent.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- chan_agent.c 14 Sep 2005 00:28:06 -0000 1.149
+++ chan_agent.c 14 Sep 2005 00:39:05 -0000 1.150
@@ -690,16 +690,16 @@
}
/* store/clear the global variable that stores agentid based on the callerid */
-static void set_agentbycallerid(const struct agent_pvt *agent)
+static void set_agentbycallerid(const char *callerid, const char *agent)
{
char buf[AST_MAX_BUF];
/* if there is no Caller ID, nothing to do */
- if (!agent->logincallerid[0])
+ if (!callerid || ast_strlen_zero(callerid))
return;
- snprintf(buf, sizeof(buf), "%s_%s",GETAGENTBYCALLERID,
agent->logincallerid);
- pbx_builtin_setvar_helper(NULL, buf, ast_strlen_zero(agent->loginchan)
? NULL : agent->agent);
+ snprintf(buf, sizeof(buf), "%s_%s",GETAGENTBYCALLERID, callerid);
+ pbx_builtin_setvar_helper(NULL, buf, agent);
}
static int agent_hangup(struct ast_channel *ast)
@@ -760,8 +760,8 @@
p->agent, p->loginchan,
logintime, ast->uniqueid);
snprintf(agent, sizeof(agent), "Agent/%s",
p->agent);
ast_queue_log("NONE", ast->uniqueid, agent,
"AGENTCALLBACKLOGOFF", "%s|%ld|%s", p->loginchan, logintime, "Autologoff");
+ set_agentbycallerid(p->logincallerid, NULL);
p->loginchan[0] = '\0';
- set_agentbycallerid(p);
p->logincallerid[0] = '\0';
}
} else if (p->dead) {
@@ -1445,8 +1445,8 @@
"Logintime: %ld\r\n",
p->agent, p->loginchan, logintime);
ast_queue_log("NONE", "NONE", agent,
"AGENTCALLBACKLOGOFF", "%s|%ld|%s", p->loginchan, logintime, "CommandLogoff");
+ set_agentbycallerid(p->logincallerid, NULL);
p->loginchan[0] = '\0';
- set_agentbycallerid(p);
p->logincallerid[0] = '\0';
ast_device_state_changed("Agent/%s", p->agent);
if (persistent_agents)
@@ -1817,6 +1817,7 @@
}
exten = tmpchan;
if (!res) {
+
set_agentbycallerid(p->logincallerid, NULL);
if (context &&
!ast_strlen_zero(context) && !ast_strlen_zero(tmpchan))
snprintf(p->loginchan, sizeof(p->loginchan), "[EMAIL PROTECTED]", tmpchan,
context);
else {
@@ -1827,11 +1828,10 @@
if
(ast_strlen_zero(p->loginchan)) {
login_state = 2;
filename =
"agent-loggedoff";
-
set_agentbycallerid(p);
} else {
if
(chan->cid.cid_num) {
ast_copy_string(p->logincallerid, chan->cid.cid_num, sizeof(p->logincallerid));
-
set_agentbycallerid(p);
+
set_agentbycallerid(p->logincallerid, p->agent);
} else
p->logincallerid[0] = '\0';
}
@@ -2272,7 +2272,7 @@
ast_copy_string(cur_agent->loginchan, agent_chan,
sizeof(cur_agent->loginchan));
if (agent_callerid) {
ast_copy_string(cur_agent->logincallerid,
agent_callerid, sizeof(cur_agent->logincallerid));
- set_agentbycallerid(cur_agent);
+ set_agentbycallerid(cur_agent->logincallerid,
cur_agent->agent);
} else
cur_agent->logincallerid[0] = '\0';
if (cur_agent->loginstart == 0)
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
