diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_local.c | 8 | ||||
| -rw-r--r-- | channels/chan_vpb.cc | 4 |
2 files changed, 6 insertions, 6 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); } diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index 02c3faf48..bcc3f6834 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -546,11 +546,11 @@ static enum ast_bridge_result ast_vpb_bridge(struct ast_channel *c0, struct ast_ *rc = who; ast_debug(1, "%s: vpb_bridge: Got a [%s]\n",p0->dev, f ? "digit" : "hangup"); /* - if ((c0->tech_pvt == pvt0) && (!c0->_softhangup)) { + if ((c0->tech_pvt == pvt0) && (!ast_check_hangup(c0))) { if (pr0->set_rtp_peer(c0, NULL, NULL, 0)) ast_log(LOG_WARNING, "Channel '%s' failed to revert\n", c0->name); } - if ((c1->tech_pvt == pvt1) && (!c1->_softhangup)) { + if ((c1->tech_pvt == pvt1) && (!ast_check_hangup(c1))) { if (pr1->set_rtp_peer(c1, NULL, NULL, 0)) ast_log(LOG_WARNING, "Channel '%s' failed to revert back\n", c1->name); } |