kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 20:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

backport proper channel_find_locked behavior from 1.4 branch (noted by Steve Davies on asterisk-dev list)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@47802 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-11-17 19:02:09 +00:00
parent b5d03cfa96
commit ad0f8df528
1 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
channel.c
View File

@@ -732,43 +732,34 @@ static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
const char *context, const char *exten) const char *context, const char *exten)
{ {
const char *msg = prev ? "deadlock" : "initial deadlock"; const char *msg = prev ? "deadlock" : "initial deadlock";
int retries, done; int retries;
struct ast_channel *c; struct ast_channel *c;
for (retries = 0; retries < 10; retries++) { for (retries = 0; retries < 10; retries++) {
int done;
ast_mutex_lock(&chlock); ast_mutex_lock(&chlock);
for (c = channels; c; c = c->next) { for (c = channels; c; c = c->next) {
if (!prev) { if (prev) { /* look for next item */
/* want head of list */ if (c != prev) /* not this one */
if (!name && !exten) continue;
break; /* found, prepare to return c->next */
if (name) {
/* want match by full name */
if (!namelen) {
if (!strcasecmp(c->name, name))
break;
else
continue;
}
/* want match by name prefix */
if (!strncasecmp(c->name, name, namelen))
break;
} else if (exten) {
/* want match by context and exten */
if (context && (strcasecmp(c->context, context) &&
strcasecmp(c->macrocontext, context)))
continue;
/* match by exten */
if (strcasecmp(c->exten, exten) &&
strcasecmp(c->macroexten, exten))
continue;
else
break;
}
} else if (c == prev) { /* found, return c->next */
c = c->next; c = c->next;
break;
} }
if (name) { /* want match by name */
if ((!namelen && strcasecmp(c->name, name)) ||
(namelen && strncasecmp(c->name, name, namelen)))
continue; /* name match failed */
} else if (exten) {
if (context && strcasecmp(c->context, context) &&
strcasecmp(c->macrocontext, context))
continue; /* context match failed */
if (strcasecmp(c->exten, exten) &&
strcasecmp(c->macroexten, exten))
continue; /* exten match failed */
}
/* if we get here, c points to the desired record */
break;
} }
/* exit if chan not found or mutex acquired successfully */ /* exit if chan not found or mutex acquired successfully */
done = (c == NULL) || (ast_mutex_trylock(&c->lock) == 0); done = (c == NULL) || (ast_mutex_trylock(&c->lock) == 0);