diff options
| author | Mark Spencer <markster@digium.com> | 2004-07-29 02:07:03 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-07-29 02:07:03 +0000 |
| commit | 43866cf0d90091e4281bcac59352bb9516abe2d0 (patch) | |
| tree | f49d5d8732ee64305cf2146815f6775b816f7e58 /channels | |
| parent | deb02a000f8d0ba8f82dc0bdf23ab80f94d39189 (diff) | |
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
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_zap.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index ee1ea9183..e8442b621 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) |