#include <asterisk/app.h>
#include <asterisk/features.h>
#include <asterisk/sched.h>
-
+#if ASTERISK_VERSION_NUM < 110000
+#include <asterisk/version.h>
+#endif
#include "extension.h"
#include "message.h"
#include "callerid.h"
int wake_pipe[2];
struct lcr_fd wake_fd;
-int quit;
-
int glob_channel = 0;
int lcr_sock = -1;
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);
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)
#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;
#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;
{
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;
}
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));
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;
}
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;
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
#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);
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 */
#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");
}
/* 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);
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));
}
#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;
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);
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;
}
/* 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;
/* 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;
}
/* 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);
/* 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);
call = find_call_ref(0);
if (!call) {
/* send release, if ref does not exist */
- CDEBUG(NULL, NULL, "No call found, that requests a ref.\n");
- send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
+ CERROR(NULL, NULL, "No call found, that requests a ref.\n");
return 0;
}
/* store new ref */
{
struct admin_list *admin, *temp;
+ /* socket not created */
+ if (lcr_sock < 0)
+ return;
+
unregister_fd(&socket_fd);
/* flush pending messages */
admin_first = NULL;
/* close socket */
- if (lcr_sock >= 0)
- close(lcr_sock);
+ close(lcr_sock);
lcr_sock = -1;
global_change = 1;
}
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;
}
*/
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, 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;
+ 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);
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;
// 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])
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;
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;
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;
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;
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;
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;
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;
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;
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;
{
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) {
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;
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
}
}
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);
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,
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);
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)) {
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 */
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) {
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;
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;
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);
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:
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:
/*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
}
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);
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);
/* 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);
/* 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)
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
}
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();
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();
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;
lcr_sock = -1;
}
+#if ASTERISK_VERSION_NUM >= 100000
+ lcr_tech.capabilities = ast_format_cap_destroy(lcr_tech.capabilities);
+#endif
return 0;
}
projects / lcr.git / blobdiff