[asterisk-commits] branch oej/managerstuff r12258 - in /team/oej/managerstuff: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Mar  7 01:40:19 2006
New Revision: 12258

URL: http://svn.digium.com/view/asterisk?rev=12258&view=rev
Log:
Reset automerge, resolve conflict

Modified:
    team/oej/managerstuff/   (props changed)
    team/oej/managerstuff/channels/chan_sip.c

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
    automerge = q

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar  7 01:40:19 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-12178
+/branches/1.2:1-7496,7498-12257

Modified: team/oej/managerstuff/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/chan_sip.c?rev=12258&r1=12257&r2=12258&view=diff
==============================================================================
--- team/oej/managerstuff/channels/chan_sip.c (original)
+++ team/oej/managerstuff/channels/chan_sip.c Tue Mar  7 01:40:19 2006
@@ -1389,12 +1389,12 @@
 
 	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;
@@ -1410,13 +1410,13 @@
 				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);
 	if (option_debug)
 		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;