diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-18 17:31:52 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-18 17:31:52 +0000 |
commit | d8f0dbd76da41739f98e1637c6d75717b3481840 (patch) | |
tree | 2b71431a71ff5516232e8bdab0335585207f4624 /channels | |
parent | 29a998dbf49bdf703ec8289a05f2662d3b72b098 (diff) |
When a SIP channel is being auto-destroyed, it's possible for it to still be
in bridge code. When that happens, we crash. Delay the RTP destruction until
the bridge is ended.
(closes issue #11960)
Reported by: norman
Patches:
20080215__bug11960__2.diff.txt uploaded by Corydon76 (license 14)
Tested by: norman
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@103780 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d3baa8d3f..9e038b8cf 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3064,6 +3064,21 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner) ast_log(LOG_DEBUG, "This call did not properly clean up call limits. Call ID %s\n", p->callid); } + /* Unlink us from the owner if we have one */ + if (p->owner) { + if (lockowner) + ast_channel_lock(p->owner); + if (option_debug) + ast_log(LOG_DEBUG, "Detaching from %s\n", p->owner->name); + p->owner->tech_pvt = NULL; + /* Make sure that the channel knows its backend is going away */ + p->owner->_softhangup |= AST_SOFTHANGUP_DEV; + if (lockowner) + ast_channel_unlock(p->owner); + /* Give the channel a chance to react before deallocation */ + usleep(1); + } + /* Remove link from peer to subscription of MWI */ if (p->relatedpeer && p->relatedpeer->mwipvt) p->relatedpeer->mwipvt = NULL; @@ -3080,10 +3095,17 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner) AST_SCHED_DEL(sched, p->waitid); AST_SCHED_DEL(sched, p->autokillid); - if (p->rtp) + /* We absolutely cannot destroy the rtp struct while a bridge is active or we WILL crash */ + if (p->rtp) { + while (ast_rtp_get_bridged(p->rtp)) + usleep(1); ast_rtp_destroy(p->rtp); - if (p->vrtp) + } + if (p->vrtp) { + while (ast_rtp_get_bridged(p->vrtp)) + usleep(1); ast_rtp_destroy(p->vrtp); + } if (p->udptl) ast_udptl_destroy(p->udptl); if (p->refer) @@ -3098,16 +3120,6 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner) ASTOBJ_UNREF(p->registry, sip_registry_destroy); } - /* Unlink us from the owner if we have one */ - if (p->owner) { - if (lockowner) - ast_channel_lock(p->owner); - if (option_debug) - ast_log(LOG_DEBUG, "Detaching from %s\n", p->owner->name); - p->owner->tech_pvt = NULL; - if (lockowner) - ast_channel_unlock(p->owner); - } /* Clear history */ if (p->history) { struct sip_history *hist; |