X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=3cf892cb735506a9d4bb8eab456565674c9a5f20;hp=13aa680558019e00e5aba5f1e014c84adc91bfdc;hb=7b11cdb684c2328698149a27022415a25ea3d3e4;hpb=b8ba879d97268aeaa9e5c8838d27d38da731d971 diff --git a/chan_lcr.c b/chan_lcr.c index 13aa680..3cf892c 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" @@ -208,8 +209,6 @@ int wake_global = 0; int wake_pipe[2]; struct lcr_fd wake_fd; -int quit; - int glob_channel = 0; int lcr_sock = -1; @@ -243,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); @@ -362,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) @@ -535,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; @@ -765,21 +777,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; } @@ -794,7 +824,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)); @@ -805,7 +839,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; } @@ -815,7 +853,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; @@ -841,7 +883,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); @@ -892,12 +934,19 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet /* 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 @@ -1071,9 +1120,17 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet 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 + 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); +#endif ast->priority = 1; ast->hangupcause = 0; @@ -1154,7 +1211,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); @@ -1267,7 +1324,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; } @@ -1307,7 +1368,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); @@ -1350,7 +1411,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); @@ -1935,23 +1996,11 @@ static void *chan_thread(void *arg) ast_mutex_lock(&chan_lock); - while(!quit) { + while(1) { handle_queue(); select_main(0, &global_change, lock_chan, unlock_chan); } - close_socket(); - - del_timer(&socket_retry); - - unregister_fd(&wake_fd); - close(wake_pipe[0]); - close(wake_pipe[1]); - - CERROR(NULL, NULL, "Thread exit.\n"); - - ast_mutex_unlock(&chan_lock); - return NULL; } @@ -1960,8 +2009,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 { @@ -2011,9 +2064,17 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c ast->tech = &lcr_tech; ast->tech_pvt = (void *)1L; // set pointer or asterisk will not call /* 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 + 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); +#endif ast->priority = 1; ast->hangupcause = 0; @@ -2133,7 +2194,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) { @@ -2177,7 +2238,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) { @@ -2221,13 +2282,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); @@ -2288,7 +2349,7 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout) #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) { @@ -2369,9 +2430,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 } } @@ -2567,30 +2630,40 @@ 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 (!(f->subclass.codec & ast->nativeformats)) { +#else + if (!ast_format_cap_iscompatible(ast->nativeformats, &f->subclass.format)) { +#endif #else if (!(f->subclass & ast->nativeformats)) { #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 f = (ast->writetrans) ? ast_translate( ast->writetrans, fr, 0) : fr; } - + ast_mutex_lock(&chan_lock); call = ast->tech_pvt; if (!call) { @@ -2658,7 +2731,12 @@ 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 + call->read_fr.subclass.codec = ast->nativeformats; +#else + ast_best_codec(ast->nativeformats, &call->read_fr.subclass.format); + call->read_fr.subclass.integer = call->read_fr.subclass.format.id; +#endif #else call->read_fr.subclass = ast->nativeformats; #endif @@ -2780,7 +2858,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 @@ -3031,9 +3113,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 @@ -3239,7 +3323,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(); @@ -3303,7 +3396,6 @@ int load_module(void) ast_cli_register(&cli_port_unload); #endif - quit = 0; if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0)) { /* failed to create thread */ bchannel_deinitialize(); @@ -3325,16 +3417,24 @@ int load_module(void) int unload_module(void) { /* First, take us out of the channel loop */ - CDEBUG(NULL, NULL, "-- Unregistering mISDN Channel Driver --\n"); + CDEBUG(NULL, NULL, "-- Unregistering Linux-Call-Router Channel Driver --\n"); + + pthread_cancel(chan_tid); - quit = 1; - pthread_join(chan_tid, NULL); + close_socket(); + + del_timer(&socket_retry); + + unregister_fd(&wake_fd); + close(wake_pipe[0]); + close(wake_pipe[1]); + +// ast_mutex_unlock(&chan_lock); ast_channel_unregister(&lcr_tech); ast_unregister_application("lcr_config"); - if (mISDN_created) { bchannel_deinitialize(); mISDN_created = 0; @@ -3345,6 +3445,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; }