X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=a2951ae2c384a7e3c603be4d1bfaf4b72e074b15;hp=e8e2e7e6e132f51e951f3a237a4eddc356c8152d;hb=14da759465d6597908f27a31ec14eda3d5a47520;hpb=9464c059e6059a4215f772882da1cdf72a183ce5 diff --git a/chan_lcr.c b/chan_lcr.c index e8e2e7e..a2951ae 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -161,8 +161,9 @@ 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" @@ -693,8 +694,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; @@ -780,9 +786,13 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c #if ASTERISK_VERSION_NUM < 110000 char *exten = ast->exten; #else - char *exten = ast_channel_exten(ast); + char s_exten[AST_MAX_EXTENSION]; + char *exten=s_exten; + + strncpy(exten, ast_channel_exten(ast), AST_MAX_EXTENSION-1); #endif - if (!*exten) + +if (!*exten) exten = "s"; #if ASTERISK_VERSION_NUM < 110000 @@ -840,9 +850,9 @@ CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at /* if match, start pbx */ #if ASTERISK_VERSION_NUM < 110000 - if (ast_exists_extension(ast, ast->context, exten, 1, call->oad)) { + 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)) { + if (ast_exists_extension(ast, ast_channel_context(ast), exten, 1, call->oad)) { #endif CDEBUG(call, ast, "Extensions matches.\n"); goto start; @@ -871,7 +881,11 @@ CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at 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 @@ -901,7 +915,14 @@ CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at static void lcr_in_setup(struct chan_call *call, int message_type, union parameter *param) { struct ast_channel *ast; - + struct ast_party_redirecting *ast_redir; + struct ast_party_caller *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 */ @@ -918,6 +939,14 @@ 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; +#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"); @@ -928,9 +957,15 @@ 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; 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) @@ -941,142 +976,148 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet 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); + ast_channel_exten_set(ast, param->setup.dialinginfo.id); if (param->setup.context[0]) - strncpy(ast_channel_context(ast), param->setup.context, AST_MAX_CONTEXT-1); + ast_channel_context_set(ast, param->setup.context); else - strncpy(ast_channel_context(ast), param->setup.callerinfo.interface, AST_MAX_CONTEXT-1); + 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)); @@ -1113,7 +1154,11 @@ 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; @@ -1125,14 +1170,27 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet 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; @@ -1259,7 +1317,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; @@ -1293,7 +1355,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; @@ -2015,7 +2081,7 @@ static #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) +struct ast_channel *lcr_request(const char *type, struct ast_format_cap *format, struct ast_channel *requestor, void *data, int *cause) #endif #else struct ast_channel *lcr_request(const char *type, int format, void *data, int *cause) @@ -2024,6 +2090,8 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c char exten[256], *dial, *interface, *opt; struct ast_channel *ast; struct chan_call *call; + struct ast_party_redirecting *req_redir; + struct ast_party_caller *req_caller; ast_mutex_lock(&chan_lock); CDEBUG(NULL, NULL, "Received request from Asterisk. (data=%s)\n", (char *)data); @@ -2064,27 +2132,60 @@ 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 + req_redir = &requestor->redirecting; + req_caller = &requestor->caller; +#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; @@ -2118,49 +2219,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]) @@ -2175,32 +2276,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 && 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; @@ -2211,7 +2312,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; @@ -2224,7 +2325,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; @@ -2241,10 +2342,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 && 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; @@ -2255,7 +2356,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; @@ -2268,7 +2369,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; @@ -2285,17 +2386,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 && 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 && 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; @@ -2306,7 +2407,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; @@ -2319,7 +2420,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; @@ -2346,9 +2447,16 @@ 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"; @@ -2373,16 +2481,30 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout) 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; @@ -2461,7 +2583,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); @@ -2504,7 +2630,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, @@ -2536,7 +2666,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); @@ -2579,7 +2713,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)) { @@ -2594,13 +2732,23 @@ 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); +#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 */ @@ -2643,12 +2791,24 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr) #endif #ifdef AST_1_8_OR_HIGHER #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, "Unexpected format. " @@ -2663,12 +2823,21 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *fr) #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) { @@ -2692,7 +2861,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; @@ -2735,13 +2908,25 @@ static struct ast_frame *lcr_read(struct ast_channel *ast) call->read_fr.frametype = AST_FRAME_VOICE; #ifdef AST_1_8_OR_HIGHER #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; @@ -2766,7 +2951,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); @@ -2787,22 +2976,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: @@ -2829,7 +3034,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: @@ -2919,7 +3128,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); @@ -2941,7 +3154,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); @@ -2978,8 +3195,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); @@ -3093,8 +3315,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)