diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-02-25 18:38:51 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-02-25 18:38:51 +0000 |
| commit | 871e86846e1e358c47e8a97942550ee41a71bc76 (patch) | |
| tree | f316960b9fa320ba6fddf7bdc315f51c72301af6 /channels | |
| parent | 26e297b27f294ba7a2128a5d44988de4d7022fe1 (diff) | |
Merged revisions 104086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r104086 | russell | 2008-02-25 12:38:10 -0600 (Mon, 25 Feb 2008) | 4 lines
Ensure that the channel doesn't disappear in agent_logoff(). If it does, it
could cause a crash.
(fixes the crash reported in BE-396)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_agent.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 2aeebf5b1..7fce983e4 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1513,10 +1513,29 @@ static int agent_logoff(const char *agent, int soft) ret = 0; if (p->owner || p->chan) { if (!soft) { - if (p->owner) + ast_mutex_lock(&p->lock); + + while (p->owner && ast_channel_trylock(p->owner)) { + ast_mutex_unlock(&p->lock); + usleep(1); + ast_mutex_lock(&p->lock); + } + if (p->owner) { ast_softhangup(p->owner, AST_SOFTHANGUP_EXPLICIT); - if (p->chan) + ast_channel_unlock(p->owner); + } + + while (p->chan && ast_channel_trylock(p->chan)) { + ast_mutex_unlock(&p->lock); + usleep(1); + ast_mutex_lock(&p->lock); + } + if (p->chan) { ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT); + ast_channel_unlock(p->chan); + } + + ast_mutex_unlock(&p->lock); } else p->deferlogoff = 1; } else { |