#include "lcrsocket.h"
#include "cause.h"
#include "select.h"
-#include "bchannel.h"
#include "options.h"
#include "chan_lcr.h"
#endif
int lcr_debug=1;
-int mISDN_created=1;
char lcr_type[]="lcr";
close(call->pipe[0]);
if (call->pipe[1] > -1)
close(call->pipe[1]);
- if (call->bchannel) {
- if (call->bchannel->call != call)
- CERROR(call, NULL, "Linked bchannel structure has no link to us.\n");
- call->bchannel->call = NULL;
- }
if (call->bridge_call) {
if (call->bridge_call->bridge_call != call)
CERROR(call, NULL, "Linked call structure has no link to us.\n");
CDEBUG(NULL, NULL, "Ignoring message %d, because socket is closed.\n", message_type);
return -1;
}
- CDEBUG(NULL, NULL, "Sending %s to socket. (ref=%d)\n", messages_txt[message_type], ref);
+ if (message_type != MESSAGE_TRAFFIC)
+ CDEBUG(NULL, NULL, "Sending %s to socket. (ref=%d)\n", messages_txt[message_type], ref);
adminp = &admin_first;
while(*adminp)
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
return 0;
void apply_opt(struct chan_call *call, char *data)
{
union parameter newparam;
- char string[1024], *p = string, *opt, *key;
- int gain, i;
+ char string[1024], *p = string, *opt;//, *key;
+// int gain, i;
if (!data[0])
return; // no opts
break;
}
CDEBUG(call, call->ast, "Option 'n' (no DTMF).\n");
- if (call->dsp_dtmf) {
- call->dsp_dtmf = 0;
- if (call->bchannel)
- bchannel_dtmf(call->bchannel, 0);
- }
+ call->dsp_dtmf = 0;
break;
+#if 0
case 'c':
if (opt[1] == '\0') {
CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter.\n", opt);
if (call->bchannel)
bchannel_blowfish(call->bchannel, call->bf_key, call->bf_len);
break;
+#endif
case 'h':
if (opt[1] != '\0') {
CERROR(call, call->ast, "Option 'h' (HDLC) expects no parameter.\n", opt);
if (!call->hdlc)
call->hdlc = 1;
break;
- case 't':
- if (opt[1] != '\0') {
- CERROR(call, call->ast, "Option 't' (no_dsp) expects no parameter.\n", opt);
- break;
- }
- CDEBUG(call, call->ast, "Option 't' (no dsp).\n");
- if (!call->nodsp)
- call->nodsp = 1;
- break;
case 'q':
if (opt[1] == '\0') {
CERROR(call, call->ast, "Option 'q' (queue) expects parameter.\n", opt);
break;
}
CDEBUG(call, call->ast, "Option 'q' (queue).\n");
- call->nodsp_queue = atoi(opt+1);
+ call->tx_queue = atoi(opt+1);
break;
+#if 0
case 'e':
if (opt[1] == '\0') {
CERROR(call, call->ast, "Option 'e' (echo cancel) expects parameter.\n", opt);
if (call->bchannel)
bchannel_pipeline(call->bchannel, call->pipeline);
break;
+#endif
case 'f':
- if (opt[1] == '\0') {
- CERROR(call, call->ast, "Option 'f' (faxdetect) expects parameter.\n", opt);
+ if (opt[1] != '\0') {
+ CERROR(call, call->ast, "Option 'f' (faxdetect) expects no parameter.\n", opt);
break;
}
- call->faxdetect=atoi(opt+1);
- if (!call->dsp)
- call->dsp=ast_dsp_new();
- if (call->dsp) {
- #ifdef LCR_FOR_CALLWEAVER
- ast_dsp_set_features(call->dsp, DSP_FEATURE_DTMF_DETECT| DSP_FEATURE_FAX_CNG_DETECT);
- #endif
- #ifdef LCR_FOR_ASTERISK
- #ifdef DSP_FEATURE_DTMF_DETECT
- ast_dsp_set_features(call->dsp, DSP_FEATURE_DTMF_DETECT| DSP_FEATURE_FAX_DETECT);
- #else
- ast_dsp_set_features(call->dsp, DSP_FEATURE_DIGIT_DETECT| DSP_FEATURE_FAX_DETECT);
- #endif
-
- #endif
- if (!call->trans) {
- #ifdef LCR_FOR_CALLWEAVER
- call->trans=ast_translator_build_path(AST_FORMAT_SLINEAR, 8000, (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW, 8000);
- #endif
- #ifdef LCR_FOR_ASTERISK
- #if ASTERISK_VERSION_NUM < 100000
- call->trans=ast_translator_build_path(AST_FORMAT_SLINEAR, (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW);
- #else
- struct ast_format src;
- struct ast_format dst;
- ast_format_set(&dst, AST_FORMAT_SLINEAR, 0);
- ast_format_set(&dst,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0);
- call->trans=ast_translator_build_path(&dst, &src);
- #endif
- #endif
- }
+ call->faxdetect = 1;
+ call->dsp_dtmf = 0;
+ CDEBUG(call, call->ast, "Option 'f' (faxdetect).\n");
+ break;
+ case 'a':
+ if (opt[1] != '\0') {
+ CERROR(call, call->ast, "Option 'a' (asterisk DTMF) expects no parameter.\n", opt);
+ break;
}
- CDEBUG(call, call->ast, "Option 'f' (faxdetect) with config '%s'.\n", call->faxdetect);
+ call->ast_dsp = 1;
+ call->dsp_dtmf = 0;
+ CDEBUG(call, call->ast, "Option 'a' (Asterisk DTMF detection).\n");
break;
case 'r':
if (opt[1] != '\0') {
CDEBUG(call, call->ast, "Option 's' (inband DTMF).\n");
call->inband_dtmf = 1;
break;
+#if 0
case 'v':
if (opt[1] != 'r' && opt[1] != 't') {
CERROR(call, call->ast, "Option 'v' (volume) expects parameter.\n", opt);
bchannel_gain(call->bchannel, call->tx_gain, 1);
}
break;
+#endif
case 'k':
if (opt[1] != '\0') {
CERROR(call, call->ast, "Option 'k' (keypad) expects no parameter.\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->nodsp || call->faxdetect > 0)?1:0) + ((call->hdlc)?2:0), call->nodsp_queue))
- bchannel_activate(call->bchannel, 1);
+ if (call->faxdetect || call->ast_dsp) {
+ if (!call->dsp)
+ call->dsp=ast_dsp_new();
+ if (call->dsp) {
+ #ifdef LCR_FOR_CALLWEAVER
+ ast_dsp_set_features(call->dsp, DSP_FEATURE_DTMF_DETECT | ((call->faxdetect) ? DSP_FEATURE_FAX_CNG_DETECT : 0));
+ #endif
+ #ifdef LCR_FOR_ASTERISK
+ #ifdef DSP_FEATURE_DTMF_DETECT
+ ast_dsp_set_features(call->dsp, DSP_FEATURE_DTMF_DETECT | ((call->faxdetect) ? DSP_FEATURE_FAX_DETECT : 0));
+ #else
+ ast_dsp_set_features(call->dsp, DSP_FEATURE_DIGIT_DETECT | ((call->faxdetect) ? DSP_FEATURE_FAX_DETECT : 0));
+ #endif
+
+ #endif
+ if (!call->trans) {
+ #ifdef LCR_FOR_CALLWEAVER
+ call->trans=ast_translator_build_path(AST_FORMAT_SLINEAR, 8000, (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW, 8000);
+ #endif
+ #ifdef LCR_FOR_ASTERISK
+ #if ASTERISK_VERSION_NUM < 100000
+ call->trans=ast_translator_build_path(AST_FORMAT_SLINEAR, (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW);
+// #else
+// struct ast_format src;
+// struct ast_format dst;
+// ast_format_set(&dst, AST_FORMAT_SLINEAR, 0);
+// ast_format_set(&dst,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0);
+// call->trans=ast_translator_build_path(&dst, &src);
+ #endif
+ #endif
+ }
+ }
}
}
strncpy(newparam.setup.dialinginfo.keypad, call->dialstring, sizeof(newparam.setup.dialinginfo.keypad)-1);
else
strncpy(newparam.setup.dialinginfo.id, call->dialstring, sizeof(newparam.setup.dialinginfo.id)-1);
- if (!!strcmp(call->interface, "pbx"))
- 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);
newparam.setup.capainfo.hlc = INFO_HLC_NONE;
newparam.setup.capainfo.exthlc = INFO_HLC_NONE;
send_message(MESSAGE_SETUP, call->ref, &newparam);
+ if (call->tx_queue) {
+ memset(&newparam, 0, sizeof(union parameter));
+ newparam.queue = call->tx_queue * 8;
+ send_message(MESSAGE_DISABLE_DEJITTER, call->ref, &newparam);
+ }
/* change to outgoing setup state */
call->state = CHAN_LCR_STATE_OUT_SETUP;
}
/*
- * send release message to LCR and import bchannel if exported
+ * send release message to LCR
*/
-static void send_release_and_import(struct chan_call *call, int cause, int location)
+static void send_release(struct chan_call *call, int cause, int location)
{
union parameter newparam;
- /* importing channel */
- if (call->bchannel) {
- memset(&newparam, 0, sizeof(union parameter));
- newparam.bchannel.type = BCHANNEL_RELEASE;
- newparam.bchannel.handle = call->bchannel->handle;
- send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
- }
/* sending release */
memset(&newparam, 0, sizeof(union parameter));
newparam.disconnectinfo.cause = cause;
goto start;
}
+ /* send setup acknowledge to lcr */
+ if (call->state != CHAN_LCR_STATE_IN_DIALING) {
+ memset(&newparam, 0, sizeof(union parameter));
+ send_message(MESSAGE_OVERLAP, call->ref, &newparam);
+ }
+
+ /* change state */
+ call->state = CHAN_LCR_STATE_IN_DIALING;
+
/* if can match */
CDEBUG(call, ast, "Extensions may match, if more digits are dialed.\n");
return;
#else
if (!*ast_channel_exten(ast)) {
#endif
+ /* send setup acknowledge to lcr */
+ if (call->state != CHAN_LCR_STATE_IN_DIALING) {
+ memset(&newparam, 0, sizeof(union parameter));
+ send_message(MESSAGE_OVERLAP, call->ref, &newparam);
+ }
+
+ /* change state */
+ call->state = CHAN_LCR_STATE_IN_DIALING;
+
/* if can match */
CDEBUG(call, ast, "There is no 's' extension (and we tried to match it implicitly). Extensions may match, if more digits are dialed.\n");
return;
release:
/* release lcr */
CDEBUG(call, ast, "Releasing due to extension missmatch.\n");
- send_release_and_import(call, cause, LOCATION_PRIVATE_LOCAL);
+ send_release(call, cause, LOCATION_PRIVATE_LOCAL);
call->ref = 0;
/* release asterisk */
#if ASTERISK_VERSION_NUM < 110000
static void lcr_in_setup(struct chan_call *call, int message_type, union parameter *param)
{
struct ast_channel *ast;
+#ifdef AST_1_8_OR_HIGHER
struct ast_party_redirecting *ast_redir;
struct ast_party_caller *ast_caller;
+#else
+ struct ast_callerid *ast_caller;
+#endif
#if ASTERISK_VERSION_NUM >= 110000
struct ast_party_redirecting s_ast_redir;
struct ast_party_caller s_ast_caller;
#endif
#if ASTERISK_VERSION_NUM < 110000
+#ifdef AST_1_8_OR_HIGHER
ast_redir = &ast->redirecting;
ast_caller = &ast->caller;
#else
+ ast_caller = &ast->cid;
+#endif
+#else
ast_redir = &s_ast_redir;
ast_caller = &s_ast_caller;
#endif
if (!ast) {
/* release */
CERROR(call, NULL, "Failed to create Asterisk channel - releasing.\n");
- send_release_and_import(call, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL);
+ send_release(call, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL);
/* remove call */
free_call(call);
return;
if (param->setup.dialinginfo.id)
#if ASTERISK_VERSION_NUM < 110000
strncpy(ast->exten, param->setup.dialinginfo.id, AST_MAX_EXTENSION-1);
- if (param->setup.context[0])
- strncpy(ast->context, param->setup.context, AST_MAX_CONTEXT-1);
+ if (param->setup.dialinginfo.context[0])
+ strncpy(ast->context, param->setup.dialinginfo.context, AST_MAX_CONTEXT-1);
else
strncpy(ast->context, param->setup.callerinfo.interface, AST_MAX_CONTEXT-1);
#else
ast_channel_exten_set(ast, param->setup.dialinginfo.id);
- if (param->setup.context[0])
- ast_channel_context_set(ast, param->setup.context);
+ if (param->setup.dialinginfo.context[0])
+ ast_channel_context_set(ast, param->setup.dialinginfo.context);
else
ast_channel_context_set(ast, param->setup.callerinfo.interface);
#endif
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, "P", sizeof(call->queue_string)-1);
}
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, "R", sizeof(call->queue_string)-1);
}
*/
static void lcr_in_connect(struct chan_call *call, int message_type, union parameter *param)
{
- union parameter newparam;
-
CDEBUG(call, call->ast, "Incomming connect (answer) from LCR.\n");
/* change state */
call->state = CHAN_LCR_STATE_CONNECT;
- /* request bchannel */
- if (!call->bchannel) {
- CDEBUG(call, call->ast, "Requesting B-channel. (ref=%d)\n", call->ref);
- memset(&newparam, 0, sizeof(union parameter));
- newparam.bchannel.type = BCHANNEL_REQUEST;
- send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
- }
/* copy connectinfo */
memcpy(&call->connectinfo, ¶m->connectinfo, sizeof(struct connect_info));
/* queue event to asterisk */
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, "N", sizeof(call->queue_string)-1);
}
}
#endif
/* release lcr with same cause */
- send_release_and_import(call, call->cause, call->location);
+ send_release(call, call->cause, call->location);
call->ref = 0;
/* change to release state */
call->state = CHAN_LCR_STATE_RELEASE;
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strcpy(call->queue_string, "H"); // overwrite other indications
} else {
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strcpy(call->queue_string, "H");
} else {
#if ASTERISK_VERSION_NUM < 110000
strncat(ast->exten, param->information.id, AST_MAX_EXTENSION-1);
#else
- ast_channel_exten_set(ast, param->information.id);
+ char *tmp[AST_MAX_EXTENSION];
+ snprintf(tmp,AST_MAX_EXTENSION,"%s%s",ast_channel_exten(ast),param->information.id);
+ ast_channel_exten_set(ast, tmp);
#endif
lcr_start_pbx(call, ast, param->information.sending_complete);
return;
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
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, bridging.\n");
- bridge_message_if_bridged(call, message_type, param);
+ if (call->bridge_call) {
+ CDEBUG(call, call->ast, "Call is connected, bridging.\n");
+ bridge_message_if_bridged(call, message_type, param);
+ } else {
+ if (call->dsp_dtmf) {
+ if (!wake_global) {
+ wake_global = 1;
+ char byte = 0;
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
+ }
+ strncat(call->queue_string, param->information.id, sizeof(call->queue_string)-1);
+ } else
+ CDEBUG(call, call->ast, "LCR's DTMF detection is disabled.\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. (ref=%d)\n", call->ref);
- 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 */
call->has_pattern = 1;
/* request bchannel */
- if (!call->bchannel) {
- CDEBUG(call, call->ast, "Requesting B-channel. (ref=%d)\n", call->ref);
- memset(&newparam, 0, sizeof(union parameter));
- newparam.bchannel.type = BCHANNEL_REQUEST;
- send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
- }
+ CDEBUG(call, call->ast, "Requesting audio path (ref=%d)\n", call->ref);
+ memset(&newparam, 0, sizeof(union parameter));
+ send_message(MESSAGE_AUDIOPATH, call->ref, &newparam);
+
/* queue PROGRESS, because tones are available */
if (call->ast && call->pbx_started) {
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, "T", sizeof(call->queue_string)-1);
}
return;
if (!call->dsp_dtmf) {
- CDEBUG(call, call->ast, "Recognised DTMF digit '%c', but ignoring. This is fixed in later mISDN driver.\n", val);
+ CDEBUG(call, call->ast, "Recognised DTMF digit '%c' by LCR, but ignoring. (disabled by option)\n", val);
return;
}
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, digit, sizeof(call->queue_string)-1);
}
*/
int receive_message(int message_type, unsigned int ref, union parameter *param)
{
- struct bchannel *bchannel;
struct chan_call *call;
union parameter newparam;
+ int rc = 0;
memset(&newparam, 0, sizeof(union parameter));
- /* handle bchannel message*/
- if (message_type == MESSAGE_BCHANNEL) {
- switch(param->bchannel.type) {
- case BCHANNEL_ASSIGN:
- 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);
- return -1;
- }
- /* create bchannel */
- bchannel = alloc_bchannel(param->bchannel.handle);
- if (!bchannel) {
- CERROR(NULL, NULL, "alloc bchannel handle %x failed.\n", (int)param->bchannel.handle);
- return -1;
- }
-
- /* configure channel */
- 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 && param->bchannel.crypt_len <= sizeof(bchannel->b_bf_key)) {
- 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_tx_dejitter = 1;
-
- /* in case, ref is not set, this bchannel instance must
- * be created until it is removed again by LCR */
- /* link to call */
- call = find_call_ref(ref);
- if (call) {
- bchannel->call = call;
- call->bchannel = bchannel;
- if (call->dsp_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);
- }
- /* ignore all dsp features, if it is a loopback interface */
- if (param->bchannel.isloopback)
- call->nodsp = 1;
-
- /* create only, if call exists, othewhise it bchannel is freed below... */
- if (bchannel_create(bchannel, ((call->nodsp || call->faxdetect > 0)?1:0) + ((call->hdlc)?2:0), call->nodsp_queue))
- 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:
- CDEBUG(NULL, NULL, "Received BCHANNEL_REMOVE message. (handle=%08lx)\n", param->bchannel.handle);
- if (!(bchannel = find_bchannel_handle(param->bchannel.handle))) {
- CERROR(NULL, NULL, "Bchannel handle %x not assigned.\n", (int)param->bchannel.handle);
- return -1;
- }
- /* unklink from call and destroy bchannel */
- free_bchannel(bchannel);
-
- /* acknowledge */
- newparam.bchannel.type = BCHANNEL_REMOVE_ACK;
- newparam.bchannel.handle = param->bchannel.handle;
- send_message(MESSAGE_BCHANNEL, 0, &newparam);
-
- break;
-
- default:
- CDEBUG(NULL, NULL, "Received unknown bchannel message %d.\n", param->bchannel.type);
- }
- return 0;
- }
-
/* handle new ref */
if (message_type == MESSAGE_NEWREF) {
if (param->newref.direction) {
else if (call->state == CHAN_LCR_STATE_RELEASE) {
/* send release */
if (call->cause)
- send_release_and_import(call, call->cause, call->location);
+ send_release(call, call->cause, call->location);
else
- send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
+ send_release(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
/* free call */
free_call(call);
return 0;
}
}
+ send_message(MESSAGE_ENABLEKEYPAD, call->ref, &newparam);
return 0;
}
call->audiopath = param->audiopath;
break;
+ case MESSAGE_TRAFFIC: // if remote audio connected or hold
+ {
+ unsigned char *p = param->traffic.data;
+ int i, len = param->traffic.len;
+ for (i = 0; i < len; i++, p++)
+ *p = flip_bits[*p];
+ }
+ rc = write(call->pipe[1], param->traffic.data, param->traffic.len);
+ break;
+
+ case MESSAGE_DTMF:
+ lcr_in_dtmf(call, param->dtmf);
+ break;
+
default:
CDEBUG(call, call->ast, "Message %d from LCR unhandled.\n", message_type);
break;
}
- return 0;
+ return rc;
}
/*
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strcpy(call->queue_string, "H");
call = call->next;
}
-
- /* release all bchannels */
- while(bchannel_first)
- free_bchannel(bchannel_first);
}
void close_socket(void);
static int wake_event(struct lcr_fd *fd, unsigned int what, void *instance, int index)
{
char byte;
+ int rc;
- read(wake_pipe[0], &byte, 1);
+ rc = read(wake_pipe[0], &byte, 1);
wake_global = 0;
memset(&socket_retry, 0, sizeof(socket_retry));
add_timer(&socket_retry, handle_retry, NULL, 0);
- bchannel_pid = getpid();
-
/* open socket the first time */
handle_retry(NULL, NULL, 0);
char exten[256], *dial, *interface, *opt;
struct ast_channel *ast;
struct chan_call *call;
+#ifdef AST_1_8_OR_HIGHER
const struct ast_party_redirecting *req_redir;
const struct ast_party_caller *req_caller;
+#endif
ast_mutex_lock(&chan_lock);
CDEBUG(NULL, NULL, "Received request from Asterisk. (data=%s)\n", (char *)data);
#if ASTERISK_VERSION_NUM < 110000
ast->tech = &lcr_tech;
ast->tech_pvt = (void *)1L; // set pointer or asterisk will not call
+#ifdef AST_1_8_OR_HIGHER
req_redir = &requestor->redirecting;
req_caller = &requestor->caller;
+#endif
#else
ast_channel_tech_set(ast, &lcr_tech);
ast_channel_tech_pvt_set(ast, (void *)1L); // set pointer or asterisk will not call
/* send MESSAGE_NEWREF */
memset(&newparam, 0, sizeof(union parameter));
newparam.newref.direction = 0; /* request from app */
- if (!strcmp(call->interface, "pbx"))
- newparam.newref.mode = 1;
+ strncpy(newparam.newref.interface, call->interface, sizeof(newparam.newref.interface) - 1);
send_message(MESSAGE_NEWREF, 0, &newparam);
/* set hdlc if capability requires hdlc */
call->state = CHAN_LCR_STATE_CONNECT;
}
/* change state */
- /* request bchannel */
- if (!call->bchannel) {
- CDEBUG(call, ast, "Requesting B-channel.\n");
- memset(&newparam, 0, sizeof(union parameter));
- 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);
CDEBUG(call, ast, "Releasing ref and freeing call instance.\n");
#if ASTERISK_VERSION_NUM < 110000
if (ast->hangupcause > 0)
- send_release_and_import(call, ast->hangupcause, LOCATION_PRIVATE_LOCAL);
+ send_release(call, ast->hangupcause, LOCATION_PRIVATE_LOCAL);
#else
if (ast_channel_hangupcause(ast) > 0)
- send_release_and_import(call, ast_channel_hangupcause(ast), LOCATION_PRIVATE_LOCAL);
+ send_release(call, ast_channel_hangupcause(ast), LOCATION_PRIVATE_LOCAL);
#endif
else
- send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
+ send_release(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
/* remove call */
free_call(call);
if (!pthread_equal(tid, chan_tid)) {
static int lcr_write(struct ast_channel *ast, struct ast_frame *fr)
{
+ union parameter newparam;
struct chan_call *call;
struct ast_frame * f = fr;
+ unsigned char *p, *q;
+ int len, l;
#if ASTERISK_VERSION_NUM < 100000
#ifdef AST_1_8_OR_HIGHER
#else
call = ast_channel_tech_pvt(ast);
#endif
- if (!call) {
+ if (!call || !call->ref) {
+ /* drop the frame, if no ref exists, but return successfull delivery, or asterisk will abort connection */
ast_mutex_unlock(&chan_lock);
if (f != fr) {
ast_frfree(f);
}
- return -1;
+ return 0;
+ }
+ len = f->samples;
+ p = *((unsigned char **)&(f->data));
+ q = newparam.traffic.data;
+ memset(&newparam, 0, sizeof(union parameter));
+ while (len) {
+ l = (len > sizeof(newparam.traffic.data)) ? sizeof(newparam.traffic.data) : len;
+ newparam.traffic.len = l;
+ len -= l;
+ for (; l; l--)
+ *q++ = flip_bits[*p++];
+ send_message(MESSAGE_TRAFFIC, call->ref, &newparam);
}
- if (call->bchannel && f->samples)
- bchannel_transmit(call->bchannel, *((unsigned char **)&(f->data)), f->samples);
ast_mutex_unlock(&chan_lock);
if (f != fr) {
ast_frfree(f);
{
struct chan_call *call;
int len = 0;
+ struct ast_frame *f = NULL;
ast_mutex_lock(&chan_lock);
#if ASTERISK_VERSION_NUM < 110000
}
call->read_fr.delivery = ast_tv(0,0);
*((unsigned char **)&(call->read_fr.data)) = call->read_buff;
+
+ if (call->dsp)
+ f = ast_dsp_process(ast, call->dsp, &call->read_fr);
+ if (f && f->frametype == AST_FRAME_DTMF)
+ CDEBUG(call, ast, "Asterisk detected inband DTMF: %c.\n", f->subclass.integer);
+
ast_mutex_unlock(&chan_lock);
+ if (f && f->frametype == AST_FRAME_DTMF)
+ return f;
+
return &call->read_fr;
}
case AST_CONTROL_PROGRESS:
CDEBUG(call, ast, "Received indicate AST_CONTROL_PROGRESS from Asterisk.\n");
/* request bchannel */
- if (!call->bchannel) {
- CDEBUG(call, ast, "Requesting B-channel.\n");
- memset(&newparam, 0, sizeof(union parameter));
- newparam.bchannel.type = BCHANNEL_REQUEST;
- send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
- }
+ CDEBUG(call, ast, "Requesting audio path.\n");
+ memset(&newparam, 0, sizeof(union parameter));
+ send_message(MESSAGE_AUDIOPATH, call->ref, &newparam);
break;
case -1:
CDEBUG(call, ast, "Received indicate -1.\n");
struct ast_frame *f;
int bridge_id;
+/* bridge is disabled, because there is currerntly no concept to bridge mISDN channels */
+return AST_BRIDGE_FAILED;
+
CDEBUG(NULL, NULL, "Received bridging request from Asterisk.\n");
carr[0] = ast1;
/* join, if both call instances uses dsp
ignore the case of fax detection here it may be benificial for ISDN fax machines or pass through.
*/
- if (!call1->nodsp && !call2->nodsp) {
- CDEBUG(NULL, NULL, "Both calls use DSP, bridging via DSP.\n");
+ CDEBUG(NULL, NULL, "Both calls use DSP, bridging via DSP.\n");
- /* get bridge id and join */
- bridge_id = new_bridge_id();
+ /* get bridge id and join */
+ bridge_id = new_bridge_id();
- call1->bridge_id = bridge_id;
- if (call1->bchannel)
- bchannel_join(call1->bchannel, bridge_id);
+ call1->bridge_id = bridge_id;
+ call2->bridge_id = bridge_id;
+ // FIXME: do bridiging
+ // bchannel_join(call1->bchannel, bridge_id);
+ // bchannel_join(call2->bchannel, bridge_id);
- call2->bridge_id = bridge_id;
- if (call2->bchannel)
- bchannel_join(call2->bchannel, bridge_id);
- } else
- if (call1->nodsp && call2->nodsp)
- CDEBUG(NULL, NULL, "Both calls use no DSP, bridging in channel driver.\n");
- else
- CDEBUG(NULL, NULL, "One call uses no DSP, bridging in channel driver.\n");
call1->bridge_call = call2;
call2->bridge_call = call1;
#endif
if (call1 && call1->bridge_id) {
call1->bridge_id = 0;
- if (call1->bchannel)
- bchannel_join(call1->bchannel, 0);
if (call1->bridge_call)
call1->bridge_call->bridge_call = NULL;
}
if (call2 && call1->bridge_id) {
call2->bridge_id = 0;
- if (call2->bchannel)
- bchannel_join(call2->bchannel, 0);
if (call2->bridge_call)
call2->bridge_call->bridge_call = NULL;
}
apply_opt(call, (char *)argv[0]);
#endif
+ /* send options */
+ if (call->tx_queue) {
+ union parameter newparam;
+
+ memset(&newparam, 0, sizeof(union parameter));
+ newparam.queue = call->tx_queue * 8;
+ send_message(MESSAGE_DISABLE_DEJITTER, call->ref, &newparam);
+ }
else
CERROR(NULL, ast, "lcr_config app not called by chan_lcr channel.\n");
ast_mutex_init(&chan_lock);
ast_mutex_init(&log_lock);
- if (bchannel_initialize()) {
- CERROR(NULL, NULL, "Unable to open mISDN device\n");
- close_socket();
-
- #ifdef LCR_FOR_ASTERISK
- return AST_MODULE_LOAD_DECLINE;
- #endif
-
- #ifdef LCR_FOR_CALLWEAVER
- return 0;
- #endif
- }
- mISDN_created = 1;
-
#if ASTERISK_VERSION_NUM < 100000
lcr_tech.capabilities = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
#else
#endif
if (ast_channel_register(&lcr_tech)) {
CERROR(NULL, NULL, "Unable to register channel class\n");
- bchannel_deinitialize();
close_socket();
#ifdef LCR_FOR_ASTERISK
"\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"
+ " n - Don't detect dtmf tones from LCR.\n"
" h - Force data call (HDLC).\n"
- " t - Disable mISDN_dsp features (required for fax application).\n"
" q - Add queue to make fax stream seamless (required for fax app).\n"
" Use queue size in miliseconds for optarg. (try 250)\n"
- " f - Adding fax detection. It it timeouts, mISDN_dsp is used.\n"
- " Use time to detect for optarg.\n"
+ " a - Adding DTMF detection.\n"
+ " f - Adding fax detection.\n"
+#if 0
" c - Make crypted outgoing call, optarg is keyindex.\n"
" e - Perform echo cancelation on this channel.\n"
+#endif
" Takes mISDN pipeline option as optarg.\n"
- " s - Send Non Inband DTMF as inband.\n"
+ " s - Send Non Inband DTMF as inband. (disables LCR's DTMF)\n"
" r - re-buffer packets (160 bytes). Required for some SIP-phones and fax applications.\n"
+#if 0
" vr - rxgain control\n"
" vt - txgain control\n"
+#endif
" Volume changes at factor 2 ^ optarg.\n"
" k - use keypad to dial this call.\n"
"\n"
if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0)) {
/* failed to create thread */
- bchannel_deinitialize();
close_socket();
ast_channel_unregister(&lcr_tech);
ast_unregister_application("lcr_config");
- if (mISDN_created) {
- bchannel_deinitialize();
- mISDN_created = 0;
- }
-
if (lcr_sock >= 0) {
close(lcr_sock);
lcr_sock = -1;