automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ead44419563687665a7d44e2fcf809f758e6ca89..6a62ea5c614f79a5ee2977d195e22b619f03da85 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1389,12 +1389,12 @@ static int __sip_ack(struct sip_pvt *p, int seqno, int resp, int sipmethod)
 
        msg = sip_methods[sipmethod].text;
 
+       ast_mutex_lock(&p->lock);
        cur = p->packets;
        while(cur) {
                if ((cur->seqno == seqno) && ((ast_test_flag(cur, FLAG_RESPONSE)) == resp) &&
                        ((ast_test_flag(cur, FLAG_RESPONSE)) || 
                         (!strncasecmp(msg, cur->data, strlen(msg)) && (cur->data[strlen(msg)] < 33)))) {
-                       ast_mutex_lock(&p->lock);
                        if (!resp && (seqno == p->pendinginvite)) {
                                ast_log(LOG_DEBUG, "Acked pending invite %d\n", p->pendinginvite);
                                p->pendinginvite = 0;
@@ -1411,13 +1411,13 @@ static int __sip_ack(struct sip_pvt *p, int seqno, int resp, int sipmethod)
                                ast_sched_del(sched, cur->retransid);
                        }
                        free(cur);
-                       ast_mutex_unlock(&p->lock);
                        res = 0;
                        break;
                }
                prev = cur;
                cur = cur->next;
        }
+       ast_mutex_unlock(&p->lock);
        ast_log(LOG_DEBUG, "Stopping retransmission on '%s' of %s %d: Match %s\n", p->callid, resp ? "Response" : "Request", seqno, res ? "Not Found" : "Found");
        return res;
 }