X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=9fd0eb4ec02119545f4173a261af99714d70f98d;hp=3904c9ac16016dee16565b36460a8bcf76f02b8b;hb=4545bb054f85f8280c6ae90c954b2ef299058b1d;hpb=da91d7d85fe092122e35ece52695f98345738359 diff --git a/chan_lcr.c b/chan_lcr.c index 3904c9a..9fd0eb4 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -136,6 +136,13 @@ it is called from ast_channel process which has already locked ast_channel. #ifdef LCR_FOR_ASTERISK #include #endif + +/* + * Fwd declare struct ast_channel to get rid of gcc warning about + * incompatible pointer type passed to ast_register_application2. + */ +struct ast_channel; + #include #include #include @@ -161,14 +168,15 @@ it is called from ast_channel process which has already locked ast_channel. #include #include #include - +#if ASTERISK_VERSION_NUM < 110000 +#include +#endif #include "extension.h" #include "message.h" #include "callerid.h" #include "lcrsocket.h" #include "cause.h" #include "select.h" -#include "bchannel.h" #include "options.h" #include "chan_lcr.h" @@ -186,7 +194,6 @@ static struct ast_frame nullframe = { AST_FRAME_NULL, }; #endif int lcr_debug=1; -int mISDN_created=1; char lcr_type[]="lcr"; @@ -241,7 +248,11 @@ void chan_lcr_log(int type, const char *file, int line, const char *function, st if (call) sprintf(call_text, "%d", call->ref); if (ast) +#if ASTERISK_VERSION_NUM < 110000 strncpy(ast_text, ast->name, sizeof(ast_text)-1); +#else + strncpy(ast_text, ast_channel_name(ast), sizeof(ast_text)-1); +#endif ast_text[sizeof(ast_text)-1] = '\0'; // ast_log(type, file, line, function, "[call=%s ast=%s] %s", call_text, ast_text, buffer); @@ -284,11 +295,6 @@ void free_call(struct chan_call *call) 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"); @@ -360,7 +366,8 @@ int send_message(int message_type, unsigned int ref, union parameter *param) CDEBUG(NULL, NULL, "Ignoring message %d, because socket is closed.\n", message_type); return -1; } - CDEBUG(NULL, NULL, "Sending %s to socket.\n", messages_txt[message_type]); + 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) @@ -380,7 +387,8 @@ int send_message(int message_type, unsigned int ref, union parameter *param) 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; @@ -392,8 +400,8 @@ int send_message(int message_type, unsigned int ref, union parameter *param) 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 @@ -424,12 +432,9 @@ void apply_opt(struct chan_call *call, char *data) 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); @@ -477,6 +482,7 @@ void apply_opt(struct chan_call *call, char *data) 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); @@ -486,23 +492,15 @@ void apply_opt(struct chan_call *call, char *data) 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); @@ -513,6 +511,7 @@ void apply_opt(struct chan_call *call, char *data) 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); @@ -533,13 +532,22 @@ void apply_opt(struct chan_call *call, char *data) #endif #endif - if (!call->trans) + 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 + } } CDEBUG(call, call->ast, "Option 'f' (faxdetect) with config '%s'.\n", call->faxdetect); break; @@ -560,6 +568,7 @@ void apply_opt(struct chan_call *call, char *data) 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); @@ -581,6 +590,7 @@ void apply_opt(struct chan_call *call, char *data) 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); @@ -594,13 +604,6 @@ void apply_opt(struct chan_call *call, char *data) 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->nodsp || call->faxdetect > 0)?1:0) + ((call->hdlc)?2:0), call->nodsp_queue)) - bchannel_activate(call->bchannel, 1); - } } /* @@ -679,8 +682,13 @@ static void send_setup_to_lcr(struct chan_call *call) #warning DISABLED DUE TO DOUBLE LOCKING PROBLEM // tmp = pbx_builtin_getvar_helper(ast, "LCR_TRANSFERCAPABILITY"); // if (tmp && *tmp) +#if ASTERISK_VERSION_NUM < 110000 // ast->transfercapability = atoi(tmp); newparam.setup.capainfo.bearer_capa = ast->transfercapability; +#else +// ast_channel_transfercapability_set(ast, atoi(tmp)); + newparam.setup.capainfo.bearer_capa = ast_channel_transfercapability(ast); +#endif newparam.setup.capainfo.bearer_mode = INFO_BMODE_CIRCUIT; if (call->hdlc) newparam.setup.capainfo.source_mode = B_MODE_HDLC; @@ -691,6 +699,11 @@ static void send_setup_to_lcr(struct chan_call *call) 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; @@ -734,19 +747,12 @@ static void bridge_message_if_bridged(struct chan_call *call, int message_type, } /* - * 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; @@ -763,21 +769,43 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c { int cause, ret; union parameter newparam; +#if ASTERISK_VERSION_NUM < 110000 char *exten = ast->exten; - if (!*exten) +#else + char s_exten[AST_MAX_EXTENSION]; + char *exten=s_exten; + + strncpy(exten, ast_channel_exten(ast), AST_MAX_EXTENSION-1); +#endif + +if (!*exten) exten = "s"; +#if ASTERISK_VERSION_NUM < 110000 CDEBUG(call, ast, "Try to start pbx. (exten=%s context=%s complete=%s)\n", exten, ast->context, complete?"yes":"no"); +#else + CDEBUG(call, ast, "Try to start pbx. (exten=%s context=%s complete=%s)\n", exten, ast_channel_context(ast), complete?"yes":"no"); +#endif if (complete) { /* if not match */ +#if ASTERISK_VERSION_NUM < 110000 if (!ast_canmatch_extension(ast, ast->context, exten, 1, call->oad)) { - CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at context '%s' - releasing.\n", exten, ast->context); +CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at context '%s' - releasing.\n", exten, ast->context); +#else + if (!ast_canmatch_extension(ast, ast_channel_context(ast), exten, 1, call->oad)) { +CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at context '%s' - releasing.\n", exten, ast_channel_context(ast)); +#endif cause = 1; goto release; } +#if ASTERISK_VERSION_NUM < 110000 if (!ast_exists_extension(ast, ast->context, exten, 1, call->oad)) { CDEBUG(call, ast, "Got 'sending complete', but extension '%s' would match at context '%s', if more digits would be dialed - releasing.\n", exten, ast->context); +#else + if (!ast_exists_extension(ast, ast_channel_context(ast), exten, 1, call->oad)) { + CDEBUG(call, ast, "Got 'sending complete', but extension '%s' would match at context '%s', if more digits would be dialed - releasing.\n", exten, ast_channel_context(ast)); +#endif cause = 28; goto release; } @@ -792,7 +820,11 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c goto start; } +#if ASTERISK_VERSION_NUM < 110000 if (ast_canmatch_extension(ast, ast->context, exten, 1, call->oad)) { +#else + if (ast_canmatch_extension(ast, ast_channel_context(ast), exten, 1, call->oad)) { +#endif /* send setup acknowledge to lcr */ if (call->state != CHAN_LCR_STATE_IN_DIALING) { memset(&newparam, 0, sizeof(union parameter)); @@ -803,17 +835,43 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c call->state = CHAN_LCR_STATE_IN_DIALING; /* if match, start pbx */ - if (ast_exists_extension(ast, ast->context, exten, 1, call->oad)) { +#if ASTERISK_VERSION_NUM < 110000 + if (ast_exists_extension(ast, ast->context, exten, 1, call->oad)) { +#else + if (ast_exists_extension(ast, ast_channel_context(ast), exten, 1, call->oad)) { +#endif CDEBUG(call, ast, "Extensions matches.\n"); 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; } +#if ASTERISK_VERSION_NUM < 110000 if (!*ast->exten) { +#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; @@ -824,10 +882,14 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c 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 ast->hangupcause = call->cause; +#else + ast_channel_hangupcause_set(ast, call->cause); +#endif /* change to release state */ call->state = CHAN_LCR_STATE_RELEASE; ast_hangup(ast); // call will be destroyed here @@ -839,7 +901,7 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c #ifdef LCR_FOR_CALLWEAVER ast->type = "LCR"; - snprintf(ast->name, sizeof(ast->name), "LCR/%s-%04x",ast->cid.cid_num, ast_random() & 0xffff); + snprintf(ast->name, sizeof(ast->name), "%s/%s-%04x",lcr_type ,ast->cid.cid_num, ast_random() & 0xffff); #endif ret = ast_pbx_start(ast); @@ -857,7 +919,17 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c 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; +#endif +// struct ast_party_caller *ast_caller; + struct ast_callerid *ast_caller; +#if ASTERISK_VERSION_NUM >= 110000 + struct ast_party_redirecting s_ast_redir; + struct ast_party_caller s_ast_caller; + ast_party_redirecting_init(&s_ast_redir); + ast_party_caller_init(&s_ast_caller); +#endif CDEBUG(call, NULL, "Incomming setup from LCR. (callerid %s, dialing %s)\n", param->setup.callerinfo.id, param->setup.dialinginfo.id); /* create asterisk channel instrance */ @@ -874,158 +946,186 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet #endif #endif +#if ASTERISK_VERSION_NUM < 110000 +// ast_redir = &ast->redirecting; +// ast_caller = &ast->caller; + ast_caller = &ast->cid; +#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; } /* link together */ call->ast = ast; +#if ASTERISK_VERSION_NUM < 110000 ast->tech_pvt = call; ast->tech = &lcr_tech; ast->fds[0] = call->pipe[0]; +#else + ast_channel_tech_pvt_set(ast, call); + ast_channel_tech_set(ast, &lcr_tech); + ast_channel_set_fd(ast, 0, call->pipe[0]); +#endif /* fill setup information */ 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); + else + ast_channel_context_set(ast, param->setup.callerinfo.interface); +#endif #ifdef AST_1_8_OR_HIGHER if (param->setup.callerinfo.id[0]) { - ast->caller.id.number.valid = 1; - ast->caller.id.number.str = strdup(param->setup.callerinfo.id); + ast_caller->id.number.valid = 1; + ast_caller->id.number.str = strdup(param->setup.callerinfo.id); if (!param->setup.callerinfo.id[0]) { - ast->caller.id.number.presentation = AST_PRES_RESTRICTED; - ast->caller.id.number.plan = (0 << 4) | 1; + ast_caller->id.number.presentation = AST_PRES_RESTRICTED; + ast_caller->id.number.plan = (0 << 4) | 1; } switch (param->setup.callerinfo.present) { case INFO_PRESENT_ALLOWED: - ast->caller.id.number.presentation = AST_PRES_ALLOWED; + ast_caller->id.number.presentation = AST_PRES_ALLOWED; break; case INFO_PRESENT_RESTRICTED: - ast->caller.id.number.presentation = AST_PRES_RESTRICTED; + ast_caller->id.number.presentation = AST_PRES_RESTRICTED; break; default: - ast->caller.id.number.presentation = AST_PRES_UNAVAILABLE; + ast_caller->id.number.presentation = AST_PRES_UNAVAILABLE; } switch (param->setup.callerinfo.screen) { case INFO_SCREEN_USER: - ast->caller.id.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED; + ast_caller->id.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED; break; case INFO_SCREEN_USER_VERIFIED_PASSED: - ast->caller.id.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN; + ast_caller->id.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN; break; case INFO_SCREEN_USER_VERIFIED_FAILED: - ast->caller.id.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN; + ast_caller->id.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN; break; default: - ast->caller.id.number.presentation |= AST_PRES_NETWORK_NUMBER; + ast_caller->id.number.presentation |= AST_PRES_NETWORK_NUMBER; } switch (param->setup.callerinfo.ntype) { case INFO_NTYPE_SUBSCRIBER: - ast->caller.id.number.plan = (4 << 4) | 1; + ast_caller->id.number.plan = (4 << 4) | 1; break; case INFO_NTYPE_NATIONAL: - ast->caller.id.number.plan = (2 << 4) | 1; + ast_caller->id.number.plan = (2 << 4) | 1; break; case INFO_NTYPE_INTERNATIONAL: - ast->caller.id.number.plan = (1 << 4) | 1; + ast_caller->id.number.plan = (1 << 4) | 1; break; default: - ast->caller.id.number.plan = (0 << 4) | 1; + ast_caller->id.number.plan = (0 << 4) | 1; } } if (param->setup.callerinfo.id2[0]) { - ast->caller.ani.number.valid = 1; - ast->caller.ani.number.str = strdup(param->setup.callerinfo.id2); + ast_caller->ani.number.valid = 1; + ast_caller->ani.number.str = strdup(param->setup.callerinfo.id2); switch (param->setup.callerinfo.present2) { case INFO_PRESENT_ALLOWED: - ast->caller.ani.number.presentation = AST_PRES_ALLOWED; + ast_caller->ani.number.presentation = AST_PRES_ALLOWED; break; case INFO_PRESENT_RESTRICTED: - ast->caller.ani.number.presentation = AST_PRES_RESTRICTED; + ast_caller->ani.number.presentation = AST_PRES_RESTRICTED; break; default: - ast->caller.ani.number.presentation = AST_PRES_UNAVAILABLE; + ast_caller->ani.number.presentation = AST_PRES_UNAVAILABLE; } switch (param->setup.callerinfo.screen2) { case INFO_SCREEN_USER: - ast->caller.ani.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED; + ast_caller->ani.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED; break; case INFO_SCREEN_USER_VERIFIED_PASSED: - ast->caller.ani.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN; + ast_caller->ani.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN; break; case INFO_SCREEN_USER_VERIFIED_FAILED: - ast->caller.ani.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN; + ast_caller->ani.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN; break; default: - ast->caller.ani.number.presentation |= AST_PRES_NETWORK_NUMBER; + ast_caller->ani.number.presentation |= AST_PRES_NETWORK_NUMBER; } switch (param->setup.callerinfo.ntype2) { case INFO_NTYPE_SUBSCRIBER: - ast->caller.ani.number.plan = (4 << 4) | 1; + ast_caller->ani.number.plan = (4 << 4) | 1; break; case INFO_NTYPE_NATIONAL: - ast->caller.ani.number.plan = (2 << 4) | 1; + ast_caller->ani.number.plan = (2 << 4) | 1; break; case INFO_NTYPE_INTERNATIONAL: - ast->caller.ani.number.plan = (1 << 4) | 1; + ast_caller->ani.number.plan = (1 << 4) | 1; break; default: - ast->caller.ani.number.plan = (0 << 4) | 1; + ast_caller->ani.number.plan = (0 << 4) | 1; } } if (param->setup.callerinfo.name[0]) { - ast->caller.id.name.valid = 1; - ast->caller.id.name.str = strdup(param->setup.callerinfo.name); + ast_caller->id.name.valid = 1; + ast_caller->id.name.str = strdup(param->setup.callerinfo.name); } +#if ASTERISK_VERSION_NUM >= 110000 + ast_channel_caller_set(ast, ast_caller); +#endif if (param->setup.redirinfo.id[0]) { - ast->redirecting.from.number.valid = 1; - ast->redirecting.from.number.str = strdup(param->setup.redirinfo.id); + ast_redir->from.number.valid = 1; + ast_redir->from.number.str = strdup(param->setup.redirinfo.id); switch (param->setup.redirinfo.present) { case INFO_PRESENT_ALLOWED: - ast->redirecting.from.number.presentation = AST_PRES_ALLOWED; + ast_redir->from.number.presentation = AST_PRES_ALLOWED; break; case INFO_PRESENT_RESTRICTED: - ast->redirecting.from.number.presentation = AST_PRES_RESTRICTED; + ast_redir->from.number.presentation = AST_PRES_RESTRICTED; break; default: - ast->redirecting.from.number.presentation = AST_PRES_UNAVAILABLE; + ast_redir->from.number.presentation = AST_PRES_UNAVAILABLE; } switch (param->setup.redirinfo.screen) { case INFO_SCREEN_USER: - ast->redirecting.from.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED; + ast_redir->from.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED; break; case INFO_SCREEN_USER_VERIFIED_PASSED: - ast->redirecting.from.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN; + ast_redir->from.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN; break; case INFO_SCREEN_USER_VERIFIED_FAILED: - ast->redirecting.from.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN; + ast_redir->from.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN; break; default: - ast->redirecting.from.number.presentation |= AST_PRES_NETWORK_NUMBER; + ast_redir->from.number.presentation |= AST_PRES_NETWORK_NUMBER; } switch (param->setup.redirinfo.ntype) { case INFO_NTYPE_SUBSCRIBER: - ast->redirecting.from.number.plan = (4 << 4) | 1; + ast_redir->from.number.plan = (4 << 4) | 1; break; case INFO_NTYPE_NATIONAL: - ast->redirecting.from.number.plan = (2 << 4) | 1; + ast_redir->from.number.plan = (2 << 4) | 1; break; case INFO_NTYPE_INTERNATIONAL: - ast->redirecting.from.number.plan = (1 << 4) | 1; + ast_redir->from.number.plan = (1 << 4) | 1; break; default: - ast->redirecting.from.number.plan = (0 << 4) | 1; + ast_redir->from.number.plan = (0 << 4) | 1; } +#if ASTERISK_VERSION_NUM >= 110000 + ast_channel_redirecting_set(ast, ast_redir); +#endif } #else memset(&ast->cid, 0, sizeof(ast->cid)); @@ -1062,18 +1162,43 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet } #endif +#if ASTERISK_VERSION_NUM < 110000 ast->transfercapability = param->setup.capainfo.bearer_capa; +#else + ast_channel_transfercapability_set(ast, param->setup.capainfo.bearer_capa); +#endif /* enable hdlc if transcap is data */ if (param->setup.capainfo.source_mode == B_MODE_HDLC) 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 */ +#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; +#else +#if ASTERISK_VERSION_NUM < 110000 + ast_format_set(&ast->rawwriteformat ,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0); + ast_format_copy(&ast->rawreadformat, &ast->rawwriteformat); + ast_format_cap_set(ast->nativeformats, &ast->rawwriteformat); + ast_set_write_format(ast, &ast->rawwriteformat); + ast_set_read_format(ast, &ast->rawreadformat); +#else + ast_format_set(ast_channel_rawwriteformat(ast) ,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0); + ast_format_copy(ast_channel_rawreadformat(ast), ast_channel_rawwriteformat(ast)); + ast_format_cap_set(ast_channel_nativeformats(ast), ast_channel_rawwriteformat(ast)); + ast_set_write_format(ast, ast_channel_rawwriteformat(ast)); + ast_set_read_format(ast, ast_channel_rawreadformat(ast)); +#endif +#endif +#if ASTERISK_VERSION_NUM < 110000 ast->priority = 1; ast->hangupcause = 0; +#else + ast_channel_priority_set(ast, 1); + ast_channel_hangupcause_set(ast, 0); +#endif /* change state */ call->state = CHAN_LCR_STATE_IN_SETUP; @@ -1112,7 +1237,8 @@ static void lcr_in_proceeding(struct chan_call *call, int message_type, union pa 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); } @@ -1133,7 +1259,8 @@ static void lcr_in_alerting(struct chan_call *call, int message_type, union para 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); } @@ -1144,19 +1271,10 @@ static void lcr_in_alerting(struct chan_call *call, int message_type, union para */ 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.\n"); - 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 */ @@ -1164,7 +1282,8 @@ static void lcr_in_connect(struct chan_call *call, int message_type, union param 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); } @@ -1194,18 +1313,23 @@ static void lcr_in_disconnect(struct chan_call *call, int message_type, union pa } #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; /* queue release asterisk */ if (ast) { +#if ASTERISK_VERSION_NUM < 110000 ast->hangupcause = call->cause; +#else + ast_channel_hangupcause_set(ast, call->cause); +#endif if (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); } strcpy(call->queue_string, "H"); // overwrite other indications } else { @@ -1234,12 +1358,17 @@ static void lcr_in_release(struct chan_call *call, int message_type, union param } /* if we have an asterisk instance, queue hangup, else we are done */ if (ast) { +#if ASTERISK_VERSION_NUM < 110000 ast->hangupcause = call->cause; +#else + ast_channel_hangupcause_set(ast, call->cause); +#endif if (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); } strcpy(call->queue_string, "H"); } else { @@ -1265,7 +1394,11 @@ static void lcr_in_information(struct chan_call *call, int message_type, union p /* pbx not started */ if (!call->pbx_started) { CDEBUG(call, call->ast, "Asterisk not started, adding digits to number.\n"); +#if ASTERISK_VERSION_NUM < 110000 strncat(ast->exten, param->information.id, AST_MAX_EXTENSION-1); +#else + ast_channel_exten_set(ast, param->information.id); +#endif lcr_start_pbx(call, ast, param->information.sending_complete); return; } @@ -1282,7 +1415,8 @@ static void lcr_in_information(struct chan_call *call, int message_type, union p 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); } @@ -1299,18 +1433,8 @@ static void lcr_in_information(struct chan_call *call, int message_type, union p */ 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 */ @@ -1347,18 +1471,17 @@ static void lcr_in_pattern(struct chan_call *call, int message_type, union param call->has_pattern = 1; /* request bchannel */ - if (!call->bchannel) { - CDEBUG(call, 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, 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); } @@ -1388,7 +1511,8 @@ void lcr_in_dtmf(struct chan_call *call, int val) 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); } @@ -1398,103 +1522,12 @@ void lcr_in_dtmf(struct chan_call *call, int val) */ 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) { @@ -1535,9 +1568,9 @@ int receive_message(int message_type, unsigned int ref, union parameter *param) 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; @@ -1612,11 +1645,21 @@ int receive_message(int message_type, unsigned int ref, union parameter *param) 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; + default: CDEBUG(call, call->ast, "Message %d from LCR unhandled.\n", message_type); break; } - return 0; + return rc; } /* @@ -1652,15 +1695,12 @@ again: 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); @@ -1778,6 +1818,10 @@ void close_socket(void) { struct admin_list *admin, *temp; + /* socket not created */ + if (lcr_sock < 0) + return; + unregister_fd(&socket_fd); /* flush pending messages */ @@ -1790,8 +1834,7 @@ void close_socket(void) admin_first = NULL; /* close socket */ - if (lcr_sock >= 0) - close(lcr_sock); + close(lcr_sock); lcr_sock = -1; global_change = 1; } @@ -1801,8 +1844,9 @@ 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; @@ -1926,8 +1970,6 @@ static void *chan_thread(void *arg) 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); @@ -1946,14 +1988,22 @@ static void *chan_thread(void *arg) */ static #ifdef AST_1_8_OR_HIGHER +#if ASTERISK_VERSION_NUM < 100000 struct ast_channel *lcr_request(const char *type, format_t format, const struct ast_channel *requestor, void *data, int *cause) #else +struct ast_channel *lcr_request(const char *type, struct ast_format_cap *format, const struct ast_channel *requestor, void *data, int *cause) +#endif +#else struct ast_channel *lcr_request(const char *type, int format, void *data, int *cause) #endif { 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); @@ -1994,19 +2044,62 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c ast_mutex_unlock(&chan_lock); return NULL; } +#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 + req_redir = ast_channel_redirecting(requestor); + req_caller = ast_channel_caller(requestor); +#endif /* configure channel */ +#if ASTERISK_VERSION_NUM < 100000 +#if ASTERISK_VERSION_NUM < 110000 ast->nativeformats = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW; ast->readformat = ast->rawreadformat = ast->nativeformats; ast->writeformat = ast->rawwriteformat = ast->nativeformats; +#else + ast_channel_nativeformats_set(ast, (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW); + ast->readformat = ast->rawreadformat = ast_channel_nativeformats(ast); + ast->writeformat = ast->rawwriteformat = ast_channel_nativeformats(ast); +#endif +#else +#if ASTERISK_VERSION_NUM < 110000 + ast_format_set(&ast->rawwriteformat ,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0); + ast_format_copy(&ast->rawreadformat, &ast->rawwriteformat); + ast_format_cap_set(ast->nativeformats, &ast->rawwriteformat); + ast_set_write_format(ast, &ast->rawwriteformat); + ast_set_read_format(ast, &ast->rawreadformat); +#else + ast_format_set(ast_channel_rawwriteformat(ast) ,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0); + ast_format_copy(ast_channel_rawreadformat(ast), ast_channel_rawwriteformat(ast)); + ast_format_cap_set(ast_channel_nativeformats(ast), ast_channel_rawwriteformat(ast)); + ast_set_write_format(ast, ast_channel_rawwriteformat(ast)); + ast_set_read_format(ast, ast_channel_rawreadformat(ast)); +#endif +#endif +#if ASTERISK_VERSION_NUM < 110000 ast->priority = 1; ast->hangupcause = 0; +#else + ast_channel_priority_set(ast, 1); + ast_channel_hangupcause_set(ast, 0); +#endif /* link together */ call->ast = ast; +#if ASTERISK_VERSION_NUM < 110000 ast->tech_pvt = call; ast->fds[0] = call->pipe[0]; +#else + ast_channel_tech_pvt_set(ast, call); + ast_channel_set_fd(ast, 0, call->pipe[0]); +#endif call->pbx_started = 0; /* set state */ call->state = CHAN_LCR_STATE_OUT_PREPARE; @@ -2040,49 +2133,49 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c // clone_variables(requestor, ast); #if 0 - ast->caller.ani.number.valid= requestor->caller.ani.number.valid; - if (requestor->caller.ani.number.valid) - if (requestor->caller.ani.number.str) - if (requestor->caller.ani.number.str[0]) - ast->caller.ani.number.str= strdup(requestor->caller.ani.number.str); - ast->caller.ani.number.plan= requestor->caller.ani.number.plan; - ast->caller.ani.number.presentation= requestor->caller.ani.number.presentation; - - ast->caller.ani.name.valid= requestor->caller.ani.name.valid; - if (requestor->caller.ani.name.valid) - if (requestor->caller.ani.name.str) - if (requestor->caller.ani.name.str[0]) - ast->caller.ani.name.str= strdup(requestor->caller.ani.name.str); - ast->caller.ani.name.presentation= requestor->caller.ani.name.presentation; - - ast->caller.ani.subaddress.valid= requestor->caller.ani.subaddress.valid; - if (requestor->caller.ani.subaddress.valid) - if (requestor->caller.ani.subaddress.str) - if (requestor->caller.ani.subaddress.str[0]) - ast->caller.ani.subaddress.str= strdup(requestor->caller.ani.subaddress.str); - ast->caller.ani.subaddress.type= requestor->caller.ani.subaddress.type; - - ast->caller.id.number.valid= requestor->caller.id.number.valid; - if (requestor->caller.id.number.valid) - if (requestor->caller.id.number.str) - if (requestor->caller.id.number.str[0]) - ast->caller.id.number.str= strdup(requestor->caller.id.number.str); - ast->caller.id.number.plan= requestor->caller.id.number.plan; - ast->caller.id.number.presentation= requestor->caller.id.number.presentation; - - ast->caller.id.name.valid= requestor->caller.id.name.valid; - if (requestor->caller.id.name.valid) - if (requestor->caller.id.name.str) - if (requestor->caller.id.name.str[0]) - ast->caller.id.name.str= strdup(requestor->caller.id.name.str); - ast->caller.id.name.presentation= requestor->caller.id.name.presentation; - - ast->caller.id.subaddress.valid= requestor->caller.id.subaddress.valid; - if (requestor->caller.id.subaddress.valid) - if (requestor->caller.id.subaddress.str) - if (requestor->caller.id.subaddress.str[0]) - ast->caller.id.subaddress.str= strdup(requestor->caller.id.subaddress.str); - ast->caller.id.subaddress.type= requestor->caller.id.subaddress.type; + ast->caller.ani.number.valid= req_caller->ani.number.valid; + if (req_caller->ani.number.valid) + if (req_caller->ani.number.str) + if (req_caller->ani.number.str[0]) + ast->caller.ani.number.str= strdup(req_caller->ani.number.str); + ast->caller.ani.number.plan= req_caller->ani.number.plan; + ast->caller.ani.number.presentation= req_caller->ani.number.presentation; + + ast->caller.ani.name.valid= req_caller->ani.name.valid; + if (req_caller->ani.name.valid) + if (req_caller->ani.name.str) + if (req_caller->ani.name.str[0]) + ast->caller.ani.name.str= strdup(req_caller->ani.name.str); + ast->caller.ani.name.presentation= req_caller->ani.name.presentation; + + ast->caller.ani.subaddress.valid= req_caller->ani.subaddress.valid; + if (req_caller->ani.subaddress.valid) + if (req_caller->ani.subaddress.str) + if (req_caller->ani.subaddress.str[0]) + ast->caller.ani.subaddress.str= strdup(req_caller->ani.subaddress.str); + ast->caller.ani.subaddress.type= req_caller->ani.subaddress.type; + + ast->caller.id.number.valid= req_caller->id.number.valid; + if (req_caller->id.number.valid) + if (req_caller->id.number.str) + if (req_caller->id.number.str[0]) + ast->caller.id.number.str= strdup(req_caller->id.number.str); + ast->caller.id.number.plan= req_caller->id.number.plan; + ast->caller.id.number.presentation= req_caller->id.number.presentation; + + ast->caller.id.name.valid= req_caller->id.name.valid; + if (req_caller->id.name.valid) + if (req_caller->id.name.str) + if (req_caller->id.name.str[0]) + ast->caller.id.name.str= strdup(req_caller->id.name.str); + ast->caller.id.name.presentation= req_caller->id.name.presentation; + + ast->caller.id.subaddress.valid= req_caller->id.subaddress.valid; + if (req_caller->id.subaddress.valid) + if (req_caller->id.subaddress.str) + if (req_caller->id.subaddress.str[0]) + ast->caller.id.subaddress.str= strdup(req_caller->id.subaddress.str); + ast->caller.id.subaddress.type= req_caller->id.subaddress.type; if (requestor->dialed.number.str) if (requestor->dialed.number.str[0]) @@ -2097,32 +2190,32 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c ast->dialed.subaddress.type= requestor->dialed.subaddress.type; ast->dialed.transit_network_select= requestor->dialed.transit_network_select; - ast->redirecting.count= requestor->redirecting.count; - ast->redirecting.reason= requestor->redirecting.reason; - - ast->redirecting.from.number.valid= requestor->redirecting.from.number.valid; - if (requestor->redirecting.from.number.valid) - if (requestor->redirecting.from.number.str) - if (requestor->redirecting.from.number.str[0]) - ast->redirecting.from.number.str= strdup(requestor->redirecting.from.number.str); - ast->redirecting.from.number.plan= requestor->redirecting.from.number.plan; - ast->redirecting.from.number.presentation= requestor->redirecting.from.number.presentation; - - ast->redirecting.to.number.valid= requestor->redirecting.to.number.valid; - if (requestor->redirecting.to.number.valid) - if (requestor->redirecting.to.number.str) - if (requestor->redirecting.to.number.str[0]) - ast->redirecting.to.number.str= strdup(requestor->redirecting.to.number.str); - ast->redirecting.to.number.plan= requestor->redirecting.to.number.plan; - ast->redirecting.to.number.presentation= requestor->redirecting.to.number.presentation; + ast->redirecting.count= req_redir->count; + ast->redirecting.reason= req_redir->reason; + + ast->redirecting.from.number.valid= req_redir->from.number.valid; + if (req_redir->from.number.valid) + if (req_redir->from.number.str) + if (req_redir->from.number.str[0]) + ast->redirecting.from.number.str= strdup(req_redir->from.number.str); + ast->redirecting.from.number.plan= req_redir->from.number.plan; + ast->redirecting.from.number.presentation= req_redir->from.number.presentation; + + ast->redirecting.to.number.valid= req_redir->to.number.valid; + if (req_redir->to.number.valid) + if (req_redir->to.number.str) + if (req_redir->to.number.str[0]) + ast->redirecting.to.number.str= strdup(req_redir->to.number.str); + ast->redirecting.to.number.plan= req_redir->to.number.plan; + ast->redirecting.to.number.presentation= req_redir->to.number.presentation; #endif /* store call information for setup */ /* caller ID */ - if (requestor->caller.id.number.valid) { - if (requestor->caller.id.number.str) - strncpy(call->callerinfo.id, requestor->caller.id.number.str, sizeof(call->callerinfo.id)-1); - switch(requestor->caller.id.number.presentation & AST_PRES_RESTRICTION) { + if (requestor && req_caller->id.number.valid) { + if (req_caller->id.number.str) + strncpy(call->callerinfo.id, req_caller->id.number.str, sizeof(call->callerinfo.id)-1); + switch(req_caller->id.number.presentation & AST_PRES_RESTRICTION) { case AST_PRES_RESTRICTED: call->callerinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -2133,7 +2226,7 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c default: call->callerinfo.present = INFO_PRESENT_ALLOWED; } - switch(requestor->caller.id.number.presentation & AST_PRES_NUMBER_TYPE) { + switch(req_caller->id.number.presentation & AST_PRES_NUMBER_TYPE) { case AST_PRES_USER_NUMBER_UNSCREENED: call->callerinfo.screen = INFO_SCREEN_USER; break; @@ -2146,7 +2239,7 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c default: call->callerinfo.screen = INFO_SCREEN_NETWORK; } - switch((requestor->caller.id.number.plan >> 4) & 7) { + switch((req_caller->id.number.plan >> 4) & 7) { case 4: call->callerinfo.ntype = INFO_NTYPE_SUBSCRIBER; break; @@ -2163,10 +2256,10 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c call->callerinfo.present = INFO_PRESENT_NOTAVAIL; /* caller ID 2 */ - if (requestor->caller.ani.number.valid) { - if (requestor->caller.ani.number.str) - strncpy(call->callerinfo.id2, requestor->caller.ani.number.str, sizeof(call->callerinfo.id2)-1); - switch(requestor->caller.ani.number.presentation & AST_PRES_RESTRICTION) { + if (requestor && req_caller->ani.number.valid) { + if (req_caller->ani.number.str) + strncpy(call->callerinfo.id2, req_caller->ani.number.str, sizeof(call->callerinfo.id2)-1); + switch(req_caller->ani.number.presentation & AST_PRES_RESTRICTION) { case AST_PRES_RESTRICTED: call->callerinfo.present2 = INFO_PRESENT_RESTRICTED; break; @@ -2177,7 +2270,7 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c default: call->callerinfo.present2 = INFO_PRESENT_ALLOWED; } - switch(requestor->caller.ani.number.presentation & AST_PRES_NUMBER_TYPE) { + switch(req_caller->ani.number.presentation & AST_PRES_NUMBER_TYPE) { case AST_PRES_USER_NUMBER_UNSCREENED: call->callerinfo.screen2 = INFO_SCREEN_USER; break; @@ -2190,7 +2283,7 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c default: call->callerinfo.screen2 = INFO_SCREEN_NETWORK; } - switch((requestor->caller.ani.number.plan >> 4) & 7) { + switch((req_caller->ani.number.plan >> 4) & 7) { case 4: call->callerinfo.ntype2 = INFO_NTYPE_SUBSCRIBER; break; @@ -2207,17 +2300,17 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c call->callerinfo.present2 = INFO_PRESENT_NOTAVAIL; /* caller name */ - if (requestor->caller.id.name.valid) { - if (requestor->caller.id.name.str) - strncpy(call->callerinfo.name, requestor->caller.id.name.str, sizeof(call->callerinfo.name)-1); + if (requestor && req_caller->id.name.valid) { + if (req_caller->id.name.str) + strncpy(call->callerinfo.name, req_caller->id.name.str, sizeof(call->callerinfo.name)-1); } /* redir number */ - if (requestor->redirecting.from.number.valid) { + if (requestor && req_redir->from.number.valid) { call->redirinfo.itype = INFO_ITYPE_CHAN; - if (requestor->redirecting.from.number.str) - strncpy(call->redirinfo.id, requestor->redirecting.from.number.str, sizeof(call->redirinfo.id)-1); - switch(requestor->redirecting.from.number.presentation & AST_PRES_RESTRICTION) { + if (req_redir->from.number.str) + strncpy(call->redirinfo.id, req_redir->from.number.str, sizeof(call->redirinfo.id)-1); + switch(req_redir->from.number.presentation & AST_PRES_RESTRICTION) { case AST_PRES_RESTRICTED: call->redirinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -2228,7 +2321,7 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c default: call->redirinfo.present = INFO_PRESENT_ALLOWED; } - switch(requestor->redirecting.from.number.presentation & AST_PRES_NUMBER_TYPE) { + switch(req_redir->from.number.presentation & AST_PRES_NUMBER_TYPE) { case AST_PRES_USER_NUMBER_UNSCREENED: call->redirinfo.screen = INFO_SCREEN_USER; break; @@ -2241,7 +2334,7 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c default: call->redirinfo.screen = INFO_SCREEN_NETWORK; } - switch((requestor->redirecting.from.number.plan >> 4) & 7) { + switch((req_redir->from.number.plan >> 4) & 7) { case 4: call->redirinfo.ntype = INFO_NTYPE_SUBSCRIBER; break; @@ -2268,13 +2361,20 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout) { union parameter newparam; struct chan_call *call; +#if ASTERISK_VERSION_NUM >= 110000 + int transfercapability; +#endif ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif #ifdef LCR_FOR_CALLWEAVER ast->type = "LCR"; - snprintf(ast->name, sizeof(ast->name), "LCR/%s-%04x",call->dialstring, ast_random() & 0xffff); + snprintf(ast->name, sizeof(ast->name), "%s/%s-%04x",lcr_type, call->dialstring, ast_random() & 0xffff); #endif if (!call) { @@ -2290,21 +2390,33 @@ 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 */ - if (!strcmp(call->interface, "pbx")) - newparam.newref.mode = 1; send_message(MESSAGE_NEWREF, 0, &newparam); /* set hdlc if capability requires hdlc */ +#if ASTERISK_VERSION_NUM < 110000 if (ast->transfercapability == INFO_BC_DATAUNRESTRICTED || ast->transfercapability == INFO_BC_DATARESTRICTED || ast->transfercapability == INFO_BC_VIDEO) +#else + transfercapability=ast_channel_transfercapability(ast); + if (transfercapability == INFO_BC_DATAUNRESTRICTED + || transfercapability == INFO_BC_DATARESTRICTED + || transfercapability == INFO_BC_VIDEO) +#endif call->hdlc = 1; /* if hdlc is forced by option, we change transcap to data */ if (call->hdlc +#if ASTERISK_VERSION_NUM < 110000 && ast->transfercapability != INFO_BC_DATAUNRESTRICTED && ast->transfercapability != INFO_BC_DATARESTRICTED && ast->transfercapability != INFO_BC_VIDEO) ast->transfercapability = INFO_BC_DATAUNRESTRICTED; +#else + && transfercapability != INFO_BC_DATAUNRESTRICTED + && transfercapability != INFO_BC_DATARESTRICTED + && transfercapability != INFO_BC_VIDEO) + transfercapability = INFO_BC_DATAUNRESTRICTED; +#endif #ifndef AST_1_8_OR_HIGHER call->cid_num[0] = 0; @@ -2355,9 +2467,11 @@ static void send_digit_to_chan(struct ast_channel * ast, char digit ) else if (digit == '#') ast_playtones_start(ast,0,dtmf_tones[15], 0); else { - /* not handled */ - CDEBUG(NULL, ast, "Unable to handle DTMF tone " - "'%c' for '%s'\n", digit, ast->name); +#if ASTERISK_VERSION_NUM < 110000 + CDEBUG(NULL, ast, "Unable to handle DTMF tone '%c' for '%s'\n", digit, ast->name); +#else + CDEBUG(NULL, ast, "Unable to handle DTMF tone '%c' for '%s'\n", digit, ast_channel_name(ast)); +#endif } } @@ -2381,7 +2495,11 @@ static int lcr_digit(struct ast_channel *ast, char digit) return 0; ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif if (!call) { CERROR(NULL, ast, "Received digit from Asterisk, but no call instance exists.\n"); ast_mutex_unlock(&chan_lock); @@ -2424,7 +2542,11 @@ static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int durat ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif if (!call) { CERROR(NULL, ast, @@ -2456,7 +2578,11 @@ static int lcr_answer(struct ast_channel *ast) struct chan_call *call; ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif if (!call) { CERROR(NULL, ast, "Received answer from Asterisk, but no call instance exists.\n"); ast_mutex_unlock(&chan_lock); @@ -2476,13 +2602,6 @@ static int lcr_answer(struct ast_channel *ast) 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); @@ -2499,7 +2618,11 @@ static int lcr_hangup(struct ast_channel *ast) if (!pthread_equal(tid, chan_tid)) { ast_mutex_lock(&chan_lock); } +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif if (!call) { CERROR(NULL, ast, "Received hangup from Asterisk, but no call instance exists.\n"); if (!pthread_equal(tid, chan_tid)) { @@ -2514,15 +2637,25 @@ static int lcr_hangup(struct ast_channel *ast) CDEBUG(call, ast, "Received hangup from LCR thread.\n"); /* disconnect asterisk, maybe not required */ +#if ASTERISK_VERSION_NUM < 110000 ast->tech_pvt = NULL; ast->fds[0] = -1; +#else + ast_channel_tech_pvt_set(ast, NULL); + ast_channel_set_fd(ast, 0, -1); +#endif if (call->ref) { /* release */ 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(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)) { @@ -2550,35 +2683,69 @@ static int lcr_hangup(struct ast_channel *ast) 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 - if (!f->subclass.integer) + if (!f->subclass.codec) #else if (!f->subclass) #endif CDEBUG(NULL, ast, "No subclass\n"); +#endif #ifdef AST_1_8_OR_HIGHER - if (!(f->subclass.integer & ast->nativeformats)) { +#if ASTERISK_VERSION_NUM < 100000 +#if ASTERISK_VERSION_NUM < 110000 + if (!(f->subclass.codec & ast->nativeformats)) { #else + if (!(f->subclass.codec & ast_channel_nativeformats(ast))) { +#endif +#else +#if ASTERISK_VERSION_NUM < 110000 + if (!ast_format_cap_iscompatible(ast->nativeformats, &f->subclass.format)) { +#else + if (!ast_format_cap_iscompatible(ast_channel_nativeformats(ast), &f->subclass.format)) { +#endif +#endif +#else +#if ASTERISK_VERSION_NUM < 110000 if (!(f->subclass & ast->nativeformats)) { +#else + if (!(f->subclass & ast_channel_nativeformats(ast))) { #endif - CDEBUG(NULL, ast, +#endif + CDEBUG(NULL, ast, "Unexpected format. " "Activating emergency conversion...\n"); #ifdef AST_1_8_OR_HIGHER - ast_set_write_format(ast, f->subclass.integer); +#if ASTERISK_VERSION_NUM < 100000 + ast_set_write_format(ast, f->subclass.codec); +#else + ast_set_write_format(ast, &f->subclass.format); +#endif #else ast_set_write_format(ast, f->subclass); #endif +#if ASTERISK_VERSION_NUM < 110000 f = (ast->writetrans) ? ast_translate( ast->writetrans, fr, 0) : fr; +#else + f = (ast_channel_writetrans(ast)) ? ast_translate( + ast_channel_writetrans(ast), fr, 0) : fr; +#endif } - + ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif if (!call) { ast_mutex_unlock(&chan_lock); if (f != fr) { @@ -2586,8 +2753,18 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr) } return -1; } - if (call->bchannel && f->samples) - bchannel_transmit(call->bchannel, *((unsigned char **)&(f->data)), f->samples); + 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); + } ast_mutex_unlock(&chan_lock); if (f != fr) { ast_frfree(f); @@ -2602,7 +2779,11 @@ static struct ast_frame *lcr_read(struct ast_channel *ast) int len = 0; ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif if (!call) { ast_mutex_unlock(&chan_lock); return NULL; @@ -2644,9 +2825,26 @@ static struct ast_frame *lcr_read(struct ast_channel *ast) call->read_fr.frametype = AST_FRAME_VOICE; #ifdef AST_1_8_OR_HIGHER - call->read_fr.subclass.integer = ast->nativeformats; +#if ASTERISK_VERSION_NUM < 100000 +#if ASTERISK_VERSION_NUM < 110000 + call->read_fr.subclass.codec = ast->nativeformats; +#else + call->read_fr.subclass.codec = ast_channel_nativeformats(ast); +#endif +#else +#if ASTERISK_VERSION_NUM < 110000 + ast_best_codec(ast->nativeformats, &call->read_fr.subclass.format); #else + ast_best_codec(ast_channel_nativeformats(ast), &call->read_fr.subclass.format); +#endif + call->read_fr.subclass.integer = call->read_fr.subclass.format.id; +#endif +#else +#if ASTERISK_VERSION_NUM < 110000 call->read_fr.subclass = ast->nativeformats; +#else + call->read_fr.subclass = ast_channel_nativeformats(ast); +#endif #endif if (call->rebuffer) { call->read_fr.datalen = call->framepos; @@ -2668,10 +2866,14 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz union parameter newparam; int res = 0; struct chan_call *call; - const struct tone_zone_sound *ts = NULL; + const struct ast_tone_zone_sound *ts = NULL; ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif if (!call) { CERROR(NULL, ast, "Received indicate from Asterisk, but no call instance exists.\n"); ast_mutex_unlock(&chan_lock); @@ -2692,22 +2894,38 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz call->state = CHAN_LCR_STATE_OUT_DISCONNECT; } else { CDEBUG(call, ast, "Using Asterisk 'busy' indication\n"); +#if ASTERISK_VERSION_NUM < 110000 ts = ast_get_indication_tone(ast->zone, "busy"); +#else + ts = ast_get_indication_tone(ast_channel_zone(ast), "busy"); +#endif } break; case AST_CONTROL_CONGESTION: +#if ASTERISK_VERSION_NUM < 110000 CDEBUG(call, ast, "Received indicate AST_CONTROL_CONGESTION from Asterisk. (cause %d)\n", ast->hangupcause); +#else + CDEBUG(call, ast, "Received indicate AST_CONTROL_CONGESTION from Asterisk. (cause %d)\n", ast_channel_hangupcause(ast)); +#endif if (call->state != CHAN_LCR_STATE_OUT_DISCONNECT) { /* send message to lcr */ memset(&newparam, 0, sizeof(union parameter)); +#if ASTERISK_VERSION_NUM < 110000 newparam.disconnectinfo.cause = ast->hangupcause; +#else + newparam.disconnectinfo.cause = ast_channel_hangupcause(ast); +#endif newparam.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; send_message(MESSAGE_DISCONNECT, call->ref, &newparam); /* change state */ call->state = CHAN_LCR_STATE_OUT_DISCONNECT; } else { CDEBUG(call, ast, "Using Asterisk 'congestion' indication\n"); +#if ASTERISK_VERSION_NUM < 110000 ts = ast_get_indication_tone(ast->zone, "congestion"); +#else + ts = ast_get_indication_tone(ast_channel_zone(ast), "congestion"); +#endif } break; case AST_CONTROL_PROCEEDING: @@ -2734,18 +2952,19 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz call->state = CHAN_LCR_STATE_IN_ALERTING; } else { CDEBUG(call, ast, "Using Asterisk 'ring' indication\n"); +#if ASTERISK_VERSION_NUM < 110000 ts = ast_get_indication_tone(ast->zone, "ring"); +#else + ts = ast_get_indication_tone(ast_channel_zone(ast), "ring"); +#endif } break; 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"); @@ -2766,7 +2985,11 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz /*start music onhold*/ #ifdef LCR_FOR_ASTERISK + #if ASTERISK_VERSION_NUM <110000 ast_moh_start(ast,data,ast->musicclass); + #else + ast_moh_start(ast,data,ast_channel_musicclass(ast)); + #endif #endif #ifdef LCR_FOR_CALLWEAVER @@ -2820,7 +3043,11 @@ static int lcr_fixup(struct ast_channel *oldast, struct ast_channel *ast) } ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif if (!call) { CERROR(NULL, ast, "Received fixup from Asterisk, but no call instance exists.\n"); ast_mutex_unlock(&chan_lock); @@ -2842,7 +3069,11 @@ static int lcr_send_text(struct ast_channel *ast, const char *text) union parameter newparam; ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call = ast->tech_pvt; +#else + call = ast_channel_tech_pvt(ast); +#endif if (!call) { CERROR(NULL, ast, "Received send_text from Asterisk, but no call instance exists.\n"); ast_mutex_unlock(&chan_lock); @@ -2879,8 +3110,13 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1, /* join via dsp (if the channels are currently open) */ ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call1 = ast1->tech_pvt; call2 = ast2->tech_pvt; +#else + call1 = ast_channel_tech_pvt(ast1); + call2 = ast_channel_tech_pvt(ast2); +#endif if (!call1 || !call2) { CDEBUG(NULL, NULL, "Bridge, but we don't have two call instances, exitting.\n"); ast_mutex_unlock(&chan_lock); @@ -2890,24 +3126,24 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *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); +#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 - 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; @@ -2994,19 +3230,20 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1, /* split channels */ ast_mutex_lock(&chan_lock); +#if ASTERISK_VERSION_NUM < 110000 call1 = ast1->tech_pvt; call2 = ast2->tech_pvt; +#else + call1 = ast_channel_tech_pvt(ast1); + call2 = ast_channel_tech_pvt(ast2); +#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; } @@ -3017,9 +3254,11 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1, return AST_BRIDGE_COMPLETE; } static struct ast_channel_tech lcr_tech = { - .type="LCR", + .type= lcr_type, .description = "Channel driver for connecting to Linux-Call-Router", + #if ASTERISK_VERSION_NUM < 100000 .capabilities = AST_FORMAT_ALAW, + #endif .requester = lcr_request, #ifdef LCR_FOR_ASTERISK @@ -3175,6 +3414,14 @@ static int lcr_config_exec(struct ast_channel *ast, void *data, char **argv) 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"); @@ -3211,24 +3458,18 @@ int load_module(void) 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 + #if ASTERISK_VERSION_NUM < 100000 + lcr_tech.capabilities = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW; + #else + struct ast_format tmp; + ast_format_set(&tmp ,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0); + if (!(lcr_tech.capabilities = ast_format_cap_alloc())) { return AST_MODULE_LOAD_DECLINE; - #endif - - #ifdef LCR_FOR_CALLWEAVER - return 0; - #endif } - mISDN_created = 1; - - lcr_tech.capabilities = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW; + ast_format_cap_add(lcr_tech.capabilities, &tmp); + #endif if (ast_channel_register(&lcr_tech)) { CERROR(NULL, NULL, "Unable to register channel class\n"); - bchannel_deinitialize(); close_socket(); #ifdef LCR_FOR_ASTERISK @@ -3256,18 +3497,21 @@ int load_module(void) " 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 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" +#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" " 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" @@ -3291,7 +3535,6 @@ int load_module(void) if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0)) { /* failed to create thread */ - bchannel_deinitialize(); close_socket(); ast_channel_unregister(&lcr_tech); @@ -3328,16 +3571,14 @@ int unload_module(void) ast_unregister_application("lcr_config"); - if (mISDN_created) { - bchannel_deinitialize(); - mISDN_created = 0; - } - if (lcr_sock >= 0) { close(lcr_sock); lcr_sock = -1; } +#if ASTERISK_VERSION_NUM >= 100000 + lcr_tech.capabilities = ast_format_cap_destroy(lcr_tech.capabilities); +#endif return 0; }