Merged revisions 285566 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r285566 | dvossel | 2010-09-08 17:07:31 -0500 (Wed, 08 Sep 2010) | 2 lines

  In retrans_pkt, do not unlock pvt until the end of the function on a transmit failure.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@285567 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f132a4f013ce8dfc5b5b610c791ab3e244338308..2768b3a4caa8f47b5138342126da2bfff1dfeb12 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3773,34 +3773,34 @@ static int retrans_pkt(const void *data)
        struct sip_pkt *pkt = (struct sip_pkt *)data, *prev, *cur = NULL;
        int reschedule = DEFAULT_RETRANS;
        int xmitres = 0;
-       
+
        /* Lock channel PVT */
        sip_pvt_lock(pkt->owner);
 
        if (pkt->retrans < MAX_RETRANS) {
                pkt->retrans++;
-               if (!pkt->timer_t1) {   /* Re-schedule using timer_a and timer_t1 */
+               if (!pkt->timer_t1) {   /* Re-schedule using timer_a and timer_t1 */
                        if (sipdebug)
-                               ast_debug(4, "SIP TIMER: Not rescheduling id #%d:%s (Method %d) (No timer T1)\n", pkt->retransid, sip_methods[pkt->method].text, pkt->method);
+                               ast_debug(4, "SIP TIMER: Not rescheduling id #%d:%s (Method %d) (No timer T1)\n", pkt->retransid, sip_methods[pkt->method].text, pkt->method);
                } else {
-                       int siptimer_a;
-
-                       if (sipdebug)
-                               ast_debug(4, "SIP TIMER: Rescheduling retransmission #%d (%d) %s - %d\n", pkt->retransid, pkt->retrans, sip_methods[pkt->method].text, pkt->method);
-                       if (!pkt->timer_a)
-                               pkt->timer_a = 2 ;
-                       else
-                               pkt->timer_a = 2 * pkt->timer_a;
- 
-                       /* For non-invites, a maximum of 4 secs */
-                       siptimer_a = pkt->timer_t1 * pkt->timer_a;      /* Double each time */
-                       if (pkt->method != SIP_INVITE && siptimer_a > 4000)
-                               siptimer_a = 4000;
-               
-                       /* Reschedule re-transmit */
+                       int siptimer_a;
+
+                       if (sipdebug)
+                               ast_debug(4, "SIP TIMER: Rescheduling retransmission #%d (%d) %s - %d\n", pkt->retransid, pkt->retrans, sip_methods[pkt->method].text, pkt->method);
+                       if (!pkt->timer_a)
+                               pkt->timer_a = 2 ;
+                       else
+                               pkt->timer_a = 2 * pkt->timer_a;
+
+                       /* For non-invites, a maximum of 4 secs */
+                       siptimer_a = pkt->timer_t1 * pkt->timer_a;      /* Double each time */
+                       if (pkt->method != SIP_INVITE && siptimer_a > 4000)
+                               siptimer_a = 4000;
+
+                       /* Reschedule re-transmit */
                        reschedule = siptimer_a;
-                       ast_debug(4, "** SIP timers: Rescheduling retransmission %d to %d ms (t1 %d ms (Retrans id #%d)) \n", pkt->retrans +1, siptimer_a, pkt->timer_t1, pkt->retransid);
-               } 
+                       ast_debug(4, "** SIP timers: Rescheduling retransmission %d to %d ms (t1 %d ms (Retrans id #%d)) \n", pkt->retrans +1, siptimer_a, pkt->timer_t1, pkt->retransid);
+               }
 
                if (sip_debug_test_pvt(pkt->owner)) {
                        const struct sockaddr_in *dst = sip_real_dst(pkt->owner);
@@ -3812,12 +3812,13 @@ static int retrans_pkt(const void *data)
 
                append_history(pkt->owner, "ReTx", "%d %s", reschedule, pkt->data->str);
                xmitres = __sip_xmit(pkt->owner, pkt->data, pkt->packetlen);
-               sip_pvt_unlock(pkt->owner);
-               if (xmitres == XMIT_ERROR)
+               if (xmitres == XMIT_ERROR) {
                        ast_log(LOG_WARNING, "Network error on retransmit in dialog %s\n", pkt->owner->callid);
-               else 
+               } else {
+                       sip_pvt_unlock(pkt->owner);
                        return  reschedule;
-       } 
+               }
+       }
        /* Too many retries */
        if (pkt->owner && pkt->method != SIP_OPTIONS && xmitres == 0) {
                if (pkt->is_fatal || sipdebug)  /* Tell us if it's critical or if we're debugging */
@@ -3827,13 +3828,13 @@ static int retrans_pkt(const void *data)
        } else if (pkt->method == SIP_OPTIONS && sipdebug) {
                        ast_log(LOG_WARNING, "Cancelling retransmit of OPTIONs (call id %s)  -- See doc/sip-retransmit.txt.\n", pkt->owner->callid);
 
-       } 
+       }
        if (xmitres == XMIT_ERROR) {
                ast_log(LOG_WARNING, "Transmit error :: Cancelling transmission on Call ID %s\n", pkt->owner->callid);
                append_history(pkt->owner, "XmitErr", "%s", pkt->is_fatal ? "(Critical)" : "(Non-critical)");
-       } else 
+       } else {
                append_history(pkt->owner, "MaxRetries", "%s", pkt->is_fatal ? "(Critical)" : "(Non-critical)");
-               
+       }
        pkt->retransid = -1;
 
        if (pkt->is_fatal) {
@@ -3843,9 +3844,9 @@ static int retrans_pkt(const void *data)
                        sip_pvt_lock(pkt->owner);
                }
 
-               if (pkt->owner->owner && !pkt->owner->owner->hangupcause) 
+               if (pkt->owner->owner && !pkt->owner->owner->hangupcause)
                        pkt->owner->owner->hangupcause = AST_CAUSE_NO_USER_RESPONSE;
-               
+
                if (pkt->owner->owner) {
                        sip_alreadygone(pkt->owner);
                        ast_log(LOG_WARNING, "Hanging up call %s - no reply to our critical packet (see doc/sip-retransmit.txt).\n", pkt->owner->callid);
@@ -3865,7 +3866,7 @@ static int retrans_pkt(const void *data)
 
        if (pkt->method == SIP_BYE) {
                /* We're not getting answers on SIP BYE's.  Tear down the call anyway. */
-               if (pkt->owner->owner) 
+               if (pkt->owner->owner)
                        ast_channel_unlock(pkt->owner->owner);
                append_history(pkt->owner, "ByeFailure", "Remote peer doesn't respond to bye. Destroying call anyway.");
                pvt_set_needdestroy(pkt->owner, "no response to BYE");