If the ref is 0 and the state is CHAN_LCR_STATE_RELEASE, see the proceedure
"Call is released by LCR".
+
+Locking issues:
+
+The deadlocking problem:
+
+- chan_lcr locks chan_lock and waits inside ast_queue_xxxx() for ast_channel
+to be unlocked.
+- ast_channel thread locks ast_channel and calls a tech function and waits
+there for chan_lock to be unlocked.
+
+The solution:
+
+Never call ast_queue_xxxx() if ast_channel is not locked and don't wait until
+ast_channel can be locked. All messages to asterisk are queued inside call
+instance and will be handled using a try-lock to get ast_channel lock.
+If it succeeds to lock ast_channel, the ast_queue_xxxx can safely called even
+if the lock is incremented and decremented there.
+
+Exception: Calling ast_queue_frame inside ast->tech->read is safe, because
+it is called from ast_channel process which has already locked ast_channel.
+
*/
#include <stdio.h>
va_end(args);
if (call)
- sprintf(call_text, "%ld", call->ref);
+ sprintf(call_text, "%d", call->ref);
if (ast)
strncpy(ast_text, ast->name, sizeof(ast_text)-1);
ast_text[sizeof(ast_text)-1] = '\0';
*/
struct chan_call *call_first;
-struct chan_call *find_call_ref(unsigned long ref)
+struct chan_call *find_call_ref(unsigned int ref)
{
struct chan_call *call = call_first;
return(call);
}
-struct chan_call *find_call_handle(unsigned long handle)
+struct chan_call *find_call_handle(unsigned int handle)
{
struct chan_call *call = call_first;
return(id);
}
-
/*
* enque message to LCR
*/
-int send_message(int message_type, unsigned long ref, union parameter *param)
+int send_message(int message_type, unsigned int ref, union parameter *param)
{
struct admin_list *admin, **adminp;
}
/*
+ * apply options (in locked state)
+ */
+void apply_opt(struct chan_call *call, char *data)
+{
+ union parameter newparam;
+ char string[1024], *p = string, *opt, *key;
+ int gain, i, newmode = 0;
+
+ if (!data[0])
+ return; // no opts
+
+ strncpy(string, data, sizeof(string)-1);
+ string[sizeof(string)-1] = '\0';
+
+ /* parse options */
+ while((opt = strsep(&p, ":")))
+ {
+ switch(opt[0]) {
+ case 'd':
+ if (opt[1] == '\0') {
+ CERROR(call, call->ast, "Option 'd' (display) expects parameter.\n", opt);
+ break;
+ }
+ CDEBUG(call, call->ast, "Option 'd' (display) with text '%s'.\n", opt+1);
+ if (call->state == CHAN_LCR_STATE_OUT_PREPARE)
+ strncpy(call->display, opt+1, sizeof(call->display)-1);
+ else {
+ memset(&newparam, 0, sizeof(union parameter));
+ strncpy(newparam.notifyinfo.display, opt+1, sizeof(newparam.notifyinfo.display)-1);
+ send_message(MESSAGE_NOTIFY, call->ref, &newparam);
+ }
+ break;
+ case 'n':
+ if (opt[1] != '\0') {
+ CERROR(call, call->ast, "Option 'n' (no DTMF) expects no parameter.\n", opt);
+ break;
+ }
+ CDEBUG(call, call->ast, "Option 'n' (no DTMF).\n");
+ call->no_dtmf = 1;
+ break;
+ case 'c':
+ if (opt[1] == '\0') {
+ CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter.\n", opt);
+ break;
+ }
+ key = opt+1;
+ /* check for 0xXXXX... type of key */
+ if (!!strncmp((char *)key, "0x", 2)) {
+ CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter starting with '0x'.\n", opt);
+ break;
+ }
+ key+=2;
+ if (strlen(key) > 56*2 || (strlen(key) % 1)) {
+ CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter with max 56 bytes ('0x' + 112 characters)\n", opt);
+ break;
+ }
+ i = 0;
+ while(*key)
+ {
+ if (*key>='0' && *key<='9')
+ call->bf_key[i] = (*key-'0') << 8;
+ else if (*key>='a' && *key<='f')
+ call->bf_key[i] = (*key-'a'+10) << 8;
+ else if (*key>='A' && *key<='F')
+ call->bf_key[i] = (*key-'A'+10) << 8;
+ else
+ break;
+ key++;
+ if (*key>='0' && *key<='9')
+ call->bf_key[i] += (*key - '0');
+ else if (*key>='a' && *key<='f')
+ call->bf_key[i] += (*key - 'a' + 10);
+ else if (*key>='A' && *key<='F')
+ call->bf_key[i] += (*key - 'A' + 10);
+ else
+ break;
+ key++;
+ i++;
+ }
+ if (*key) {
+ CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter with hex values 0-9,a-f.\n");
+ break;
+ }
+ call->bf_len = i;
+ CDEBUG(call, call->ast, "Option 'c' (encrypt) blowfish key '%s' (len=%d).\n", opt+1, i);
+ if (call->bchannel)
+ bchannel_blowfish(call->bchannel, call->bf_key, call->bf_len);
+ break;
+ case 'h':
+ if (opt[1] != '\0') {
+ CERROR(call, call->ast, "Option 'h' (HDLC) expects no parameter.\n", opt);
+ break;
+ }
+ CDEBUG(call, call->ast, "Option 'h' (HDLC).\n");
+ if (!call->hdlc) {
+ call->hdlc = 1;
+ newmode = 1;
+ }
+ break;
+ case 't':
+ if (opt[1] != '\0') {
+ CERROR(call, call->ast, "Option 't' (transparent) expects no parameter.\n", opt);
+ break;
+ }
+ CDEBUG(call, call->ast, "Option 't' (transparent).\n");
+ if (!call->transparent) {
+ call->transparent = 1;
+ newmode = 1;
+ }
+ break;
+ case 'e':
+ if (opt[1] == '\0') {
+ CERROR(call, call->ast, "Option 'e' (echo cancel) expects parameter.\n", opt);
+ break;
+ }
+ CDEBUG(call, call->ast, "Option 'e' (echo cancel) with config '%s'.\n", opt+1);
+ strncpy(call->pipeline, opt+1, sizeof(call->pipeline)-1);
+ if (call->bchannel)
+ bchannel_pipeline(call->bchannel, call->pipeline);
+ break;
+ case 'r':
+ if (opt[1] == '\0') {
+ CERROR(call, call->ast, "Option 'r' (re-buffer 160 bytes) expects no parameter.\n", opt);
+ break;
+ }
+ CDEBUG(call, call->ast, "Option 'r' (re-buffer 160 bytes)");
+ call->rebuffer = 1;
+ break;
+#if 0
+ case 's':
+ if (opt[1] != '\0') {
+ CERROR(call, call->ast, "Option 's' (inband DTMF) expects no parameter.\n", opt);
+ break;
+ }
+ CDEBUG(call, call->ast, "Option 's' (inband DTMF).\n");
+ call->inband_dtmf = 1;
+todo
+ break;
+#endif
+ case 'v':
+ if (opt[1] != 'r' && opt[1] != 't') {
+ CERROR(call, call->ast, "Option 'v' (volume) expects parameter.\n", opt);
+ break;
+ }
+ gain = atoi(opt+2);
+ if (gain < -8 || gain >8) {
+ CERROR(call, call->ast, "Option 'v' (volume) expects parameter in range of -8 through 8.\n");
+ break;
+ }
+ CDEBUG(call, call->ast, "Option 'v' (volume) with gain 2^%d.\n", gain);
+ if (opt[1] == 'r') {
+ call->rx_gain = gain;
+ if (call->bchannel)
+ bchannel_gain(call->bchannel, call->rx_gain, 0);
+ } else {
+ call->tx_gain = gain;
+ if (call->bchannel)
+ bchannel_gain(call->bchannel, call->tx_gain, 1);
+ }
+ break;
+ default:
+ CERROR(call, call->ast, "Option '%s' unknown.\n", opt);
+ }
+ }
+
+ /* re-open, if bchannel is created */
+ if (call->bchannel && call->bchannel->b_sock > -1) {
+ bchannel_destroy(call->bchannel);
+ if (bchannel_create(call->bchannel, ((call->transparent)?1:0) + ((call->hdlc)?2:0)))
+ bchannel_activate(call->bchannel, 1);
+ }
+}
+
+/*
* send setup info to LCR
* this function is called, when asterisk call is received and ref is received
*/
if (!call->ast || !call->ref)
return;
- CDEBUG(call, call->ast, "Sending setup to LCR. (interface=%s dialstring=%s)\n", call->interface, call->dialstring);
+ CDEBUG(call, call->ast, "Sending setup to LCR. (interface=%s dialstring=%s, cid=%s)\n", call->interface, call->dialstring, call->cid_num);
/* send setup message to LCR */
memset(&newparam, 0, sizeof(union parameter));
strncpy(newparam.setup.dialinginfo.interfaces, call->interface, sizeof(newparam.setup.dialinginfo.interfaces)-1);
newparam.setup.callerinfo.itype = INFO_ITYPE_CHAN;
newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
- if (ast->cid.cid_num) if (ast->cid.cid_num[0])
- strncpy(newparam.setup.callerinfo.id, ast->cid.cid_num, sizeof(newparam.setup.callerinfo.id)-1);
- if (ast->cid.cid_name) if (ast->cid.cid_name[0])
- strncpy(newparam.setup.callerinfo.name, ast->cid.cid_name, sizeof(newparam.setup.callerinfo.name)-1);
- if (ast->cid.cid_rdnis) if (ast->cid.cid_rdnis[0])
+ strncpy(newparam.setup.callerinfo.display, call->display, sizeof(newparam.setup.callerinfo.display)-1);
+ call->display[0] = '\0';
+ if (call->cid_num[0])
+ strncpy(newparam.setup.callerinfo.id, call->cid_num, sizeof(newparam.setup.callerinfo.id)-1);
+ if (call->cid_name[0])
+ strncpy(newparam.setup.callerinfo.name, call->cid_name, sizeof(newparam.setup.callerinfo.name)-1);
+ if (call->cid_rdnis[0])
{
- strncpy(newparam.setup.redirinfo.id, ast->cid.cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1);
+ strncpy(newparam.setup.redirinfo.id, call->cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1);
newparam.setup.redirinfo.itype = INFO_ITYPE_CHAN;
newparam.setup.redirinfo.ntype = INFO_NTYPE_UNKNOWN;
}
/* change state */
call->state = CHAN_LCR_STATE_IN_PROCEEDING;
+ ast_setstate(ast, AST_STATE_OFFHOOK);
goto start;
}
/* change state */
call->state = CHAN_LCR_STATE_IN_DIALING;
+ ast_setstate(ast, AST_STATE_OFFHOOK);
/* if match, start pbx */
if (ast_exists_extension(ast, ast->context, ast->exten, 1, call->oad)) {
ast->cid.cid_ton = 0;
}
ast->transfercapability = param->setup.capainfo.bearer_capa;
+ /* enable hdlc if transcap is data */
+ if (ast->transfercapability == INFO_BC_DATAUNRESTRICTED
+ || ast->transfercapability == INFO_BC_DATARESTRICTED
+ || ast->transfercapability == INFO_BC_VIDEO)
+ call->hdlc = 1;
strncpy(call->oad, numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, options.national, options.international), sizeof(call->oad)-1);
/* configure channel */
/* change state */
call->state = CHAN_LCR_STATE_IN_SETUP;
- lcr_start_pbx(call, ast, param->setup.dialinginfo.sending_complete);
+ if (!call->pbx_started)
+ lcr_start_pbx(call, ast, param->setup.dialinginfo.sending_complete);
}
/*
/* change state */
call->state = CHAN_LCR_STATE_OUT_PROCEEDING;
- /* send event to asterisk */
+ /* queue event for asterisk */
if (call->ast && call->pbx_started)
- ast_queue_control(call->ast, AST_CONTROL_PROCEEDING);
+ strncat(call->queue_string, "P", sizeof(call->queue_string)-1);
}
/*
/* change state */
call->state = CHAN_LCR_STATE_OUT_ALERTING;
- /* send event to asterisk */
+ /* queue event to asterisk */
if (call->ast && call->pbx_started)
- ast_queue_control(call->ast, AST_CONTROL_RINGING);
+ strncat(call->queue_string, "R", sizeof(call->queue_string)-1);
}
/*
}
/* copy connectinfo */
memcpy(&call->connectinfo, ¶m->connectinfo, sizeof(struct connect_info));
- /* send event to asterisk */
+ /* queue event to asterisk */
if (call->ast && call->pbx_started)
- ast_queue_control(call->ast, AST_CONTROL_ANSWER);
+ strncat(call->queue_string, "A", sizeof(call->queue_string)-1);
}
/*
call->ref = 0;
/* change to release state */
call->state = CHAN_LCR_STATE_RELEASE;
- /* release asterisk */
+ /* queue release asterisk */
if (ast)
{
ast->hangupcause = call->cause;
if (call->pbx_started)
- ast_queue_hangup(ast);
+ strcpy(call->queue_string, "H"); // overwrite other indications
else {
ast_hangup(ast); // call will be destroyed here
}
call->cause = param->disconnectinfo.cause;
call->location = param->disconnectinfo.location;
}
- /* if we have an asterisk instance, send hangup, else we are done */
+ /* if we have an asterisk instance, queue hangup, else we are done */
if (ast)
{
ast->hangupcause = call->cause;
if (call->pbx_started)
- ast_queue_hangup(ast);
+ strcpy(call->queue_string, "H");
else {
ast_hangup(ast); // call will be destroyed here
}
static void lcr_in_information(struct chan_call *call, int message_type, union parameter *param)
{
struct ast_channel *ast = call->ast;
- struct ast_frame fr;
- char *p;
CDEBUG(call, call->ast, "Incoming information from LCR. (dialing=%s)\n", param->information.id);
return;
}
- /* copy digits */
- p = param->information.id;
- if (call->state == CHAN_LCR_STATE_IN_DIALING && *p)
- {
- CDEBUG(call, call->ast, "Asterisk is started, sending DTMF frame.\n");
- while (*p)
- {
- /* send digit to asterisk */
- memset(&fr, 0, sizeof(fr));
- fr.frametype = AST_FRAME_DTMF;
- fr.subclass = *p;
- fr.delivery = ast_tv(0, 0);
- ast_queue_frame(call->ast, &fr);
- p++;
- }
- }
+ /* queue digits */
+ if (call->state == CHAN_LCR_STATE_IN_DIALING && param->information.id[0])
+ strncat(call->queue_string, param->information.id, sizeof(call->queue_string)-1);
+
/* use bridge to forware message not supported by asterisk */
if (call->state == CHAN_LCR_STATE_CONNECT) {
CDEBUG(call, call->ast, "Call is connected, briding.\n");
*/
static void lcr_in_notify(struct chan_call *call, int message_type, union parameter *param)
{
+ union parameter newparam;
+
CDEBUG(call, call->ast, "Incomming notify from LCR. (notify=%d)\n", param->notifyinfo.notify);
+ /* request bchannel, if call is resumed and we don't have it */
+ if (param->notifyinfo.notify == INFO_NOTIFY_USER_RESUMED && !call->bchannel && call->ref) {
+ CDEBUG(call, call->ast, "Reqesting bchannel at resume.\n");
+ memset(&newparam, 0, sizeof(union parameter));
+ newparam.bchannel.type = BCHANNEL_REQUEST;
+ send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
+ }
+
if (!call->ast) return;
/* use bridge to forware message not supported by asterisk */
}
/*
- * got dtmf from bchannel
+ * got dtmf from bchannel (locked state)
*/
void lcr_in_dtmf(struct chan_call *call, int val)
{
struct ast_channel *ast = call->ast;
- struct ast_frame fr;
+ char digit[2];
if (!ast)
return;
if (!call->pbx_started)
return;
- CDEBUG(call, call->ast, "Frowarding DTMF digit '%c' to Asterisk.\n", val);
-
- /* send digit to asterisk */
- memset(&fr, 0, sizeof(fr));
- fr.frametype = AST_FRAME_DTMF;
- fr.subclass = val;
- fr.delivery = ast_tv(0, 0);
- ast_queue_frame(call->ast, &fr);
+ CDEBUG(call, call->ast, "Recognised DTMF digit '%c'.\n", val);
+ digit[0] = val;
+ digit[1] = '\0';
+ strncat(call->queue_string, digit, sizeof(call->queue_string)-1);
}
/*
* message received from LCR
*/
-int receive_message(int message_type, unsigned long ref, union parameter *param)
+int receive_message(int message_type, unsigned int ref, union parameter *param)
{
struct bchannel *bchannel;
struct chan_call *call;
switch(param->bchannel.type)
{
case BCHANNEL_ASSIGN:
- CDEBUG(NULL, NULL, "Received BCHANNEL_ASSIGN message. (handle=%08lx)\n", param->bchannel.handle);
+ CDEBUG(NULL, NULL, "Received BCHANNEL_ASSIGN message. (handle=%08lx) for ref %d\n", param->bchannel.handle, ref);
if ((bchannel = find_bchannel_handle(param->bchannel.handle)))
{
CERROR(NULL, NULL, "bchannel handle %x already assigned.\n", (int)param->bchannel.handle);
bchannel->b_tx_gain = param->bchannel.tx_gain;
bchannel->b_rx_gain = param->bchannel.rx_gain;
strncpy(bchannel->b_pipeline, param->bchannel.pipeline, sizeof(bchannel->b_pipeline)-1);
- if (param->bchannel.crypt_len)
+ if (param->bchannel.crypt_len && param->bchannel.crypt_len <= sizeof(bchannel->b_bf_key))
{
- bchannel->b_crypt_len = param->bchannel.crypt_len;
- bchannel->b_crypt_type = param->bchannel.crypt_type;
- memcpy(bchannel->b_crypt_key, param->bchannel.crypt, param->bchannel.crypt_len);
+ bchannel->b_bf_len = param->bchannel.crypt_len;
+ memcpy(bchannel->b_bf_key, param->bchannel.crypt, param->bchannel.crypt_len);
}
bchannel->b_txdata = 0;
bchannel->b_dtmf = 1;
call->bchannel = bchannel;
if (call->dtmf)
bchannel_dtmf(bchannel, 1);
-#ifdef TODO
-hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor dem b-kanal verfügbar waren
-#endif
+ if (call->bf_len)
+ bchannel_blowfish(bchannel, call->bf_key, call->bf_len);
+ if (call->pipeline[0])
+ bchannel_pipeline(bchannel, call->pipeline);
+ if (call->rx_gain)
+ bchannel_gain(bchannel, call->rx_gain, 0);
+ if (call->tx_gain)
+ bchannel_gain(bchannel, call->tx_gain, 1);
if (call->bridge_id) {
CDEBUG(call, call->ast, "Join bchannel, because call is already bridged.\n");
bchannel_join(bchannel, call->bridge_id);
}
+ /* create only, if call exists, othewhise it bchannel is freed below... */
+ if (bchannel_create(bchannel, ((call->transparent)?1:0) + ((call->hdlc)?2:0)))
+ bchannel_activate(bchannel, 1);
}
- if (bchannel_create(bchannel))
- bchannel_activate(bchannel, 1);
/* acknowledge */
newparam.bchannel.type = BCHANNEL_ASSIGN_ACK;
newparam.bchannel.handle = param->bchannel.handle;
goto again;
}
CDEBUG(call, call->ast, "Queue call release, because Asterisk channel is running.\n");
- ast_queue_hangup(call->ast);
+ strcpy(call->queue_string, "H");
call = call->next;
}
char *socket_name = SOCKET_NAME;
int conn;
struct sockaddr_un sock_address;
- unsigned long on = 1;
+ unsigned int on = 1;
union parameter param;
/* open socket */
lcr_sock = -1;
}
+
+/* sending queue to asterisk */
+static int queue_send(void)
+{
+ int work = 0;
+ struct chan_call *call;
+ struct ast_channel *ast;
+ struct ast_frame fr;
+ char *p;
+
+ call = call_first;
+ while(call) {
+ p = call->queue_string;
+ ast = call->ast;
+ if (*p && ast) {
+ /* there is something to queue */
+ if (!ast_channel_trylock(ast)) { /* succeed */
+ while(*p) {
+ switch (*p) {
+ case 'P':
+ CDEBUG(call, ast, "Sending queued PROCEEDING to Asterisk.\n");
+ ast_queue_control(ast, AST_CONTROL_PROCEEDING);
+ break;
+ case 'R':
+ CDEBUG(call, ast, "Sending queued RINGING to Asterisk.\n");
+ ast_queue_control(ast, AST_CONTROL_RINGING);
+ break;
+ case 'A':
+ CDEBUG(call, ast, "Sending queued ANSWER to Asterisk.\n");
+ ast_queue_control(ast, AST_CONTROL_ANSWER);
+ break;
+ case 'H':
+ CDEBUG(call, ast, "Sending queued HANGUP to Asterisk.\n");
+ ast_queue_hangup(ast);
+ break;
+ case '1': case '2': case '3': case 'a':
+ case '4': case '5': case '6': case 'b':
+ case '7': case '8': case '9': case 'c':
+ case '*': case '0': case '#': case 'd':
+ CDEBUG(call, ast, "Sending queued digit '%c' to Asterisk.\n", *p);
+ /* send digit to asterisk */
+ memset(&fr, 0, sizeof(fr));
+ fr.frametype = AST_FRAME_DTMF;
+ fr.subclass = *p;
+ fr.delivery = ast_tv(0, 0);
+ fr.len = 100;
+ ast_queue_frame(ast, &fr);
+ break;
+ default:
+ CDEBUG(call, ast, "Ignoring queued digit 0x%02d.\n", *p);
+ }
+ p++;
+ }
+ call->queue_string[0] = '\0';
+ ast_channel_unlock(ast);
+ work = 1;
+ }
+ }
+ call = call->next;
+ }
+
+ return work;
+}
+
+/* signal handler */
void sighandler(int sigset)
{
}
+/* chan_lcr thread */
static void *chan_thread(void *arg)
{
int work;
ret = bchannel_handle();
if (ret)
work = 1;
-
+
+ /* handle messages to asterisk */
+ ret = queue_send();
+ if (ret)
+ work = 1;
+
+ /* delay if no work done */
if (!work) {
ast_mutex_unlock(&chan_lock);
usleep(30000);
struct chan_call *call;
ast_mutex_lock(&chan_lock);
-
- CDEBUG(NULL, NULL, "Received request from Asterisk. data=%s\n", (char *)data);
+ CDEBUG(NULL, NULL, "Received request from Asterisk. (data=%s)\n", (char *)data);
/* if socket is closed */
if (lcr_sock < 0)
{
CERROR(NULL, NULL, "Rejecting call from Asterisk, because LCR not running.\n");
+ ast_mutex_unlock(&chan_lock);
return NULL;
}
if (!call)
{
/* failed to create instance */
+ ast_mutex_unlock(&chan_lock);
return NULL;
}
CERROR(NULL, NULL, "Failed to create Asterisk channel.\n");
free_call(call);
/* failed to create instance */
+ ast_mutex_unlock(&chan_lock);
return NULL;
}
ast->tech = &lcr_tech;
call->ast = ast;
ast->tech_pvt = call;
ast->fds[0] = call->pipe[0];
- ast_mutex_unlock(&chan_lock);
call->pbx_started = 0;
/* set state */
call->state = CHAN_LCR_STATE_OUT_PREPARE;
}
strncpy(call->interface, interface, sizeof(call->interface)-1);
strncpy(call->dialstring, dial, sizeof(call->dialstring)-1);
+ apply_opt(call, (char *)opt);
-#warning todo: parse options
-
+ ast_mutex_unlock(&chan_lock);
return ast;
}
newparam.direction = 0; /* request from app */
send_message(MESSAGE_NEWREF, 0, &newparam);
+ /* set hdlc if capability requires hdlc */
+ if (ast->transfercapability == INFO_BC_DATAUNRESTRICTED
+ || ast->transfercapability == INFO_BC_DATARESTRICTED
+ || ast->transfercapability == INFO_BC_VIDEO)
+ call->hdlc = 1;
+ /* if hdlc is forced by option, we change transcap to data */
+ if (call->hdlc
+ && ast->transfercapability != INFO_BC_DATAUNRESTRICTED
+ && ast->transfercapability != INFO_BC_DATARESTRICTED
+ && ast->transfercapability != INFO_BC_VIDEO)
+ ast->transfercapability = INFO_BC_DATAUNRESTRICTED;
+
+ call->cid_num[0] = 0;
+ call->cid_name[0] = 0;
+ call->cid_rdnis[0] = 0;
+
+ if (ast->cid.cid_num) if (ast->cid.cid_num[0])
+ strncpy(call->cid_num, ast->cid.cid_num,
+ sizeof(call->cid_num)-1);
+
+ if (ast->cid.cid_name) if (ast->cid.cid_name[0])
+ strncpy(call->cid_name, ast->cid.cid_name,
+ sizeof(call->cid_name)-1);
+ if (ast->cid.cid_rdnis) if (ast->cid.cid_rdnis[0])
+ strncpy(call->cid_rdnis, ast->cid.cid_rdnis,
+ sizeof(call->cid_rdnis)-1);
+
ast_mutex_unlock(&chan_lock);
return 0;
}
-static int lcr_digit(struct ast_channel *ast, char digit)
+static int lcr_digit_begin(struct ast_channel *ast, char digit)
{
struct chan_call *call;
union parameter newparam;
}
ast_mutex_unlock(&chan_lock);
-
return(0);
}
+static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
+{
+ printf("DIGIT END %c\n", digit);
+ return (0);
+}
+
static int lcr_answer(struct ast_channel *ast)
{
union parameter newparam;
/* enable keypad */
// memset(&newparam, 0, sizeof(union parameter));
// send_message(MESSAGE_ENABLEKEYPAD, call->ref, &newparam);
- call->dtmf = 1;
+ /* enable dtmf */
+ if (call->no_dtmf)
+ CDEBUG(call, ast, "DTMF is disabled by option.\n");
+ else
+ call->dtmf = 1;
ast_mutex_unlock(&chan_lock);
return 0;
return NULL;
}
if (call->pipe[0] > -1) {
- len = read(call->pipe[0], call->read_buff, sizeof(call->read_buff));
+ if (call->rebuffer) {
+ len = read(call->pipe[0], call->read_buff, 160);
+ } else {
+ len = read(call->pipe[0], call->read_buff, sizeof(call->read_buff));
+ }
if (len <= 0) {
close(call->pipe[0]);
call->pipe[0] = -1;
memset(&newparam, 0, sizeof(union parameter));
newparam.notifyinfo.notify = INFO_NOTIFY_REMOTE_HOLD;
send_message(MESSAGE_NOTIFY, call->ref, &newparam);
+
+ /*start music onhold*/
+ ast_moh_start(ast,data,ast->musicclass);
break;
case AST_CONTROL_UNHOLD:
CDEBUG(call, ast, "Received indicate AST_CONTROL_UNHOLD from Asterisk.\n");
memset(&newparam, 0, sizeof(union parameter));
newparam.notifyinfo.notify = INFO_NOTIFY_REMOTE_RETRIEVAL;
send_message(MESSAGE_NOTIFY, call->ref, &newparam);
- break;
+
+ /*stop moh*/
+ ast_moh_stop(ast);
+ break;
default:
CERROR(call, ast, "Received indicate from Asterisk with unknown condition %d.\n", cond);
call2->bridge_call->bridge_call = NULL;
call2->bridge_call = NULL;
}
+
ast_mutex_unlock(&chan_lock);
-
-
return AST_BRIDGE_COMPLETE;
}
static struct ast_channel_tech lcr_tech = {
.type="LCR",
.description="Channel driver for connecting to Linux-Call-Router",
.requester=lcr_request,
- .send_digit_begin=lcr_digit,
+ .send_digit_begin=lcr_digit_begin,
+ .send_digit_end=lcr_digit_end,
.call=lcr_call,
.bridge=lcr_bridge,
.hangup=lcr_hangup,
#endif
+
+static int lcr_config_exec(struct ast_channel *ast, void *data)
+{
+ struct chan_call *call;
+
+ ast_mutex_lock(&chan_lock);
+ CDEBUG(NULL, ast, "Received lcr_config (data=%s)\n", (char *)data);
+ /* find channel */
+ call = call_first;
+ while(call) {
+ if (call->ast == ast)
+ break;
+ call = call->next;
+ }
+ if (call)
+ apply_opt(call, (char *)data);
+ else
+ CERROR(NULL, ast, "lcr_config app not called by chan_lcr channel.\n");
+
+ ast_mutex_unlock(&chan_lock);
+ return 0;
+}
+
/*
* module loading and destruction
*/
close_socket();
return AST_MODULE_LOAD_DECLINE;
}
+
+ ast_register_application("lcr_config", lcr_config_exec, "lcr_config",
+ "lcr_config(<opt><optarg>:<opt>:...)\n"
+ "Sets LCR opts. and optargs\n"
+ "\n"
+ "The available options are:\n"
+ " d - Send display text on called phone, text is the optarg.\n"
+ " n - Don't detect dtmf tones on called channel.\n"
+ " h - Force data call (HDLC).\n"
+ " t - Disable all audio features (required for fax application).\n"
+ " c - Make crypted outgoing call, optarg is keyindex.\n"
+ " e - Perform echo cancelation on this channel.\n"
+ " Takes mISDN pipeline option as optarg.\n"
+// " s - Send Non Inband DTMF as inband.\n"
+ " vr - rxgain control\n"
+ " vt - txgain control\n"
+ " Volume changes at factor 2 ^ optarg.\n"
+ );
+
#if 0
ast_cli_register(&cli_show_lcr);
ast_cli_register(&cli_show_calls);
-
ast_cli_register(&cli_reload_routing);
ast_cli_register(&cli_reload_interfaces);
ast_cli_register(&cli_port_block);
ast_cli_register(&cli_port_unblock);
ast_cli_register(&cli_port_unload);
-
- ast_register_application("misdn_set_opt", misdn_set_opt_exec, "misdn_set_opt",
- "misdn_set_opt(:<opt><optarg>:<opt><optarg>..):\n"
- "Sets mISDN opts. and optargs\n"
- "\n"
- "The available options are:\n"
- " d - Send display text on called phone, text is the optparam\n"
- " n - don't detect dtmf tones on called channel\n"
- " h - make digital outgoing call\n"
- " c - make crypted outgoing call, param is keyindex\n"
- " e - perform echo cancelation on this channel,\n"
- " takes taps as arguments (32,64,128,256)\n"
- " s - send Non Inband DTMF as inband\n"
- " vr - rxgain control\n"
- " vt - txgain control\n"
- );
-
-
- lcr_cfg_get( 0, LCR_GEN_TRACEFILE, global_tracefile, BUFFERSIZE);
-
-=======
- //lcr_cfg_get( 0, LCR_GEN_TRACEFILE, global_tracefile, BUFFERSIZE);
#endif
quit = 0;
ast_channel_unregister(&lcr_tech);
+ ast_unregister_application("lcr_config");
+
+
if (mISDN_created) {
bchannel_deinitialize();
mISDN_created = 0;
projects / lcr.git / blobdiff