X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=df5b4fc6343bae4c53114b50d6a30894ccbd882d;hp=3904c9ac16016dee16565b36460a8bcf76f02b8b;hb=b3d8622de3b364b2a6b5b6cf1f8d32364d37672b;hpb=da91d7d85fe092122e35ece52695f98345738359 diff --git a/chan_lcr.c b/chan_lcr.c index 3904c9a..df5b4fc 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -161,6 +161,7 @@ it is called from ast_channel process which has already locked ast_channel. #include #include #include +#include #include "extension.h" #include "message.h" @@ -241,7 +242,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); @@ -360,7 +365,7 @@ 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]); + CDEBUG(NULL, NULL, "Sending %s to socket. (ref=%d)\n", messages_txt[message_type], ref); adminp = &admin_first; while(*adminp) @@ -533,13 +538,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; @@ -679,8 +693,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; @@ -763,21 +782,39 @@ 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; +#else + char *exten = ast_channel_exten(ast); +#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 +829,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,7 +844,11 @@ 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 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; } @@ -813,7 +858,11 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c return; } +#if ASTERISK_VERSION_NUM < 110000 if (!*ast->exten) { +#else + if (!*ast_channel_exten(ast)) { +#endif /* 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; @@ -827,7 +876,11 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c send_release_and_import(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 +892,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); @@ -884,18 +937,30 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet } /* link together */ call->ast = ast; +#if ASTERISK_VERSION_NUM < 110000 ast->tech_pvt = call; ast->tech = &lcr_tech; +#else + ast_channel_tech_pvt_set(ast, call); + ast_channel_tech_set(ast, &lcr_tech); +#endif ast->fds[0] = call->pipe[0]; /* 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); else strncpy(ast->context, param->setup.callerinfo.interface, AST_MAX_CONTEXT-1); - +#else + strncpy(ast_channel_exten(ast), param->setup.dialinginfo.id, AST_MAX_EXTENSION-1); + if (param->setup.context[0]) + strncpy(ast_channel_context(ast), param->setup.context, AST_MAX_CONTEXT-1); + else + strncpy(ast_channel_context(ast), param->setup.callerinfo.interface, AST_MAX_CONTEXT-1); +#endif #ifdef AST_1_8_OR_HIGHER @@ -1062,18 +1127,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; @@ -1152,7 +1242,7 @@ static void lcr_in_connect(struct chan_call *call, int message_type, union param call->state = CHAN_LCR_STATE_CONNECT; /* request bchannel */ if (!call->bchannel) { - CDEBUG(call, call->ast, "Requesting B-channel.\n"); + 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); @@ -1200,7 +1290,11 @@ static void lcr_in_disconnect(struct chan_call *call, int message_type, union pa 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; @@ -1234,7 +1328,11 @@ 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; @@ -1265,7 +1363,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; } @@ -1305,7 +1407,7 @@ static void lcr_in_notify(struct chan_call *call, int message_type, union parame /* 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"); + 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); @@ -1348,7 +1450,7 @@ static void lcr_in_pattern(struct chan_call *call, int message_type, union param /* request bchannel */ if (!call->bchannel) { - CDEBUG(call, call->ast, "Requesting B-channel.\n"); + 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); @@ -1778,6 +1880,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 +1896,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; } @@ -1946,8 +2051,12 @@ 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 { @@ -1994,18 +2103,54 @@ 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 +#else + ast_channel_tech_set(ast, &lcr_tech); + ast_channel_tech_pvt_set(ast, (void *)1L); // set pointer or asterisk will not call +#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; +#else + ast_channel_tech_pvt_set(ast, call); +#endif ast->fds[0] = call->pipe[0]; call->pbx_started = 0; /* set state */ @@ -2119,7 +2264,7 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c /* store call information for setup */ /* caller ID */ - if (requestor->caller.id.number.valid) { + if (requestor && 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) { @@ -2163,7 +2308,7 @@ 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 && 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) { @@ -2207,13 +2352,13 @@ 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 && 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); } /* redir number */ - if (requestor->redirecting.from.number.valid) { + if (requestor && requestor->redirecting.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); @@ -2268,13 +2413,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) { @@ -2294,17 +2446,33 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout) newparam.newref.mode = 1; send_message(MESSAGE_NEWREF, 0, &newparam); +#ifdef AVN11 + transfercapability=ast_channel_transfercapability(ast); +#endif /* 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 + 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 +2523,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 +2551,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 +2598,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 +2634,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); @@ -2499,7 +2681,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,13 +2700,22 @@ 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; +#else + ast_channel_tech_pvt_set(ast, NULL); +#endif ast->fds[0] = -1; 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); +#else + if (ast_channel_hangupcause(ast) > 0) + send_release_and_import(call, ast_channel_hangupcause(ast), LOCATION_PRIVATE_LOCAL); +#endif else send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL); /* remove call */ @@ -2553,32 +2748,63 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr) struct chan_call *call; struct ast_frame * f = fr; +#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 #endif - CDEBUG(NULL, ast, + 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) { @@ -2602,7 +2828,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 +2874,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; @@ -2671,7 +2918,11 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz const struct 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 +2943,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,7 +3001,11 @@ 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: @@ -2766,7 +3037,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 +3095,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 +3121,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 +3162,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); @@ -2994,8 +3282,13 @@ 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) @@ -3017,9 +3310,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 @@ -3225,7 +3520,16 @@ int load_module(void) } mISDN_created = 1; + #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; + } + 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(); @@ -3338,6 +3642,9 @@ int unload_module(void) lcr_sock = -1; } +#if ASTERISK_VERSION_NUM >= 100000 + lcr_tech.capabilities = ast_format_cap_destroy(lcr_tech.capabilities); +#endif return 0; }