diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-07 00:05:27 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-07 00:05:27 +0000 |
| commit | 95a65bad8cfb877b5ebb52592d292320ab2a290c (patch) | |
| tree | bfb4081b3d47f2fd8ab12ce3285a4feebe27c704 | |
| parent | a30944fab43362c1ec815ff04a8aff723a76007e (diff) | |
Bug 6020 - Race condition where packet could be lost if first packet on list is acked
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@12195 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8e60f83ac..28b568c93 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1362,12 +1362,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; @@ -1384,13 +1384,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; } |