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

- added channel locks

This commit is contained in:
MelwareDE 2005-10-01 13:21:28 +00:00
parent f13580a630
commit 82956c6319
3 changed files with 79 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
capi.conf
View File

@ -44,7 +44,6 @@ echocancelold=yes;use facility selector 6 instead of correct 8 (necessary for ol
;echotail=64 ;echo cancel tail setting ;echotail=64 ;echo cancel tail setting
;bridge=yes ;native bridging (CAPI line interconnect) if available ;bridge=yes ;native bridging (CAPI line interconnect) if available
;callgroup=1 ;Asterisk call group ;callgroup=1 ;Asterisk call group
;deflect=1234567 ;deflect incoming calls to 1234567 if all B channels are busy
devices=2 ;number of concurrent calls on this controller devices=2 ;number of concurrent calls on this controller
;(2 makes sense for single BRI, 30 for PRI) ;(2 makes sense for single BRI, 30 for PRI)

106
chan_capi.c
View File

@ -92,6 +92,7 @@ static int capi_num_controllers = 0;
static unsigned int capi_counter = 0; static unsigned int capi_counter = 0;
static unsigned long capi_used_controllers = 0; static unsigned long capi_used_controllers = 0;
static char *emptyid = "\0"; static char *emptyid = "\0";
static struct ast_channel *chan_to_hangup = NULL;
static char capi_national_prefix[AST_MAX_EXTENSION]; static char capi_national_prefix[AST_MAX_EXTENSION];
static char capi_international_prefix[AST_MAX_EXTENSION]; static char capi_international_prefix[AST_MAX_EXTENSION];
@ -245,9 +246,8 @@ static MESSAGE_EXCHANGE_ERROR check_wait_get_cmsg(_cmsg *CMSG)
* *
* For BSD hide problem from "chan_capi": * For BSD hide problem from "chan_capi":
*/ */
if((HEADER_CID(CMSG) & 0xFF) == 0) if((HEADER_CID(CMSG) & 0xFF) == 0) {
{ HEADER_CID(CMSG) += capi_num_controllers;
HEADER_CID(CMSG) += capi_num_controllers;
} }
} }
return Info; return Info;
@ -524,10 +524,10 @@ static int capi_send_info_digits(struct ast_capi_pvt *i, char *digits, int len)
static int capi_send_digit(struct ast_channel *c, char digit) static int capi_send_digit(struct ast_channel *c, char digit)
{ {
struct ast_capi_pvt *i = CC_AST_CHANNEL_PVT(c); struct ast_capi_pvt *i = CC_AST_CHANNEL_PVT(c);
MESSAGE_EXCHANGE_ERROR error;
_cmsg CMSG; _cmsg CMSG;
char buf[10]; char buf[10];
char did[2]; char did[2];
int ret = 0;
if (i == NULL) { if (i == NULL) {
ast_log(LOG_ERROR, "No interface!\n"); ast_log(LOG_ERROR, "No interface!\n");
@ -536,6 +536,8 @@ static int capi_send_digit(struct ast_channel *c, char digit)
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
ast_mutex_lock(&i->lock);
if ((c->_state == AST_STATE_DIALING) && if ((c->_state == AST_STATE_DIALING) &&
(i->state != CAPI_STATE_DISCONNECTING)) { (i->state != CAPI_STATE_DISCONNECTING)) {
did[0] = digit; did[0] = digit;
@ -544,13 +546,14 @@ static int capi_send_digit(struct ast_channel *c, char digit)
update_channel_name(i); update_channel_name(i);
if ((i->isdnstate & CAPI_ISDN_STATE_SETUP_ACK) && if ((i->isdnstate & CAPI_ISDN_STATE_SETUP_ACK) &&
(i->doOverlap == 0)) { (i->doOverlap == 0)) {
return (capi_send_info_digits(i, &digit, 1)); ret = capi_send_info_digits(i, &digit, 1);
} else { } else {
/* if no SETUP-ACK yet, add it to the overlap list */ /* if no SETUP-ACK yet, add it to the overlap list */
strncat(i->overlapdigits, &digit, 1); strncat(i->overlapdigits, &digit, 1);
i->doOverlap = 1; i->doOverlap = 1;
return 0;
} }
ast_mutex_unlock(&i->lock);
return ret;
} }
if ((i->earlyB3 != 1) && (i->state == CAPI_STATE_BCONNECTED)) { if ((i->earlyB3 != 1) && (i->state == CAPI_STATE_BCONNECTED)) {
@ -559,6 +562,7 @@ static int capi_send_digit(struct ast_channel *c, char digit)
if ((capi_controllers[i->controller]->dtmf == 0) || (i->doDTMF > 0)) { if ((capi_controllers[i->controller]->dtmf == 0) || (i->doDTMF > 0)) {
/* let * fake it */ /* let * fake it */
ast_mutex_unlock(&contrlock); ast_mutex_unlock(&contrlock);
ast_mutex_unlock(&i->lock);
return -1; return -1;
} }
@ -575,13 +579,13 @@ static int capi_send_digit(struct ast_channel *c, char digit)
buf[8] = digit; buf[8] = digit;
FACILITY_REQ_FACILITYREQUESTPARAMETER(&CMSG) = buf; FACILITY_REQ_FACILITYREQUESTPARAMETER(&CMSG) = buf;
if ((error = _capi_put_cmsg(&CMSG)) != 0) { if ((ret = _capi_put_cmsg(&CMSG)) == 0) {
return error; cc_ast_verbose(3, 0, VERBOSE_PREFIX_4 "%s: sent dtmf '%c'\n",
i->name, digit);
} }
cc_ast_verbose(3, 0, VERBOSE_PREFIX_4 "%s: sent dtmf '%c'\n",
i->name, digit);
} }
return 0; ast_mutex_unlock(&i->lock);
return ret;
} }
/* /*
@ -728,6 +732,8 @@ static int capi_hangup(struct ast_channel *c)
return -1; return -1;
} }
ast_mutex_lock(&i->lock);
cc_ast_verbose(3, 0, VERBOSE_PREFIX_2 "%s: CAPI Hangingup\n", cc_ast_verbose(3, 0, VERBOSE_PREFIX_2 "%s: CAPI Hangingup\n",
i->name); i->name);
@ -757,6 +763,8 @@ static int capi_hangup(struct ast_channel *c)
interface_cleanup(i); interface_cleanup(i);
} }
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
@ -854,6 +862,8 @@ static int capi_call(struct ast_channel *c, char *idest, int timeout)
strncpy(buffer, idest, sizeof(buffer) - 1); strncpy(buffer, idest, sizeof(buffer) - 1);
parse_dialstring(buffer, &interface, &dest, &param); parse_dialstring(buffer, &interface, &dest, &param);
ast_mutex_lock(&i->lock);
/* init param settings */ /* init param settings */
i->doB3 = AST_CAPI_B3_DONT; i->doB3 = AST_CAPI_B3_DONT;
i->doOverlap = 0; i->doOverlap = 0;
@ -885,6 +895,7 @@ static int capi_call(struct ast_channel *c, char *idest, int timeout)
} }
if (((!dest) || (!dest[0])) && (i->doB3 != AST_CAPI_B3_ALWAYS)) { if (((!dest) || (!dest[0])) && (i->doB3 != AST_CAPI_B3_ALWAYS)) {
ast_log(LOG_ERROR, "No destination or dialtone requested in '%s'\n", idest); ast_log(LOG_ERROR, "No destination or dialtone requested in '%s'\n", idest);
ast_mutex_unlock(&i->lock);
return -1; return -1;
} }
@ -967,6 +978,7 @@ static int capi_call(struct ast_channel *c, char *idest, int timeout)
if ((error = _capi_put_cmsg(&CMSG))) { if ((error = _capi_put_cmsg(&CMSG))) {
interface_cleanup(i); interface_cleanup(i);
ast_mutex_unlock(&i->lock);
return error; return error;
} }
@ -974,6 +986,7 @@ static int capi_call(struct ast_channel *c, char *idest, int timeout)
ast_setstate(c, AST_STATE_DIALING); ast_setstate(c, AST_STATE_DIALING);
/* now we shall return .... the rest has to be done by handle_msg */ /* now we shall return .... the rest has to be done by handle_msg */
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
@ -1036,9 +1049,14 @@ static int capi_send_answer(struct ast_channel *c, int *bprot, _cstruct b3conf)
*/ */
static int capi_answer(struct ast_channel *c) static int capi_answer(struct ast_channel *c)
{ {
struct ast_capi_pvt *i = CC_AST_CHANNEL_PVT(c);
int ret;
int bprot[3] = { 1, 1, 0 }; int bprot[3] = { 1, 1, 0 };
return capi_send_answer(c, bprot, NULL); ast_mutex_lock(&i->lock);
ret = capi_send_answer(c, bprot, NULL);
ast_mutex_unlock(&i->lock);
return ret;
} }
/* /*
@ -1054,8 +1072,11 @@ struct ast_frame *capi_read(struct ast_channel *c)
return NULL; return NULL;
} }
ast_mutex_lock(&i->lock);
if (i->state == CAPI_STATE_ONHOLD) { if (i->state == CAPI_STATE_ONHOLD) {
i->fr.frametype = AST_FRAME_NULL; i->fr.frametype = AST_FRAME_NULL;
ast_mutex_unlock(&i->lock);
return &i->fr; return &i->fr;
} }
@ -1080,6 +1101,7 @@ struct ast_frame *capi_read(struct ast_channel *c)
i->fr.mallocd = 0; i->fr.mallocd = 0;
if (i->fr.frametype == AST_FRAME_NULL) { if (i->fr.frametype == AST_FRAME_NULL) {
ast_mutex_unlock(&i->lock);
return NULL; return NULL;
} }
if ((i->fr.frametype == AST_FRAME_DTMF) && (i->fr.subclass == 'f')) { if ((i->fr.frametype == AST_FRAME_DTMF) && (i->fr.subclass == 'f')) {
@ -1098,6 +1120,7 @@ struct ast_frame *capi_read(struct ast_channel *c)
ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n"); ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n");
} }
} }
ast_mutex_unlock(&i->lock);
return &i->fr; return &i->fr;
} }
@ -1119,38 +1142,48 @@ int capi_write(struct ast_channel *c, struct ast_frame *f)
return -1; return -1;
} }
ast_mutex_lock(&i->lock);
/* dont send audio to the local exchange! */ /* dont send audio to the local exchange! */
if ((i->earlyB3 == 1) || (!i->NCCI)) { if ((i->earlyB3 == 1) || (!i->NCCI)) {
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
if (f->frametype == AST_FRAME_NULL) { if (f->frametype == AST_FRAME_NULL) {
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
if (f->frametype == AST_FRAME_DTMF) { if (f->frametype == AST_FRAME_DTMF) {
ast_log(LOG_ERROR, "dtmf frame should be written\n"); ast_log(LOG_ERROR, "dtmf frame should be written\n");
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
if (f->frametype != AST_FRAME_VOICE) { if (f->frametype != AST_FRAME_VOICE) {
ast_log(LOG_ERROR,"not a voice frame\n"); ast_log(LOG_ERROR,"not a voice frame\n");
ast_mutex_unlock(&i->lock);
return -1; return -1;
} }
if (i->FaxState) { if (i->FaxState) {
cc_ast_verbose(3, 1, VERBOSE_PREFIX_2 "%s: write on fax_receive?\n", cc_ast_verbose(3, 1, VERBOSE_PREFIX_2 "%s: write on fax_receive?\n",
i->name); i->name);
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
if (f->subclass != capi_capability) { if (f->subclass != capi_capability) {
ast_log(LOG_ERROR, "dont know how to write subclass %d\n", f->subclass); ast_log(LOG_ERROR, "dont know how to write subclass %d\n", f->subclass);
ast_mutex_unlock(&i->lock);
return -1; return -1;
} }
if ((!f->data) || (!f->datalen) || (!i->smoother)) { if ((!f->data) || (!f->datalen) || (!i->smoother)) {
ast_log(LOG_ERROR, "No data for FRAME_VOICE %s\n", c->name); ast_log(LOG_ERROR, "No data for FRAME_VOICE %s\n", c->name);
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
if (ast_smoother_feed(i->smoother, f) != 0) { if (ast_smoother_feed(i->smoother, f) != 0) {
ast_log(LOG_ERROR, "%s: failed to fill smoother\n", i->name); ast_log(LOG_ERROR, "%s: failed to fill smoother\n", i->name);
ast_mutex_unlock(&i->lock);
return -1; return -1;
} }
@ -1210,6 +1243,7 @@ int capi_write(struct ast_channel *c, struct ast_frame *f)
fsmooth = ast_smoother_read(i->smoother); fsmooth = ast_smoother_read(i->smoother);
} }
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
@ -1223,7 +1257,9 @@ static int capi_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
cc_ast_verbose(3, 1, VERBOSE_PREFIX_2 "%s: %s fixup now %s\n", cc_ast_verbose(3, 1, VERBOSE_PREFIX_2 "%s: %s fixup now %s\n",
i->name, oldchan->name, newchan->name); i->name, oldchan->name, newchan->name);
ast_mutex_lock(&i->lock);
i->owner = newchan; i->owner = newchan;
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
@ -1680,6 +1716,8 @@ static int capi_receive_fax(struct ast_channel *c, char *data)
return -1; return -1;
} }
ast_mutex_lock(&i->lock);
filename = strsep(&data, "|"); filename = strsep(&data, "|");
stationid = strsep(&data, "|"); stationid = strsep(&data, "|");
headline = data; headline = data;
@ -1690,6 +1728,7 @@ static int capi_receive_fax(struct ast_channel *c, char *data)
headline = emptyid; headline = emptyid;
if ((i->fFax = fopen(filename, "wb")) == NULL) { if ((i->fFax = fopen(filename, "wb")) == NULL) {
ast_mutex_unlock(&i->lock);
ast_log(LOG_WARNING, "can't create fax output file (%s)\n", strerror(errno)); ast_log(LOG_WARNING, "can't create fax output file (%s)\n", strerror(errno));
return -1; return -1;
} }
@ -1709,6 +1748,7 @@ static int capi_receive_fax(struct ast_channel *c, char *data)
break; break;
default: default:
i->FaxState = 0; i->FaxState = 0;
ast_mutex_unlock(&i->lock);
ast_log(LOG_WARNING, "capi receive fax in wrong state (%d)\n", ast_log(LOG_WARNING, "capi receive fax in wrong state (%d)\n",
i->state); i->state);
return -1; return -1;
@ -1740,6 +1780,7 @@ static int capi_receive_fax(struct ast_channel *c, char *data)
VERBOSE_PREFIX_1 "capi receivefax: fax receive successful.\n"); VERBOSE_PREFIX_1 "capi receivefax: fax receive successful.\n");
} }
ast_mutex_unlock(&i->lock);
return res; return res;
} }
@ -2024,7 +2065,7 @@ static void start_pbx_on_match(struct ast_capi_pvt *i, unsigned int PLCI, _cword
if (ast_pbx_start(i->owner)) { if (ast_pbx_start(i->owner)) {
ast_log(LOG_ERROR, "%s: Unable to start pbx on channel!\n", ast_log(LOG_ERROR, "%s: Unable to start pbx on channel!\n",
i->name); i->name);
ast_hangup(i->owner); chan_to_hangup = i->owner;
} else { } else {
cc_ast_verbose(2, 1, VERBOSE_PREFIX_2 "Started pbx on channel %s\n", cc_ast_verbose(2, 1, VERBOSE_PREFIX_2 "Started pbx on channel %s\n",
i->owner->name); i->owner->name);
@ -2891,7 +2932,7 @@ static void capi_handle_disconnect_indication(_cmsg *CMSG, unsigned int PLCI, un
((state == CAPI_STATE_DID) || (state == CAPI_STATE_INCALL)) && ((state == CAPI_STATE_DID) || (state == CAPI_STATE_INCALL)) &&
(i->owner->pbx == NULL)) { (i->owner->pbx == NULL)) {
/* the pbx was not started yet */ /* the pbx was not started yet */
ast_hangup(i->owner); chan_to_hangup = i->owner;
return; return;
} }
@ -2946,9 +2987,12 @@ static int capi_call_deflect(struct ast_channel *c, char *param)
return -1; return -1;
} }
ast_mutex_lock(&i->lock);
if ((i->state != CAPI_STATE_INCALL) && if ((i->state != CAPI_STATE_INCALL) &&
(i->state != CAPI_STATE_DID) && (i->state != CAPI_STATE_DID) &&
(i->state != CAPI_STATE_ALERTING)) { (i->state != CAPI_STATE_ALERTING)) {
ast_mutex_unlock(&i->lock);
ast_log(LOG_WARNING, "wrong state of call for call deflection\n"); ast_log(LOG_WARNING, "wrong state of call for call deflection\n");
return -1; return -1;
} }
@ -3022,6 +3066,7 @@ static int capi_call_deflect(struct ast_channel *c, char *param)
cc_ast_verbose(2, 1, VERBOSE_PREFIX_3 "%s: sent INFO_REQ for CD PLCI = %#x\n", cc_ast_verbose(2, 1, VERBOSE_PREFIX_3 "%s: sent INFO_REQ for CD PLCI = %#x\n",
i->name, i->PLCI); i->name, i->PLCI);
ast_mutex_unlock(&i->lock);
return(res); return(res);
} }
@ -3042,7 +3087,6 @@ static void capi_handle_connect_indication(_cmsg *CMSG, unsigned int PLCI, unsig
char *buffer_rp = buffer_r; char *buffer_rp = buffer_r;
char *magicmsn = "*\0"; char *magicmsn = "*\0";
char *emptydnid = "\0"; char *emptydnid = "\0";
int deflect = 0;
int callpres = 0; int callpres = 0;
if (*interface) { if (*interface) {
@ -3084,7 +3128,6 @@ static void capi_handle_connect_indication(_cmsg *CMSG, unsigned int PLCI, unsig
* so it will look like a callwaiting connect_ind to us * so it will look like a callwaiting connect_ind to us
*/ */
ast_log(LOG_NOTICE, "Received a call waiting CONNECT_IND\n"); ast_log(LOG_NOTICE, "Received a call waiting CONNECT_IND\n");
deflect = 1;
} }
/* well...somebody is calling us. let's set up a channel */ /* well...somebody is calling us. let's set up a channel */
@ -3157,14 +3200,8 @@ static void capi_handle_connect_indication(_cmsg *CMSG, unsigned int PLCI, unsig
cc_ast_verbose(3, 0, VERBOSE_PREFIX_2 "%s: Incoming call '%s' -> '%s'\n", cc_ast_verbose(3, 0, VERBOSE_PREFIX_2 "%s: Incoming call '%s' -> '%s'\n",
i->name, i->cid, i->dnid); i->name, i->cid, i->dnid);
if (deflect == 1) {
if ((i->deflect2) && (strlen(i->deflect2))) {
capi_call_deflect(i->owner, i->deflect2);
} else
break;
}
*interface = i; *interface = i;
ast_mutex_lock(&i->lock);
ast_mutex_unlock(&iflock); ast_mutex_unlock(&iflock);
sprintf(buffer, "%d", callednplan); sprintf(buffer, "%d", callednplan);
@ -3182,7 +3219,7 @@ static void capi_handle_connect_indication(_cmsg *CMSG, unsigned int PLCI, unsig
pbx_builtin_setvar_helper(i->owner, "ANI2", buffer); pbx_builtin_setvar_helper(i->owner, "ANI2", buffer);
pbx_builtin_setvar_helper(i->owner, "SECONDCALLERID", buffer); pbx_builtin_setvar_helper(i->owner, "SECONDCALLERID", buffer);
*/ */
if ((i->isdnmode == AST_CAPI_ISDNMODE_MSN) && (i->immediate) && (!deflect)) { if ((i->isdnmode == AST_CAPI_ISDNMODE_MSN) && (i->immediate)) {
/* if we don't want to wait for SETUP/SENDING-COMPLETE in MSN mode */ /* if we don't want to wait for SETUP/SENDING-COMPLETE in MSN mode */
start_pbx_on_match(i, PLCI, HEADER_MSGNUM(CMSG)); start_pbx_on_match(i, PLCI, HEADER_MSGNUM(CMSG));
} }
@ -3305,6 +3342,9 @@ static void capi_handle_msg(_cmsg *CMSG)
cc_ast_verbose(4, 1, "%s\n", capi_cmsg2str(CMSG)); cc_ast_verbose(4, 1, "%s\n", capi_cmsg2str(CMSG));
} }
if (i != NULL)
ast_mutex_lock(&i->lock);
/* main switch table */ /* main switch table */
switch (wCmd) { switch (wCmd) {
@ -3452,6 +3492,10 @@ static void capi_handle_msg(_cmsg *CMSG)
} }
show_capi_info(wInfo); show_capi_info(wInfo);
} }
if (i != NULL)
ast_mutex_unlock(&i->lock);
return; return;
} }
@ -3695,6 +3739,8 @@ static int capi_malicious(struct ast_channel *c, char *param)
return -1; return -1;
} }
ast_mutex_lock(&i->lock);
fac[0] = 3; /* len */ fac[0] = 3; /* len */
fac[1] = 0x0e; /* MCID */ fac[1] = 0x0e; /* MCID */
fac[2] = 0x00; fac[2] = 0x00;
@ -3710,6 +3756,7 @@ static int capi_malicious(struct ast_channel *c, char *param)
cc_ast_verbose(2, 1, VERBOSE_PREFIX_4 "%s: sent MCID for PLCI=%#x\n", cc_ast_verbose(2, 1, VERBOSE_PREFIX_4 "%s: sent MCID for PLCI=%#x\n",
i->name, i->PLCI); i->name, i->PLCI);
ast_mutex_unlock(&i->lock);
return 0; return 0;
} }
@ -3894,6 +3941,8 @@ static int capi_indicate(struct ast_channel *c, int condition)
return -1; return -1;
} }
ast_mutex_lock(&i->lock);
switch (condition) { switch (condition) {
case AST_CONTROL_RINGING: case AST_CONTROL_RINGING:
cc_ast_verbose(3, 1, VERBOSE_PREFIX_2 "%s: Requested RINGING-Indication for %s\n", cc_ast_verbose(3, 1, VERBOSE_PREFIX_2 "%s: Requested RINGING-Indication for %s\n",
@ -3970,6 +4019,7 @@ static int capi_indicate(struct ast_channel *c, int condition)
i->name, condition, c->name); i->name, condition, c->name);
break; break;
} }
ast_mutex_unlock(&i->lock);
return(ret); return(ret);
} }
@ -3988,6 +4038,11 @@ static void *do_monitor(void *data)
switch(Info = check_wait_get_cmsg(&monCMSG)) { switch(Info = check_wait_get_cmsg(&monCMSG)) {
case 0x0000: case 0x0000:
capi_handle_msg(&monCMSG); capi_handle_msg(&monCMSG);
if (chan_to_hangup != NULL) {
/* deferred (out of lock) hangup */
ast_hangup(chan_to_hangup);
chan_to_hangup = NULL;
}
break; break;
case 0x1104: case 0x1104:
/* CAPI queue is empty */ /* CAPI queue is empty */
@ -4132,8 +4187,6 @@ int mkif(struct ast_capi_conf *conf)
tmp->txgain = conf->txgain; tmp->txgain = conf->txgain;
capi_gains(&tmp->g, conf->rxgain, conf->txgain); capi_gains(&tmp->g, conf->rxgain, conf->txgain);
strncpy(tmp->deflect2, conf->deflect2, sizeof(tmp->deflect2) - 1);
tmp->doDTMF = conf->softdtmf; tmp->doDTMF = conf->softdtmf;
tmp->next = iflist; /* prepend */ tmp->next = iflist; /* prepend */
@ -4510,7 +4563,6 @@ static int conf_interface(struct ast_capi_conf *conf, struct ast_variable *v)
CONF_STRING(conf->context, "context"); CONF_STRING(conf->context, "context");
CONF_STRING(conf->incomingmsn, "incomingmsn"); CONF_STRING(conf->incomingmsn, "incomingmsn");
CONF_STRING(conf->controllerstr, "controller"); CONF_STRING(conf->controllerstr, "controller");
CONF_STRING(conf->deflect2, "deflect");
CONF_STRING(conf->prefix, "prefix"); CONF_STRING(conf->prefix, "prefix");
CONF_STRING(conf->accountcode, "accountcode"); CONF_STRING(conf->accountcode, "accountcode");

3
chan_capi.h
View File

@ -292,9 +292,6 @@ struct ast_capi_pvt {
/* Fax ready ? */ /* Fax ready ? */
int FaxState; int FaxState;
/* deflect on circuitbusy */
char deflect2[AST_MAX_EXTENSION];
/* not all codecs supply frames in nice 160 byte chunks */ /* not all codecs supply frames in nice 160 byte chunks */
struct ast_smoother *smoother; struct ast_smoother *smoother;
/* ok, we stop to be nice and give them the lowest possible latency 130 samples * 2 = 260 bytes */ /* ok, we stop to be nice and give them the lowest possible latency 130 samples * 2 = 260 bytes */