[svn-commits] trunk r29765 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue May 23 13:17:40 2006
New Revision: 29765

URL: http://svn.digium.com/view/asterisk?rev=29765&view=rev
Log:
Merged revisions 29764 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r29764 | kpfleming | 2006-05-23 13:16:40 -0500 (Tue, 23 May 2006) | 2 lines

simplify/fix lock retry, and fix comment

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=29765&r1=29764&r2=29765&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue May 23 13:17:40 2006
@@ -12098,7 +12098,7 @@
 	int nounlock;
 	int recount = 0;
 	char iabuf[INET_ADDRSTRLEN];
-	int lockretrycount = 0;
+	unsigned int lockretry = 100;
 
 	len = sizeof(sin);
 	memset(&req, 0, sizeof(req));
@@ -12155,13 +12155,12 @@
 				ast_log(LOG_DEBUG, "Failed to grab lock, trying again...\n");
 			ast_mutex_unlock(&p->lock);
 			ast_mutex_unlock(&netlock);
-			/* Sleep infintismly short amount of time */
+			/* Sleep for a very short amount of time */
 			usleep(1);
-			lockretrycount++;
-			if (lockretrycount < 100)
+			if (--lockretry)
 				goto retrylock;
 		}
-		if (lockretrycount > 100) {
+		if (!lockretry) {
 			ast_log(LOG_ERROR, "We could NOT get the channel lock for %s! \n", p->owner->name);
 			ast_log(LOG_ERROR, "SIP MESSAGE JUST IGNORED: %s \n", req.data);
 			ast_log(LOG_ERROR, "BAD! BAD! BAD!\n");