From 32448a4482ec89b72ee95b2fa1b6d5f9f2bd6be6 Mon Sep 17 00:00:00 2001 From: MelwareDE Date: Sun, 3 Jul 2005 12:15:14 +0000 Subject: [PATCH] gX in the dialstring may be a list of groups or a range. --- README | 6 +++++- chan_capi.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README b/README index d109f9c..c81c7eb 100644 --- a/README +++ b/README @@ -72,7 +72,11 @@ This chan_capi version includes: Now it is: Dial(CAPI/g/[b|B]) Or: Dial(CAPI/contr/[b|B]) - + + 'group' can be a value, comma separated list of values or a range + using '-'. The according interface is found by searching a match with + the 'group' specified in the capi.conf for each interface. + CLIP/CLIR now uses the calling presentation of the calling channel, which can be modified using the CallingPres() application. Use CallingPres(32) for CLIR. That is why the msn= param in capi.conf is now obsolete. The callerID is also diff --git a/chan_capi.c b/chan_capi.c index c5ff758..40587ae 100644 --- a/chan_capi.c +++ b/chan_capi.c @@ -1350,7 +1350,7 @@ struct ast_channel *capi_request(char *type, int format, void *data) if (((char *)interface)[0] == 'g') { interface++; - capigroup = atoi(interface); + capigroup = ast_get_group(interface); cc_ast_verbose(1, 1, VERBOSE_PREFIX_3 "capi request group = %d\n", capigroup); } else if (!strncmp(interface, "contr", 5)) { @@ -1382,7 +1382,7 @@ struct ast_channel *capi_request(char *type, int format, void *data) foundcontroller = controller; } else { /* DIAL(CAPI/gX/...) */ - if (!(i->group & (1 << capigroup))) { + if (!(i->group & capigroup)) { /* keep on running! */ ast_mutex_unlock(&contrlock); continue;