diff options
author | Russell Bryant <russell@russellbryant.com> | 2007-08-01 15:39:54 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2007-08-01 15:39:54 +0000 |
commit | 4e0947c5f1f9c9583bff9f2be1b0c2810263e3e9 (patch) | |
tree | 8669ddf483350f2bd54e6b146d9a2a5a56e9c141 /channels/chan_local.c | |
parent | 96b96a5f72e12a5b747aa00e542b964f7312858e (diff) |
Convert code that checks the _softhangup member of ast_channel directory to use
the ast_check_hangup() funciton. This function takes scheduled hangups into
account.
(closes issue #10230, patch by Juggie)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_local.c')
-rw-r--r-- | channels/chan_local.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 3d814d177..30ad2203b 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -246,9 +246,9 @@ static void check_bridge(struct local_pvt *p, int isoutbound) we can't get everything. Remember, we'll get another chance in just a little bit */ if (!ast_mutex_trylock(&(p->chan->_bridge)->lock)) { - if (!p->chan->_bridge->_softhangup) { + if (!ast_check_hangup(p->chan->_bridge)) { if (!ast_mutex_trylock(&p->owner->lock)) { - if (!p->owner->_softhangup) { + if (!ast_check_hangup(p->owner)) { ast_channel_masquerade(p->owner, p->chan->_bridge); ast_set_flag(p, LOCAL_ALREADY_MASQED); } @@ -265,9 +265,9 @@ static void check_bridge(struct local_pvt *p, int isoutbound) } else if (!isoutbound && p->owner && p->owner->_bridge && p->chan && AST_LIST_EMPTY(&p->chan->readq)) { /* Masquerade bridged channel into chan */ if (!ast_mutex_trylock(&(p->owner->_bridge)->lock)) { - if (!p->owner->_bridge->_softhangup) { + if (!ast_check_hangup(p->owner->_bridge)) { if (!ast_mutex_trylock(&p->chan->lock)) { - if (!p->chan->_softhangup) { + if (!ast_check_hangup(p->chan)) { ast_channel_masquerade(p->chan, p->owner->_bridge); ast_set_flag(p, LOCAL_ALREADY_MASQED); } |