Call is initiated by Asterisk:
-If a call is reveiced from Asterisk, a new chan_call instance is created.
+If a call is requested from Asterisk, a new chan_call instance is created.
The new Asterisk instance pointer (ast) is stored to chan_call structure.
-A MESSASGE_NEWREF is sent to LCR requesting a new call reference (ref).
The current call ref is set to 0, the state is CHAN_LCR_STATE_OUT_PREPARE.
+If the call is received (lcr_call) A MESSASGE_NEWREF is sent to LCR requesting
+a new call reference (ref).
Further dialing information is queued.
After the new callref is received by special MESSAGE_NEWREF reply, new ref
is stored in the chan_call structure.
#include "lcrsocket.h"
#include "cause.h"
#include "bchannel.h"
+#include "options.h"
#include "chan_lcr.h"
CHAN_LCR_STATE // state description structure
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;
+
+ 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;
+#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.\n");
+ CDEBUG(call, call->ast, "Sending setup to LCR. (interface=%s dialstring=%s)\n", call->interface, call->dialstring);
/* send setup message to LCR */
memset(&newparam, 0, sizeof(union parameter));
- strncpy(newparam.setup.dialinginfo.id, ast->exten, sizeof(newparam.setup.dialinginfo.id)-1);
+ newparam.setup.dialinginfo.itype = INFO_ITYPE_ISDN;
+ newparam.setup.dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
+ strncpy(newparam.setup.dialinginfo.id, call->dialstring, sizeof(newparam.setup.dialinginfo.id)-1);
+ 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;
+ strncpy(newparam.setup.callerinfo.display, call->display, sizeof(newparam.setup.callerinfo.display)-1);
+ call->display[0] = '\0';
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])
newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
}
newparam.setup.capainfo.bearer_capa = ast->transfercapability;
-#ifdef TODO
- newparam.setup.capainfo.bearer_info1 = alaw 3, ulaw 2;
-#endif
- newparam.setup.capainfo.bearer_info1 = 3;
+ newparam.setup.capainfo.bearer_info1 = (options.law=='a')?3:2;
newparam.setup.capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
newparam.setup.capainfo.hlc = INFO_HLC_NONE;
newparam.setup.capainfo.exthlc = INFO_HLC_NONE;
union parameter newparam;
/* importing channel */
- if (call->bchannel && call->bchannel->handle) {
+ if (call->bchannel) {
memset(&newparam, 0, sizeof(union parameter));
newparam.bchannel.type = BCHANNEL_RELEASE;
newparam.bchannel.handle = call->bchannel->handle;
ast->cid.cid_num = strdup(param->setup.callerinfo.id);
if (param->setup.callerinfo.name[0])
ast->cid.cid_name = strdup(param->setup.callerinfo.name);
-#ifdef TODO
if (param->setup.redirinfo.id[0])
- ast->cid.cid_name = strdup(numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, configfile->prefix_nat, configfile->prefix_inter));
-#endif
+ ast->cid.cid_name = strdup(numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, options.national, options.international));
switch (param->setup.callerinfo.present)
{
case INFO_PRESENT_ALLOWED:
ast->cid.cid_ton = 0;
}
ast->transfercapability = param->setup.capainfo.bearer_capa;
-#ifdef TODO
- strncpy(call->oad, numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, configfile->prefix_nat, configfile->prefix_inter), sizeof(call->oad)-1);
-#else
- strncpy(call->oad, numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, "0", "00"), sizeof(call->oad)-1);
-#endif
+ /* 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 */
-#ifdef TODO
- ast->nativeformats = configfile->lawformat;
- ast->readformat = ast->rawreadformat = configfile->lawformat;
- ast->writeformat = ast->rawwriteformat = configfile->lawformat;
-#else
- ast->nativeformats = AST_FORMAT_ALAW;
- ast->readformat = ast->rawreadformat = AST_FORMAT_ALAW;
- ast->writeformat = ast->rawwriteformat = AST_FORMAT_ALAW;
-#endif
+ ast->nativeformats = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
+ ast->readformat = ast->rawreadformat = ast->nativeformats;
+ ast->writeformat = ast->rawwriteformat = ast->nativeformats;
ast->priority = 1;
ast->hangupcause = 0;
*/
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 (locked state)
+ */
+void lcr_in_dtmf(struct chan_call *call, int val)
+{
+ struct ast_channel *ast = call->ast;
+ struct ast_frame fr;
+
+ if (!ast)
+ return;
+ if (!call->pbx_started)
+ return;
+
+ CDEBUG(call, call->ast, "Forwarding 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);
+}
+
+/*
* 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)
{
- union parameter newparam;
struct bchannel *bchannel;
struct chan_call *call;
+ union parameter newparam;
memset(&newparam, 0, sizeof(union parameter));
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;
/* in case, ref is not set, this bchannel instance must
* be created until it is removed again by LCR */
/* link to call */
- if ((call = find_call_ref(ref)))
+ call = find_call_ref(ref);
+ if (call)
{
bchannel->call = call;
call->bchannel = bchannel;
-#ifdef TODO
-hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor dem b-kanal verfügbar waren
-#endif
+ if (call->dtmf)
+ bchannel_dtmf(bchannel, 1);
+ 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);
}
}
- if (bchannel_create(bchannel))
+ if (bchannel_create(bchannel, ((call->transparent)?1:0) + ((call->hdlc)?2:0)))
bchannel_activate(bchannel, 1);
-
/* acknowledge */
newparam.bchannel.type = BCHANNEL_ASSIGN_ACK;
newparam.bchannel.handle = param->bchannel.handle;
send_message(MESSAGE_BCHANNEL, 0, &newparam);
+ /* if call has released before bchannel is assigned */
+ if (!call) {
+ newparam.bchannel.type = BCHANNEL_RELEASE;
+ newparam.bchannel.handle = param->bchannel.handle;
+ send_message(MESSAGE_BCHANNEL, 0, &newparam);
+ }
+
break;
case BCHANNEL_REMOVE:
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 */
static
struct ast_channel *lcr_request(const char *type, int format, void *data, int *cause)
{
- union parameter newparam;
+ char exten[256], *dial, *interface, *opt;
struct ast_channel *ast;
struct chan_call *call;
ast_mutex_lock(&chan_lock);
-
- CDEBUG(NULL, NULL, "Received request from Asterisk.\n");
+ 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");
return NULL;
}
-
+
/* create call instance */
call = alloc_call();
if (!call)
/* failed to create instance */
return NULL;
}
+
/* create asterisk channel instrance */
ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel);
if (!ast)
/* failed to create instance */
return NULL;
}
- /* link together */
- call->ast = ast;
- ast->tech_pvt = call;
ast->tech = &lcr_tech;
- ast->fds[0] = call->pipe[0];
+ ast->tech_pvt = (void *)1L; // set pointer or asterisk will not call
/* configure channel */
-#ifdef TODO
- snprintf(ast->name, sizeof(ast->name), "%s/%d", lcr_type, ++glob_channel);
- ast->name[sizeof(ast->name)-1] = '\0';
-#endif
-#ifdef TODO
- ast->nativeformats = configfile->lawformat;
- ast->readformat = ast->rawreadformat = configfile->lawformat;
- ast->writeformat = ast->rawwriteformat = configfile->lawformat;
-#else
- ast->nativeformats = AST_FORMAT_ALAW;
- ast->readformat = ast->rawreadformat = AST_FORMAT_ALAW;
- ast->writeformat = ast->rawwriteformat = AST_FORMAT_ALAW;
-#endif
+ ast->nativeformats = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
+ ast->readformat = ast->rawreadformat = ast->nativeformats;
+ ast->writeformat = ast->rawwriteformat = ast->nativeformats;
ast->priority = 1;
ast->hangupcause = 0;
- /* send MESSAGE_NEWREF */
- memset(&newparam, 0, sizeof(union parameter));
- newparam.direction = 0; /* request from app */
- send_message(MESSAGE_NEWREF, 0, &newparam);
+
+ /* link together */
+ call->ast = ast;
+ ast->tech_pvt = call;
+ ast->fds[0] = call->pipe[0];
+ call->pbx_started = 0;
/* set state */
call->state = CHAN_LCR_STATE_OUT_PREPARE;
- ast_mutex_unlock(&chan_lock);
+ /*
+ * Extract interface, dialstring, options from data.
+ * Formats can be:
+ * <dialstring>
+ * <interface>/<dialstring>
+ * <interface>/<dialstring>/options
+ */
+ strncpy(exten, (char *)data, sizeof(exten)-1);
+ exten[sizeof(exten)-1] = '\0';
+ if ((dial = strchr(exten, '/'))) {
+ *dial++ = '\0';
+ interface = exten;
+ if ((opt = strchr(dial, '/')))
+ *opt++ = '\0';
+ else
+ opt = "";
+ } else {
+ dial = exten;
+ interface = "";
+ opt = "";
+ }
+ strncpy(call->interface, interface, sizeof(call->interface)-1);
+ strncpy(call->dialstring, dial, sizeof(call->dialstring)-1);
+ apply_opt(call, (char *)opt);
+ ast_mutex_unlock(&chan_lock);
return ast;
}
*/
static int lcr_call(struct ast_channel *ast, char *dest, int timeout)
{
+ union parameter newparam;
struct chan_call *call;
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
- if (!call) {
- CERROR(NULL, ast, "Received call from Asterisk, but no call instance exists.\n");
+ if (!call) {
+ CERROR(NULL, ast, "Received call from Asterisk, but call instance does not exist.\n");
ast_mutex_unlock(&chan_lock);
return -1;
}
- CDEBUG(call, ast, "Received call from Asterisk.\n");
+ CDEBUG(NULL, ast, "Received call from Asterisk.\n");
-#warning was passiert zwischen lcr_request und lcr_call ?
+ /* pbx process is started */
call->pbx_started = 1;
+ /* send MESSAGE_NEWREF */
+ memset(&newparam, 0, sizeof(union parameter));
+ newparam.direction = 0; /* request from app */
+ send_message(MESSAGE_NEWREF, 0, &newparam);
- /* send setup message, if we already have a callref */
- if (call->ref)
- send_setup_to_lcr(call);
+ /* 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;
ast_mutex_unlock(&chan_lock);
return 0;
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
- if (!call) {
+ if (!call) {
CERROR(NULL, ast, "Received digit from Asterisk, but no call instance exists.\n");
ast_mutex_unlock(&chan_lock);
return -1;
}
- CDEBUG(call, ast, "Received digit Asterisk.\n");
+ CDEBUG(call, ast, "Received digit '%c' from Asterisk.\n", digit);
/* send information or queue them */
if (call->ref && call->state == CHAN_LCR_STATE_OUT_DIALING)
send_message(MESSAGE_INFORMATION, call->ref, &newparam);
} else
if (!call->ref
- && (call->state == CHAN_LCR_STATE_OUT_PREPARE || call->state == CHAN_LCR_STATE_OUT_SETUP));
+ && (call->state == CHAN_LCR_STATE_OUT_PREPARE || call->state == CHAN_LCR_STATE_OUT_SETUP))
{
CDEBUG(call, ast, "Queue digits, because we are in setup/dialing state and have no ref yet.\n");
*buf = digit;
}
ast_mutex_unlock(&chan_lock);
-
return(0);
}
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
- if (!call) {
+ if (!call) {
CERROR(NULL, ast, "Received answer from Asterisk, but no call instance exists.\n");
ast_mutex_unlock(&chan_lock);
return -1;
newparam.bchannel.type = BCHANNEL_REQUEST;
send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
}
+ /* enable keypad */
+// memset(&newparam, 0, sizeof(union parameter));
+// send_message(MESSAGE_ENABLEKEYPAD, call->ref, &newparam);
+ /* 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;
if (!pthread_equal(tid, chan_tid))
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
- if (!call) {
+ if (!call) {
CERROR(NULL, ast, "Received hangup from Asterisk, but no call instance exists.\n");
if (!pthread_equal(tid, chan_tid))
ast_mutex_unlock(&chan_lock);
if (!f->subclass)
CDEBUG(NULL, ast, "No subclass\n");
-#ifdef TODO
- config
-#else
- if (!(f->subclass & AST_FORMAT_ALAW))
-#endif
+ if (!(f->subclass & ast->nativeformats))
CDEBUG(NULL, ast, "Unexpected format.\n");
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
- if (!call) {
+ if (!call) {
ast_mutex_unlock(&chan_lock);
return -1;
}
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
- if (!call) {
+ if (!call) {
ast_mutex_unlock(&chan_lock);
return NULL;
}
}
call->read_fr.frametype = AST_FRAME_VOICE;
-#ifdef TODO
- format aus config
-#else
- call->read_fr.subclass = AST_FORMAT_ALAW;
-#endif
+ call->read_fr.subclass = ast->nativeformats;
call->read_fr.datalen = len;
call->read_fr.samples = len;
call->read_fr.delivery = ast_tv(0,0);
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
- if (!call) {
+ if (!call) {
CERROR(NULL, ast, "Received indicate from Asterisk, but no call instance exists.\n");
ast_mutex_unlock(&chan_lock);
return -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);
ast_mutex_lock(&chan_lock);
call = oldast->tech_pvt;
- if (!call) {
+ if (!call) {
CERROR(NULL, oldast, "Received fixup from Asterisk, but no call instance exists.\n");
ast_mutex_unlock(&chan_lock);
return -1;
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
- if (!call) {
+ if (!call) {
CERROR(NULL, ast, "Received send_text from Asterisk, but no call instance exists.\n");
ast_mutex_unlock(&chan_lock);
return -1;
{
struct chan_call *call1, *call2;
struct ast_channel *carr[2], *who;
- int to = -1;
+ int to;
struct ast_frame *f;
int bridge_id;
CDEBUG(NULL, NULL, "Received briding request from Asterisk.\n");
+
+ carr[0] = ast1;
+ carr[1] = ast2;
/* join via dsp (if the channels are currently open) */
ast_mutex_lock(&chan_lock);
ast_mutex_unlock(&chan_lock);
while(1) {
+ to = -1;
who = ast_waitfor_n(carr, 2, &to);
if (!who) {
f = ast_read(who);
if (!f || f->frametype == AST_FRAME_CONTROL) {
+ if (!f)
+ CDEBUG(NULL, NULL, "Got hangup.\n");
+ else
+ CDEBUG(NULL, NULL, "Got CONTROL.\n");
/* got hangup .. */
*fo=f;
*rc=who;
}
if ( f->frametype == AST_FRAME_DTMF ) {
+ CDEBUG(NULL, NULL, "Got DTMF.\n");
*fo=f;
*rc=who;
break;
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",
-#ifdef TODO
- law from config
-#else
- .capabilities=AST_FORMAT_ALAW,
-#endif
.requester=lcr_request,
.send_digit_begin=lcr_digit,
.call=lcr_call,
/*
* cli
*/
+#if 0
static int lcr_show_lcr (int fd, int argc, char *argv[])
{
return 0;
"Unloads LCR port, port is closes by mISDN",
"Usage: lcr port unload \"<port>\"\n",
};
+#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
*/
| (i<<7) | ((i&2)<<5) | ((i&4)<<3) | ((i&8)<<1);
}
+ if (read_options() == 0) {
+ CERROR(NULL, NULL, "%s", options_error);
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
ast_mutex_init(&chan_lock);
ast_mutex_init(&log_lock);
}
mISDN_created = 1;
+ lcr_tech.capabilities = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
if (ast_channel_register(&lcr_tech)) {
CERROR(NULL, NULL, "Unable to register channel class\n");
bchannel_deinitialize();
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;
return 0;
}
-#ifdef TODO
-wech damit
-
-int usecnt;
-ast_mutex_t usecnt_lock;
-
-int usecount(void)
-{
- int res;
- ast_mutex_lock(&usecnt_lock);
- res = usecnt;
- ast_mutex_unlock(&usecnt_lock);
- return res;
-}
-
-
-char *desc="Channel driver for lcr";
-
-char *description(void)
-{
- return desc;
-}
-
-char *key(void)
-{
- return ASTERISK_GPL_KEY;
-}
-#endif
#define AST_MODULE "chan_lcr"
projects / lcr.git / blobdiff