Merged revisions 100835 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r100835 | qwell | 2008-01-29 10:10:00 -0600 (Tue, 29 Jan 2008) | 5 lines

Allow zap groups above 30 to work properly.

(closes issue #11590)
Reported by: tbsky

........

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 2e23247..aec8496 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -8533,7 +8533,7 @@ static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pr
        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;
        ZT_PARAMS par;
@@ -8713,7 +8713,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)
 {
-       int groupmatch = 0;
+       ast_group_t groupmatch = 0;
        int channelmatch = -1;
        int roundrobin = 0;
        int callwait = 0;
@@ -8756,7 +8756,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);
                        return NULL;
                }
-               groupmatch = 1 << x;
+               groupmatch = ((ast_group_t) 1 << x);
                if (toupper(dest[0]) == 'G') {
                        if (dest[0] == 'G') {
                                backwards = 1;