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);
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 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;
/* 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 */
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));