X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=dcc9b4151ba14ed1ebac4f1bccc3f2e0533ad996;hp=ee221b7ffe6fdd81387a5f5c0acff2ff7499e9a1;hb=0954d11aca25b25966aa68b22baa670a11ba277d;hpb=3f7ef909c907a374a1760ffae0c01b49487f18d7 diff --git a/chan_lcr.c b/chan_lcr.c index ee221b7..dcc9b41 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -513,43 +513,22 @@ void apply_opt(struct chan_call *call, char *data) 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') { @@ -604,6 +583,40 @@ void apply_opt(struct chan_call *call, char *data) CERROR(call, call->ast, "Option '%s' unknown.\n", opt); } } + + 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 + } + } + } } /* @@ -633,8 +646,6 @@ static void send_setup_to_lcr(struct chan_call *call) 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); @@ -919,8 +930,12 @@ CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at 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; @@ -944,9 +959,13 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet #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 @@ -981,8 +1000,8 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet 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 @@ -1393,7 +1412,9 @@ static void lcr_in_information(struct chan_call *call, int message_type, union p #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; @@ -1419,8 +1440,21 @@ static void lcr_in_information(struct chan_call *call, int message_type, union p /* 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"); + } } } @@ -1497,7 +1531,7 @@ void lcr_in_dtmf(struct chan_call *call, int val) 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; } @@ -1572,6 +1606,7 @@ int receive_message(int message_type, unsigned int ref, union parameter *param) return 0; } } + send_message(MESSAGE_ENABLEKEYPAD, call->ref, &newparam); return 0; } @@ -1651,6 +1686,10 @@ int receive_message(int message_type, unsigned int ref, union parameter *param) 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; @@ -1996,8 +2035,10 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c 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); @@ -2041,8 +2082,10 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c #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 @@ -2382,6 +2425,7 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout) /* send MESSAGE_NEWREF */ memset(&newparam, 0, sizeof(union parameter)); newparam.newref.direction = 0; /* request from app */ + strncpy(newparam.newref.interface, call->interface, sizeof(newparam.newref.interface) - 1); send_message(MESSAGE_NEWREF, 0, &newparam); /* set hdlc if capability requires hdlc */ @@ -2738,12 +2782,13 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr) #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)); @@ -2769,6 +2814,7 @@ static struct ast_frame *lcr_read(struct ast_channel *ast) { struct chan_call *call; int len = 0; + struct ast_frame *f = NULL; ast_mutex_lock(&chan_lock); #if ASTERISK_VERSION_NUM < 110000 @@ -2848,8 +2894,17 @@ static struct ast_frame *lcr_read(struct ast_channel *ast) } 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; } @@ -3095,6 +3150,9 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1, 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; @@ -3123,18 +3181,11 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1, /* get bridge id and join */ bridge_id = new_bridge_id(); -#if 0 call1->bridge_id = bridge_id; - if (call1->bchannel) - bchannel_join(call1->bchannel, bridge_id); - call2->bridge_id = bridge_id; - if (call2->bchannel) - bchannel_join(call2->bchannel, bridge_id); -#else - printf("FIXME"); - exit(0); -#endif + // FIXME: do bridiging + // bchannel_join(call1->bchannel, bridge_id); + // bchannel_join(call2->bchannel, bridge_id); call1->bridge_call = call2; call2->bridge_call = call1; @@ -3487,18 +3538,18 @@ int load_module(void) "\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" " 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"