Allow zap groups above 30 to work properly.

(closes issue #11590)
Reported by: tbsky


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@100835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-01-29 16:10:00 +00:00
parent 31c5fc22a5
commit 75007e2ab5

View File

@@ -7572,7 +7572,7 @@ static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pr
return tmp; return tmp;
} }
static inline int available(struct zt_pvt *p, int channelmatch, int groupmatch, int *busy, int *channelmatched, int *groupmatched) static inline int available(struct zt_pvt *p, int channelmatch, ast_group_t groupmatch, int *busy, int *channelmatched, int *groupmatched)
{ {
int res; int res;
ZT_PARAMS par; ZT_PARAMS par;
@@ -7740,7 +7740,7 @@ static int pri_find_empty_chan(struct zt_pri *pri, int backwards)
static struct ast_channel *zt_request(const char *type, int format, void *data, int *cause) static struct ast_channel *zt_request(const char *type, int format, void *data, int *cause)
{ {
int groupmatch = 0; ast_group_t groupmatch = 0;
int channelmatch = -1; int channelmatch = -1;
int roundrobin = 0; int roundrobin = 0;
int callwait = 0; int callwait = 0;
@@ -7783,7 +7783,7 @@ static struct ast_channel *zt_request(const char *type, int format, void *data,
ast_log(LOG_WARNING, "Unable to determine group for data %s\n", (char *)data); ast_log(LOG_WARNING, "Unable to determine group for data %s\n", (char *)data);
return NULL; return NULL;
} }
groupmatch = 1 << x; groupmatch = ((ast_group_t) 1 << x);
if (toupper(dest[0]) == 'G') { if (toupper(dest[0]) == 'G') {
if (dest[0] == 'G') { if (dest[0] == 'G') {
backwards = 1; backwards = 1;