sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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/trunk@29735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
BJ Weschke 2006-05-23 17:31:05 +00:00
parent ede4906f8d
commit c4227714fd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_sip.c
View File

@ -12098,6 +12098,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));
@ -12156,7 +12157,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;
}
p->recv = sin;
if (recordhistory) /* This is a request or response, note what it was for */