retronetworking
/
chan-capi
mirror of https://github.com/MelwareDE/chan-capi.git
13
0
Fork 0
Code Issues Projects Releases Wiki Activity

- changed isdnmode configuration from ptp/ptmp to msn/did 

- added ntmode configuration
This commit is contained in:
MelwareDE 2005-08-25 19:00:55 +00:00
parent e7cc5d7be4
commit d5490d3ac5
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
capi.conf
View File

@ -16,9 +16,10 @@ txgain=0.8
[ISDN1] ;this example interface gets name 'ISDN1' and may be any
;name not starting with 'g' or 'contr'.
isdnmode=ptmp ;ptmp (point-to-multipoint) or ptp (point-to-point)
;ntmode=yes ;if isdn card operates in nt mode, set this to yes
isdnmode=msn ;'MSN' (point-to-multipoint) or 'DID' (direct inward dial)
;when using NT-mode, ptp should be set in any case
incomingmsn=* ;allow incoming calls to this list of MSNs, * == any
incomingmsn=* ;allow incoming calls to this list of MSNs/DIDs, * == any
controller=1 ;capi controller number to use
group=1 ;dialout group
;prefix=0 ;set a prefix to calling number on incoming calls

28
chan_capi.c
View File

@ -875,7 +875,7 @@ static int capi_send_answer(struct ast_channel *c, int *bprot, _cstruct b3conf)
char *dnid;
char *connectednumber;
if ((i->isdnmode == AST_CAPI_ISDNMODE_PTP) &&
if ((i->isdnmode == AST_CAPI_ISDNMODE_DID) &&
((strlen(i->incomingmsn) < strlen(i->dnid)) &&
(strcmp(i->incomingmsn, "*")))) {
dnid = i->dnid + strlen(i->incomingmsn);
@ -2665,7 +2665,7 @@ static void capi_handle_connect_indication(_cmsg *CMSG, unsigned int PLCI, unsig
if ((CONNECT_IND_BCHANNELINFORMATION(CMSG)) &&
((CONNECT_IND_BCHANNELINFORMATION(CMSG)[1] == 0x02) &&
(capi_controllers[controller]->isdnmode != AST_CAPI_ISDNMODE_PTP))) {
(capi_controllers[controller]->isdnmode == AST_CAPI_ISDNMODE_MSN))) {
/*
* this is a call waiting CONNECT_IND with BChannelinformation[1] == 0x02
* meaning "no B or D channel for this call", since we can't do anything with call waiting now
@ -2699,9 +2699,9 @@ static void capi_handle_connect_indication(_cmsg *CMSG, unsigned int PLCI, unsig
/* make sure the number match exactly or may match on ptp mode */
cc_ast_verbose(4, 1, VERBOSE_PREFIX_4 "%s: msn='%s' DNID='%s' %s\n",
i->name, msn, DNID,
(i->isdnmode == AST_CAPI_ISDNMODE_PTMP)?"PtMP":"PtP");
(i->isdnmode == AST_CAPI_ISDNMODE_MSN)?"MSN":"DID");
if ((strcasecmp(msn, DNID)) &&
((i->isdnmode == AST_CAPI_ISDNMODE_PTMP) ||
((i->isdnmode == AST_CAPI_ISDNMODE_MSN) ||
(strlen(msn) >= strlen(DNID)) ||
(strncasecmp(msn, DNID, strlen(msn)))) &&
(strncasecmp(msn, magicmsn, strlen(msn)))) {
@ -2728,7 +2728,7 @@ static void capi_handle_connect_indication(_cmsg *CMSG, unsigned int PLCI, unsig
i->MessageNumber = CMSG->Messagenumber;
i->cid_ton = callernplan;
if (i->isdnmode == AST_CAPI_ISDNMODE_PTP) {
if (i->isdnmode == AST_CAPI_ISDNMODE_DID) {
capi_new(i, AST_STATE_DOWN);
i->state = CAPI_STATE_DID;
if (!strlen(i->dnid) && (i->immediate) && (i->owner)) {
@ -3428,6 +3428,7 @@ static int capi_indicate(struct ast_channel *c, int condition)
case AST_CONTROL_PROGRESS:
cc_ast_verbose(3, 1, VERBOSE_PREFIX_2 "%s: Requested PROGRESS-Indication for %s\n",
i->name, c->name);
#warning TODO: in NT-mode we should send progress for early b3 to phone
break;
case AST_CONTROL_PROCEEDING:
cc_ast_verbose(3, 1, VERBOSE_PREFIX_2 "%s: Requested PROCEEDING-Indication for %s\n",
@ -3653,6 +3654,7 @@ int mkif(struct ast_capi_conf *conf)
tmp->ecOption = conf->ecoption;
tmp->ecTail = conf->ectail;
tmp->isdnmode = conf->isdnmode;
tmp->ntmode = conf->ntmode;
tmp->ES = conf->es;
tmp->callgroup = conf->callgroup;
tmp->group = conf->group;
@ -4102,13 +4104,17 @@ static int conf_interface(struct ast_capi_conf *conf, struct ast_variable *v)
}
continue;
}
if (!strcasecmp(v->name, "ntmode")) {
if (ast_true(v->value)) {
conf->ntmode = 1;
}
continue;
}
if (!strcasecmp(v->name, "isdnmode")) {
if (!strcasecmp(v->value, "ptp") || !strcasecmp(v->value, "1"))
conf->isdnmode = AST_CAPI_ISDNMODE_PTP;
else if (!strcasecmp(v->value, "ptm") ||
!strcasecmp(v->value, "0") ||
!strcasecmp(v->value, "ptmp"))
conf->isdnmode = AST_CAPI_ISDNMODE_PTMP;
if (!strcasecmp(v->value, "did"))
conf->isdnmode = AST_CAPI_ISDNMODE_DID;
else if (!strcasecmp(v->value, "msn"))
conf->isdnmode = AST_CAPI_ISDNMODE_MSN;
else
ast_log(LOG_ERROR,"Unknown isdnmode parameter \"%s\" -- ignoring\n",
v->value);

9
chan_capi.h
View File

@ -33,8 +33,8 @@
#define AST_CAPI_BCHANS 120
#define ALL_SERVICES 0x1FFF03FF
#define AST_CAPI_ISDNMODE_PTMP 0
#define AST_CAPI_ISDNMODE_PTP 1
#define AST_CAPI_ISDNMODE_MSN 0
#define AST_CAPI_ISDNMODE_DID 1
/*
* helper for ast_verbose with different verbose settings
@ -246,8 +246,10 @@ struct ast_capi_pvt {
int doEC;
int ecOption;
int ecTail;
/* isdnmode ptp or ptm */
/* isdnmode MSN or DID */
int isdnmode;
/* NT-mode */
int ntmode;
/* Answer before getting digits? */
int immediate;
/* which holdtype */
@ -323,6 +325,7 @@ struct ast_capi_conf {
int ecoption;
int ectail;
int isdnmode;
int ntmode;
int immediate;
int holdtype;
int es;