Merged revisions 103780 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 18 Feb 2008 17:45:48 +0000 (17:45 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 18 Feb 2008 17:45:48 +0000 (17:45 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103780 | tilghman | 2008-02-18 11:31:52 -0600 (Mon, 18 Feb 2008) | 9 lines

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: https://origsvn.digium.com/svn/asterisk/trunk@103781 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c
main/rtp.c

index 6f4ed04..43ed864 100644 (file)
@@ -4134,6 +4134,21 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner, int lockdialoglist)
                ast_debug(2, "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 = dialog_unref(p->relatedpeer->mwipvt);
@@ -4150,12 +4165,22 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner, int lockdialoglist)
        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->trtp)
+       }
+       if (p->trtp) {
+               while (ast_rtp_get_bridged(p->trtp))
+                       usleep(1);
                ast_rtp_destroy(p->trtp);
+       }
        if (p->udptl)
                ast_udptl_destroy(p->udptl);
        if (p->refer)
@@ -4177,15 +4202,6 @@ static void __sip_destroy(struct sip_pvt *p, int lockowner, int lockdialoglist)
                ast_free(p->stimer);
        }
 
-       /* Unlink us from the owner if we have one */
-       if (p->owner) {
-               if (lockowner)
-                       ast_channel_lock(p->owner);
-               ast_debug(1, "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;
index 1260aff..f7078de 100644 (file)
@@ -3713,6 +3713,14 @@ enum ast_bridge_result ast_rtp_bridge(struct ast_channel *c0, struct ast_channel
                ast_channel_lock(c0);
        }
 
+       /* Ensure neither channel got hungup during lock avoidance */
+       if (ast_check_hangup(c0) || ast_check_hangup(c1)) {
+               ast_log(LOG_WARNING, "Got hangup while attempting to bridge '%s' and '%s'\n", c0->name, c1->name);
+               ast_channel_unlock(c0);
+               ast_channel_unlock(c1);
+               return AST_BRIDGE_FAILED;
+       }
+               
        /* Find channel driver interfaces */
        if (!(pr0 = get_proto(c0))) {
                ast_log(LOG_WARNING, "Can't find native functions for channel '%s'\n", c0->name);