kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 08:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 74997 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74999 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-07-12 23:02:33 +00:00
parent 6bc0a4929c
commit 4d915d13c7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_agent.c
View File

@@ -1465,18 +1465,18 @@ static int agent_logoff(const char *agent, int soft)
if (!strcasecmp(p->agent, agent)) {
ret = 0;
if (p->owner || p->chan) {
p->deferlogoff = 1;
if (!soft) {
if (p->owner)
ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT);
if (p->chan)
ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT);
}
} else
p->deferlogoff = 1;
} else {
logintime = time(NULL) - p->loginstart;
p->loginstart = 0;
agent_logoff_maintenance(p, p->loginchan, logintime, NULL, "CommandLogoff");
}
p->loginstart = 0;
break;
}
}
@@ -1901,8 +1901,10 @@ static int login_exec(struct ast_channel *chan, void *data)
ast_device_state_changed("Agent/%s", p->agent);
while (res >= 0) {
ast_mutex_lock(&p->lock);
if (!p->loginstart && p->chan)
if (p->deferlogoff && p->chan) {
ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT);
p->deferlogoff = 0;
}
if (p->chan != chan)
res = -1;
ast_mutex_unlock(&p->lock);