diff options
author | Jeff Peeler <jpeeler@digium.com> | 2010-01-19 18:46:11 +0000 |
---|---|---|
committer | Jeff Peeler <jpeeler@digium.com> | 2010-01-19 18:46:11 +0000 |
commit | 4bb10fe6a91b1c2d843205d0daa06529a1348254 (patch) | |
tree | 8e27f0b99344cda88d37fccbc9594f89fae2c806 /channels/chan_agent.c | |
parent | dcf6f8cf68985fe2f44cef0e52d2502c69eb1b67 (diff) |
Merged revisions 241227 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r241227 | jpeeler | 2010-01-19 11:22:18 -0600 (Tue, 19 Jan 2010) | 13 lines
Fix deadlock in agent_read by removing call to agent_logoff.
One must always lock the agents list lock before the agent private. agent_read
locks the private immediately, so locking the agents list lock is not an
option (which is what agent_logoff requires). Because agent_read already
has access to the agent private all that is necessary is to do the required
hanging up that agent_logoff performed.
(closes issue #16321)
Reported by: valon24
Patches:
bug16321.patch uploaded by jpeeler (license 325)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@241314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_agent.c')
-rw-r--r-- | channels/chan_agent.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 0bc35c0bf..b2624f041 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -562,7 +562,25 @@ static struct ast_frame *agent_read(struct ast_channel *ast) int howlong = cur_time - p->start; if (p->autologoff && (howlong >= p->autologoff)) { ast_log(LOG_NOTICE, "Agent '%s' didn't answer/confirm within %d seconds (waited %d)\n", p->name, p->autologoff, howlong); - agent_logoff(p->agent, 0); + if (p->owner || p->chan) { + while (p->owner && ast_channel_trylock(p->owner)) { + DEADLOCK_AVOIDANCE(&p->lock); + } + if (p->owner) { + ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT); + ast_channel_unlock(p->owner); + } + + while (p->chan && ast_channel_trylock(p->chan)) { + DEADLOCK_AVOIDANCE(&p->lock); + } + if (p->chan) { + ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT); + ast_channel_unlock(p->chan); + } + } else { + p->deferlogoff = 1; + } } } switch (f->frametype) { |