kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

properly display connected channel name in 'agents' manager action for non-callback agents (issue #5235)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6766 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-10-13 21:59:25 +00:00
parent a74e947c59
commit 7734cca1c2
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
channels/chan_agent.c
View File

@@ -1399,16 +1399,7 @@ static int action_agents(struct mansession *s, struct message *m)
/* Set a default status. It 'should' get changed. */ /* Set a default status. It 'should' get changed. */
status = "AGENT_UNKNOWN"; status = "AGENT_UNKNOWN";
if(p->chan) { if (!ast_strlen_zero(p->loginchan)) {
loginChan = p->loginchan;
if(p->owner && p->owner->_bridge) {
talkingtoChan = p->chan->cid.cid_num;
status = "AGENT_ONCALL";
} else {
talkingtoChan = "n/a";
status = "AGENT_IDLE";
}
} else if(!ast_strlen_zero(p->loginchan)) {
loginChan = p->loginchan; loginChan = p->loginchan;
talkingtoChan = "n/a"; talkingtoChan = "n/a";
status = "AGENT_IDLE"; status = "AGENT_IDLE";
@@ -1416,6 +1407,15 @@ static int action_agents(struct mansession *s, struct message *m)
snprintf(chanbuf, sizeof(chanbuf), " %s (Confirmed)", p->loginchan); snprintf(chanbuf, sizeof(chanbuf), " %s (Confirmed)", p->loginchan);
loginChan = chanbuf; loginChan = chanbuf;
} }
} else if (p->chan) {
loginChan = ast_strdupa(p->chan->name);
if (p->owner && p->owner->_bridge) {
talkingtoChan = p->chan->cid.cid_num;
status = "AGENT_ONCALL";
} else {
talkingtoChan = "n/a";
status = "AGENT_IDLE";
}
} else { } else {
loginChan = "n/a"; loginChan = "n/a";
talkingtoChan = "n/a"; talkingtoChan = "n/a";
@@ -2175,10 +2175,9 @@ static int action_agent_callback_login(struct mansession *s, struct message *m)
} }
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
login_state = 1; /* Successful Login */ login_state = 1; /* Successful Login */
ast_copy_string(p->loginchan, exten, sizeof(p->loginchan));
if (ast_strlen_zero(context)) if (ast_strlen_zero(context))
snprintf(p->loginchan, sizeof(p->loginchan), "%s", exten); ast_copy_string(p->loginchan, exten, sizeof(p->loginchan));
else else
snprintf(p->loginchan, sizeof(p->loginchan), "%s@%s", exten, context); snprintf(p->loginchan, sizeof(p->loginchan), "%s@%s", exten, context);