From: Mark Spencer <markster@digium.com>
Date: Thu, 29 Jul 2004 02:07:03 +0000 (+0000)
Subject: Don't get stuck looping when looking for CRV's
X-Git-Tag: 1.0.0-rc2~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43866cf0d90091e4281bcac59352bb9516abe2d0;p=thirdparty%2Fasterisk.git

Don't get stuck looping when looking for CRV's


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index ee1ea91832..e8442b6211 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6413,11 +6413,13 @@ static struct ast_channel *zt_request(char *type, int format, void *data)
 	int trunkgroup;
 	struct zt_pri *pri=NULL;
 #endif	
-	struct zt_pvt *exit;
+	struct zt_pvt *exit, *start, *end;
 	ast_mutex_t *lock;
 	
 	/* Assume we're locking the iflock */
 	lock = &iflock;
+	start = iflist;
+	end = ifend;
 	/* We do signed linear */
 	oldformat = format;
 	format &= (AST_FORMAT_SLINEAR | AST_FORMAT_ULAW);
@@ -6481,6 +6483,8 @@ static struct ast_channel *zt_request(char *type, int format, void *data)
 				if (pris[x].trunkgroup == trunkgroup) {
 					pri = pris + x;
 					lock = &pri->lock;
+					start = pri->crvs;
+					end = pri->crvend;
 					break;
 				}
 			}
@@ -6588,11 +6592,11 @@ next:
 		if (backwards) {
 			p = p->prev;
 			if (!p)
-				p = ifend;
+				p = end;
 		} else {
 			p = p->next;
 			if (!p)
-				p = iflist;
+				p = start;
 		}
 		/* stop when you roll to the one that we started from */
 		if (p == exit)