#include <asterisk/app.h>
#include <asterisk/features.h>
#include <asterisk/sched.h>
-#if ASTERISK_VERSION_NUM < 110000
-#include <asterisk/version.h>
-#endif
#include "extension.h"
#include "message.h"
#include "callerid.h"
#include "cause.h"
#include "select.h"
#include "options.h"
+#include "config.h"
#include "chan_lcr.h"
CHAN_LCR_STATE // state description structure
}
fcntl((*callp)->pipe[0], F_SETFL, O_NONBLOCK);
CDEBUG(*callp, NULL, "Call instance allocated.\n");
+
+ /* unset dtmf (default, use option 'd' to enable) */
+ (*callp)->dsp_dtmf = 0;
+
return *callp;
}
send_message(MESSAGE_NOTIFY, call->ref, &newparam);
}
break;
- case 'n':
+ case 'D':
if (opt[1] != '\0') {
- CERROR(call, call->ast, "Option 'n' (no DTMF) expects no parameter.\n", opt);
+ CERROR(call, call->ast, "Option 'D' (DTMF) expects no parameter.\n", opt);
break;
}
- CDEBUG(call, call->ast, "Option 'n' (no DTMF).\n");
- call->dsp_dtmf = 0;
+ CDEBUG(call, call->ast, "Option 'D' (DTMF).\n");
+ call->dsp_dtmf = 1;
break;
#if 0
case 'c':
/* configure channel */
#if ASTERISK_VERSION_NUM < 100000
+ wat een onzin
+#endif
+
+#if ASTERISK_VERSION_NUM < 100000
ast->nativeformats = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
ast->readformat = ast->rawreadformat = ast->nativeformats;
ast->writeformat = ast->rawwriteformat = ast->nativeformats;
#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;
/* set ref */
call->ref = ref;
call->ref_was_assigned = 1;
- /* set dtmf (default, use option 'n' to disable */
- call->dsp_dtmf = 1;
/* wait for setup (or release from asterisk) */
} else {
/* new ref, as requested from this remote application */
/* store new ref */
call->ref = ref;
call->ref_was_assigned = 1;
- /* set dtmf (default, use option 'n' to disable */
- call->dsp_dtmf = 1;
/* send pending setup info */
if (call->state == CHAN_LCR_STATE_OUT_PREPARE)
send_setup_to_lcr(call);
if (call->dsp)
f = ast_dsp_process(ast, call->dsp, &call->read_fr);
if (f && f->frametype == AST_FRAME_DTMF)
+#ifdef AST_1_8_OR_HIGHER
CDEBUG(call, ast, "Asterisk detected inband DTMF: %c.\n", f->subclass.integer);
+#else
+ CDEBUG(call, ast, "Asterisk detected inband DTMF: %c.\n", f->subclass);
+#endif
ast_mutex_unlock(&chan_lock);
break;
case AST_CONTROL_PROGRESS:
CDEBUG(call, ast, "Received indicate AST_CONTROL_PROGRESS from Asterisk.\n");
+ if (call->state == CHAN_LCR_STATE_IN_SETUP
+ || call->state == CHAN_LCR_STATE_IN_DIALING) {
+ CDEBUG(call, ast, "Changing to proceeding state, because no more dialing possible.\n");
+ /* send message to lcr */
+ memset(&newparam, 0, sizeof(union parameter));
+ send_message(MESSAGE_PROCEEDING, call->ref, &newparam);
+ /* change state */
+ call->state = CHAN_LCR_STATE_IN_PROCEEDING;
+ }
/* request bchannel */
CDEBUG(call, ast, "Requesting audio path.\n");
memset(&newparam, 0, sizeof(union parameter));
"\n"
"The available options are:\n"
" d - Send display text on called phone, text is the optarg.\n"
- " n - Don't detect dtmf tones from LCR.\n"
+ " D - Forward detected 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"