backport proper channel_find_locked behavior from 1.4 branch (noted by Steve Davies...

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

diff --git a/channel.c b/channel.c
index 9a54db0598f31bd20ccaed1747feced235c8a5d5..d07656555fdac4e58d36eadb46b32e6ce42bc0bd 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -732,43 +732,34 @@ static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
                                               const char *context, const char *exten)
 {
        const char *msg = prev ? "deadlock" : "initial deadlock";
-       int retries, done;
+       int retries;
        struct ast_channel *c;
 
        for (retries = 0; retries < 10; retries++) {
+               int done;
+
                ast_mutex_lock(&chlock);
                for (c = channels; c; c = c->next) {
-                       if (!prev) {
-                               /* want head of list */
-                               if (!name && !exten)
-                                       break;
-                               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 */
+                       if (prev) {     /* look for next item */
+                               if (c != prev)  /* not this one */
+                                       continue;
+                               /* found, prepare to return 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 */
                done = (c == NULL) || (ast_mutex_trylock(&c->lock) == 0);