From: BJ Weschke <bweschke@btwtech.com>
Date: Tue, 23 May 2006 17:17:02 +0000 (+0000)
Subject:   Sanity check code for an extended failure in trying to obtain a channel lock that... 
X-Git-Tag: 1.2.9.1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f84891dfbb792cc397735c6a63b222f0b4d4ff50;p=thirdparty%2Fasterisk.git

  Sanity check code for an extended failure in trying to obtain a channel lock that may have been obtained elsewhere. Prevents the monitor thread of the SIP module from going into an infinite loop, effectively, breaking SIP until you restart Asterisk or the mutex is unlocked, whichever comes first.



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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8719be134b..72d95e2f57 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11199,6 +11199,7 @@ static int sipsock_read(int *id, int fd, short events, void *ignore)
 	int nounlock;
 	int recount = 0;
 	char iabuf[INET_ADDRSTRLEN];
+	int lockretrycount = 0;
 
 	len = sizeof(sin);
 	memset(&req, 0, sizeof(req));
@@ -11253,7 +11254,15 @@ retrylock:
 			ast_mutex_unlock(&netlock);
 			/* Sleep infintismly short amount of time */
 			usleep(1);
-			goto retrylock;
+			lockretrycount++;
+			if (lockretrycount < 100)
+				goto retrylock;
+		}
+		if (lockretrycount > 100) {
+			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");
+			return 1;
 		}
 		memcpy(&p->recv, &sin, sizeof(p->recv));
 		if (recordhistory) {