#ifdef LCR_FOR_ASTERISK
#include <asterisk/buildopts.h>
#endif
+
+/*
+ * Fwd declare struct ast_channel to get rid of gcc warning about
+ * incompatible pointer type passed to ast_register_application2.
+ */
+struct ast_channel;
+
#include <asterisk/module.h>
#include <asterisk/channel.h>
#include <asterisk/config.h>
#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"
#include "lcrsocket.h"
#include "cause.h"
#include "select.h"
-#include "bchannel.h"
#include "options.h"
#include "chan_lcr.h"
#endif
int lcr_debug=1;
-int mISDN_created=1;
char lcr_type[]="lcr";
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);
close(call->pipe[0]);
if (call->pipe[1] > -1)
close(call->pipe[1]);
- if (call->bchannel) {
- if (call->bchannel->call != call)
- CERROR(call, NULL, "Linked bchannel structure has no link to us.\n");
- call->bchannel->call = NULL;
- }
if (call->bridge_call) {
if (call->bridge_call->bridge_call != call)
CERROR(call, NULL, "Linked call structure has no link to us.\n");
CDEBUG(NULL, NULL, "Ignoring message %d, because socket is closed.\n", message_type);
return -1;
}
- CDEBUG(NULL, NULL, "Sending %s to socket. (ref=%d)\n", messages_txt[message_type], ref);
+ if (message_type != MESSAGE_TRAFFIC)
+ CDEBUG(NULL, NULL, "Sending %s to socket. (ref=%d)\n", messages_txt[message_type], ref);
adminp = &admin_first;
while(*adminp)
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
return 0;
void apply_opt(struct chan_call *call, char *data)
{
union parameter newparam;
- char string[1024], *p = string, *opt, *key;
- int gain, i;
+ char string[1024], *p = string, *opt;//, *key;
+// int gain, i;
if (!data[0])
return; // no opts
break;
}
CDEBUG(call, call->ast, "Option 'n' (no DTMF).\n");
- if (call->dsp_dtmf) {
- call->dsp_dtmf = 0;
- if (call->bchannel)
- bchannel_dtmf(call->bchannel, 0);
- }
+ call->dsp_dtmf = 0;
break;
+#if 0
case 'c':
if (opt[1] == '\0') {
CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter.\n", opt);
if (call->bchannel)
bchannel_blowfish(call->bchannel, call->bf_key, call->bf_len);
break;
+#endif
case 'h':
if (opt[1] != '\0') {
CERROR(call, call->ast, "Option 'h' (HDLC) expects no parameter.\n", opt);
if (!call->hdlc)
call->hdlc = 1;
break;
- case 't':
- if (opt[1] != '\0') {
- CERROR(call, call->ast, "Option 't' (no_dsp) expects no parameter.\n", opt);
- break;
- }
- CDEBUG(call, call->ast, "Option 't' (no dsp).\n");
- if (!call->nodsp)
- call->nodsp = 1;
- break;
case 'q':
if (opt[1] == '\0') {
CERROR(call, call->ast, "Option 'q' (queue) expects parameter.\n", opt);
break;
}
CDEBUG(call, call->ast, "Option 'q' (queue).\n");
- call->nodsp_queue = atoi(opt+1);
+ call->tx_queue = atoi(opt+1);
break;
+#if 0
case 'e':
if (opt[1] == '\0') {
CERROR(call, call->ast, "Option 'e' (echo cancel) expects parameter.\n", opt);
if (call->bchannel)
bchannel_pipeline(call->bchannel, call->pipeline);
break;
+#endif
case 'f':
if (opt[1] == '\0') {
CERROR(call, call->ast, "Option 'f' (faxdetect) expects parameter.\n", opt);
CDEBUG(call, call->ast, "Option 's' (inband DTMF).\n");
call->inband_dtmf = 1;
break;
+#if 0
case 'v':
if (opt[1] != 'r' && opt[1] != 't') {
CERROR(call, call->ast, "Option 'v' (volume) expects parameter.\n", opt);
bchannel_gain(call->bchannel, call->tx_gain, 1);
}
break;
+#endif
case 'k':
if (opt[1] != '\0') {
CERROR(call, call->ast, "Option 'k' (keypad) expects no parameter.\n", opt);
CERROR(call, call->ast, "Option '%s' unknown.\n", opt);
}
}
-
- /* re-open, if bchannel is created */
- if (call->bchannel && call->bchannel->b_sock > -1) {
- bchannel_destroy(call->bchannel);
- if (bchannel_create(call->bchannel, ((call->nodsp || call->faxdetect > 0)?1:0) + ((call->hdlc)?2:0), call->nodsp_queue))
- bchannel_activate(call->bchannel, 1);
- }
}
/*
#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;
newparam.setup.capainfo.hlc = INFO_HLC_NONE;
newparam.setup.capainfo.exthlc = INFO_HLC_NONE;
send_message(MESSAGE_SETUP, call->ref, &newparam);
+ if (call->tx_queue) {
+ memset(&newparam, 0, sizeof(union parameter));
+ newparam.queue = call->tx_queue * 8;
+ send_message(MESSAGE_DISABLE_DEJITTER, call->ref, &newparam);
+ }
/* change to outgoing setup state */
call->state = CHAN_LCR_STATE_OUT_SETUP;
}
/*
- * send release message to LCR and import bchannel if exported
+ * send release message to LCR
*/
-static void send_release_and_import(struct chan_call *call, int cause, int location)
+static void send_release(struct chan_call *call, int cause, int location)
{
union parameter newparam;
- /* importing channel */
- if (call->bchannel) {
- memset(&newparam, 0, sizeof(union parameter));
- newparam.bchannel.type = BCHANNEL_RELEASE;
- newparam.bchannel.handle = call->bchannel->handle;
- send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
- }
/* sending release */
memset(&newparam, 0, sizeof(union parameter));
newparam.disconnectinfo.cause = cause;
{
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;
}
+ /* send setup acknowledge to lcr */
+ if (call->state != CHAN_LCR_STATE_IN_DIALING) {
+ memset(&newparam, 0, sizeof(union parameter));
+ send_message(MESSAGE_OVERLAP, call->ref, &newparam);
+ }
+
+ /* change state */
+ call->state = CHAN_LCR_STATE_IN_DIALING;
+
/* if can match */
CDEBUG(call, ast, "Extensions may match, if more digits are dialed.\n");
return;
}
+#if ASTERISK_VERSION_NUM < 110000
if (!*ast->exten) {
+#else
+ if (!*ast_channel_exten(ast)) {
+#endif
+ /* send setup acknowledge to lcr */
+ if (call->state != CHAN_LCR_STATE_IN_DIALING) {
+ memset(&newparam, 0, sizeof(union parameter));
+ send_message(MESSAGE_OVERLAP, call->ref, &newparam);
+ }
+
+ /* change state */
+ call->state = CHAN_LCR_STATE_IN_DIALING;
+
/* if can match */
CDEBUG(call, ast, "There is no 's' extension (and we tried to match it implicitly). Extensions may match, if more digits are dialed.\n");
return;
release:
/* release lcr */
CDEBUG(call, ast, "Releasing due to extension missmatch.\n");
- send_release_and_import(call, cause, LOCATION_PRIVATE_LOCAL);
+ send_release(call, cause, LOCATION_PRIVATE_LOCAL);
call->ref = 0;
/* release asterisk */
+#if ASTERISK_VERSION_NUM < 110000
ast->hangupcause = call->cause;
+#else
+ ast_channel_hangupcause_set(ast, call->cause);
+#endif
/* change to release state */
call->state = CHAN_LCR_STATE_RELEASE;
ast_hangup(ast); // call will be destroyed here
static void lcr_in_setup(struct chan_call *call, int message_type, union parameter *param)
{
struct ast_channel *ast;
-
+#ifdef AST_1_8_OR_HIGHER
+ struct ast_party_redirecting *ast_redir;
+#endif
+// struct ast_party_caller *ast_caller;
+ struct ast_callerid *ast_caller;
+#if ASTERISK_VERSION_NUM >= 110000
+ struct ast_party_redirecting s_ast_redir;
+ struct ast_party_caller s_ast_caller;
+ ast_party_redirecting_init(&s_ast_redir);
+ ast_party_caller_init(&s_ast_caller);
+#endif
CDEBUG(call, NULL, "Incomming setup from LCR. (callerid %s, dialing %s)\n", param->setup.callerinfo.id, param->setup.dialinginfo.id);
/* create asterisk channel instrance */
#endif
#endif
+#if ASTERISK_VERSION_NUM < 110000
+// ast_redir = &ast->redirecting;
+// ast_caller = &ast->caller;
+ ast_caller = &ast->cid;
+#else
+ ast_redir = &s_ast_redir;
+ ast_caller = &s_ast_caller;
+#endif
+
if (!ast) {
/* release */
CERROR(call, NULL, "Failed to create Asterisk channel - releasing.\n");
- send_release_and_import(call, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL);
+ send_release(call, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL);
/* remove call */
free_call(call);
return;
}
/* link together */
call->ast = ast;
+#if ASTERISK_VERSION_NUM < 110000
ast->tech_pvt = call;
ast->tech = &lcr_tech;
ast->fds[0] = call->pipe[0];
+#else
+ ast_channel_tech_pvt_set(ast, call);
+ ast_channel_tech_set(ast, &lcr_tech);
+ ast_channel_set_fd(ast, 0, call->pipe[0]);
+#endif
/* fill setup information */
if (param->setup.dialinginfo.id)
+#if ASTERISK_VERSION_NUM < 110000
strncpy(ast->exten, param->setup.dialinginfo.id, AST_MAX_EXTENSION-1);
- if (param->setup.context[0])
- strncpy(ast->context, param->setup.context, AST_MAX_CONTEXT-1);
+ if (param->setup.dialinginfo.context[0])
+ strncpy(ast->context, param->setup.dialinginfo.context, AST_MAX_CONTEXT-1);
else
strncpy(ast->context, param->setup.callerinfo.interface, AST_MAX_CONTEXT-1);
-
+#else
+ ast_channel_exten_set(ast, param->setup.dialinginfo.id);
+ if (param->setup.context[0])
+ ast_channel_context_set(ast, param->setup.context);
+ else
+ ast_channel_context_set(ast, param->setup.callerinfo.interface);
+#endif
#ifdef AST_1_8_OR_HIGHER
if (param->setup.callerinfo.id[0]) {
- ast->caller.id.number.valid = 1;
- ast->caller.id.number.str = strdup(param->setup.callerinfo.id);
+ ast_caller->id.number.valid = 1;
+ ast_caller->id.number.str = strdup(param->setup.callerinfo.id);
if (!param->setup.callerinfo.id[0]) {
- ast->caller.id.number.presentation = AST_PRES_RESTRICTED;
- ast->caller.id.number.plan = (0 << 4) | 1;
+ ast_caller->id.number.presentation = AST_PRES_RESTRICTED;
+ ast_caller->id.number.plan = (0 << 4) | 1;
}
switch (param->setup.callerinfo.present) {
case INFO_PRESENT_ALLOWED:
- ast->caller.id.number.presentation = AST_PRES_ALLOWED;
+ ast_caller->id.number.presentation = AST_PRES_ALLOWED;
break;
case INFO_PRESENT_RESTRICTED:
- ast->caller.id.number.presentation = AST_PRES_RESTRICTED;
+ ast_caller->id.number.presentation = AST_PRES_RESTRICTED;
break;
default:
- ast->caller.id.number.presentation = AST_PRES_UNAVAILABLE;
+ ast_caller->id.number.presentation = AST_PRES_UNAVAILABLE;
}
switch (param->setup.callerinfo.screen) {
case INFO_SCREEN_USER:
- ast->caller.id.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED;
+ ast_caller->id.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED;
break;
case INFO_SCREEN_USER_VERIFIED_PASSED:
- ast->caller.id.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN;
+ ast_caller->id.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN;
break;
case INFO_SCREEN_USER_VERIFIED_FAILED:
- ast->caller.id.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN;
+ ast_caller->id.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN;
break;
default:
- ast->caller.id.number.presentation |= AST_PRES_NETWORK_NUMBER;
+ ast_caller->id.number.presentation |= AST_PRES_NETWORK_NUMBER;
}
switch (param->setup.callerinfo.ntype) {
case INFO_NTYPE_SUBSCRIBER:
- ast->caller.id.number.plan = (4 << 4) | 1;
+ ast_caller->id.number.plan = (4 << 4) | 1;
break;
case INFO_NTYPE_NATIONAL:
- ast->caller.id.number.plan = (2 << 4) | 1;
+ ast_caller->id.number.plan = (2 << 4) | 1;
break;
case INFO_NTYPE_INTERNATIONAL:
- ast->caller.id.number.plan = (1 << 4) | 1;
+ ast_caller->id.number.plan = (1 << 4) | 1;
break;
default:
- ast->caller.id.number.plan = (0 << 4) | 1;
+ ast_caller->id.number.plan = (0 << 4) | 1;
}
}
if (param->setup.callerinfo.id2[0]) {
- ast->caller.ani.number.valid = 1;
- ast->caller.ani.number.str = strdup(param->setup.callerinfo.id2);
+ ast_caller->ani.number.valid = 1;
+ ast_caller->ani.number.str = strdup(param->setup.callerinfo.id2);
switch (param->setup.callerinfo.present2) {
case INFO_PRESENT_ALLOWED:
- ast->caller.ani.number.presentation = AST_PRES_ALLOWED;
+ ast_caller->ani.number.presentation = AST_PRES_ALLOWED;
break;
case INFO_PRESENT_RESTRICTED:
- ast->caller.ani.number.presentation = AST_PRES_RESTRICTED;
+ ast_caller->ani.number.presentation = AST_PRES_RESTRICTED;
break;
default:
- ast->caller.ani.number.presentation = AST_PRES_UNAVAILABLE;
+ ast_caller->ani.number.presentation = AST_PRES_UNAVAILABLE;
}
switch (param->setup.callerinfo.screen2) {
case INFO_SCREEN_USER:
- ast->caller.ani.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED;
+ ast_caller->ani.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED;
break;
case INFO_SCREEN_USER_VERIFIED_PASSED:
- ast->caller.ani.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN;
+ ast_caller->ani.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN;
break;
case INFO_SCREEN_USER_VERIFIED_FAILED:
- ast->caller.ani.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN;
+ ast_caller->ani.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN;
break;
default:
- ast->caller.ani.number.presentation |= AST_PRES_NETWORK_NUMBER;
+ ast_caller->ani.number.presentation |= AST_PRES_NETWORK_NUMBER;
}
switch (param->setup.callerinfo.ntype2) {
case INFO_NTYPE_SUBSCRIBER:
- ast->caller.ani.number.plan = (4 << 4) | 1;
+ ast_caller->ani.number.plan = (4 << 4) | 1;
break;
case INFO_NTYPE_NATIONAL:
- ast->caller.ani.number.plan = (2 << 4) | 1;
+ ast_caller->ani.number.plan = (2 << 4) | 1;
break;
case INFO_NTYPE_INTERNATIONAL:
- ast->caller.ani.number.plan = (1 << 4) | 1;
+ ast_caller->ani.number.plan = (1 << 4) | 1;
break;
default:
- ast->caller.ani.number.plan = (0 << 4) | 1;
+ ast_caller->ani.number.plan = (0 << 4) | 1;
}
}
if (param->setup.callerinfo.name[0]) {
- ast->caller.id.name.valid = 1;
- ast->caller.id.name.str = strdup(param->setup.callerinfo.name);
+ ast_caller->id.name.valid = 1;
+ ast_caller->id.name.str = strdup(param->setup.callerinfo.name);
}
+#if ASTERISK_VERSION_NUM >= 110000
+ ast_channel_caller_set(ast, ast_caller);
+#endif
if (param->setup.redirinfo.id[0]) {
- ast->redirecting.from.number.valid = 1;
- ast->redirecting.from.number.str = strdup(param->setup.redirinfo.id);
+ ast_redir->from.number.valid = 1;
+ ast_redir->from.number.str = strdup(param->setup.redirinfo.id);
switch (param->setup.redirinfo.present) {
case INFO_PRESENT_ALLOWED:
- ast->redirecting.from.number.presentation = AST_PRES_ALLOWED;
+ ast_redir->from.number.presentation = AST_PRES_ALLOWED;
break;
case INFO_PRESENT_RESTRICTED:
- ast->redirecting.from.number.presentation = AST_PRES_RESTRICTED;
+ ast_redir->from.number.presentation = AST_PRES_RESTRICTED;
break;
default:
- ast->redirecting.from.number.presentation = AST_PRES_UNAVAILABLE;
+ ast_redir->from.number.presentation = AST_PRES_UNAVAILABLE;
}
switch (param->setup.redirinfo.screen) {
case INFO_SCREEN_USER:
- ast->redirecting.from.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED;
+ ast_redir->from.number.presentation |= AST_PRES_USER_NUMBER_UNSCREENED;
break;
case INFO_SCREEN_USER_VERIFIED_PASSED:
- ast->redirecting.from.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN;
+ ast_redir->from.number.presentation |= AST_PRES_USER_NUMBER_PASSED_SCREEN;
break;
case INFO_SCREEN_USER_VERIFIED_FAILED:
- ast->redirecting.from.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN;
+ ast_redir->from.number.presentation |= AST_PRES_USER_NUMBER_FAILED_SCREEN;
break;
default:
- ast->redirecting.from.number.presentation |= AST_PRES_NETWORK_NUMBER;
+ ast_redir->from.number.presentation |= AST_PRES_NETWORK_NUMBER;
}
switch (param->setup.redirinfo.ntype) {
case INFO_NTYPE_SUBSCRIBER:
- ast->redirecting.from.number.plan = (4 << 4) | 1;
+ ast_redir->from.number.plan = (4 << 4) | 1;
break;
case INFO_NTYPE_NATIONAL:
- ast->redirecting.from.number.plan = (2 << 4) | 1;
+ ast_redir->from.number.plan = (2 << 4) | 1;
break;
case INFO_NTYPE_INTERNATIONAL:
- ast->redirecting.from.number.plan = (1 << 4) | 1;
+ ast_redir->from.number.plan = (1 << 4) | 1;
break;
default:
- ast->redirecting.from.number.plan = (0 << 4) | 1;
+ ast_redir->from.number.plan = (0 << 4) | 1;
}
+#if ASTERISK_VERSION_NUM >= 110000
+ ast_channel_redirecting_set(ast, ast_redir);
+#endif
}
#else
memset(&ast->cid, 0, sizeof(ast->cid));
}
#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;
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;
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, "P", sizeof(call->queue_string)-1);
}
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, "R", sizeof(call->queue_string)-1);
}
*/
static void lcr_in_connect(struct chan_call *call, int message_type, union parameter *param)
{
- union parameter newparam;
-
CDEBUG(call, call->ast, "Incomming connect (answer) from LCR.\n");
/* change state */
call->state = CHAN_LCR_STATE_CONNECT;
- /* request bchannel */
- if (!call->bchannel) {
- CDEBUG(call, call->ast, "Requesting B-channel. (ref=%d)\n", call->ref);
- memset(&newparam, 0, sizeof(union parameter));
- newparam.bchannel.type = BCHANNEL_REQUEST;
- send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
- }
/* copy connectinfo */
memcpy(&call->connectinfo, ¶m->connectinfo, sizeof(struct connect_info));
/* queue event to asterisk */
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, "N", sizeof(call->queue_string)-1);
}
}
#endif
/* release lcr with same cause */
- send_release_and_import(call, call->cause, call->location);
+ send_release(call, call->cause, call->location);
call->ref = 0;
/* change to release state */
call->state = CHAN_LCR_STATE_RELEASE;
/* queue release asterisk */
if (ast) {
+#if ASTERISK_VERSION_NUM < 110000
ast->hangupcause = call->cause;
+#else
+ ast_channel_hangupcause_set(ast, call->cause);
+#endif
if (call->pbx_started) {
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strcpy(call->queue_string, "H"); // overwrite other indications
} else {
}
/* if we have an asterisk instance, queue hangup, else we are done */
if (ast) {
+#if ASTERISK_VERSION_NUM < 110000
ast->hangupcause = call->cause;
+#else
+ ast_channel_hangupcause_set(ast, call->cause);
+#endif
if (call->pbx_started) {
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strcpy(call->queue_string, "H");
} else {
/* 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;
}
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, param->information.id, sizeof(call->queue_string)-1);
}
*/
static void lcr_in_notify(struct chan_call *call, int message_type, union parameter *param)
{
- union parameter newparam;
-
CDEBUG(call, call->ast, "Incomming notify from LCR. (notify=%d)\n", param->notifyinfo.notify);
- /* request bchannel, if call is resumed and we don't have it */
- if (param->notifyinfo.notify == INFO_NOTIFY_USER_RESUMED && !call->bchannel && call->ref) {
- CDEBUG(call, call->ast, "Reqesting bchannel at resume. (ref=%d)\n", call->ref);
- memset(&newparam, 0, sizeof(union parameter));
- newparam.bchannel.type = BCHANNEL_REQUEST;
- send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
- }
-
if (!call->ast) return;
/* use bridge to forware message not supported by asterisk */
call->has_pattern = 1;
/* request bchannel */
- if (!call->bchannel) {
- 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);
- }
+ CDEBUG(call, call->ast, "Requesting audio path (ref=%d)\n", call->ref);
+ memset(&newparam, 0, sizeof(union parameter));
+ send_message(MESSAGE_AUDIOPATH, call->ref, &newparam);
+
/* queue PROGRESS, because tones are available */
if (call->ast && call->pbx_started) {
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, "T", sizeof(call->queue_string)-1);
}
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strncat(call->queue_string, digit, sizeof(call->queue_string)-1);
}
*/
int receive_message(int message_type, unsigned int ref, union parameter *param)
{
- struct bchannel *bchannel;
struct chan_call *call;
union parameter newparam;
+ int rc = 0;
memset(&newparam, 0, sizeof(union parameter));
- /* handle bchannel message*/
- if (message_type == MESSAGE_BCHANNEL) {
- switch(param->bchannel.type) {
- case BCHANNEL_ASSIGN:
- CDEBUG(NULL, NULL, "Received BCHANNEL_ASSIGN message. (handle=%08lx) for ref %d\n", param->bchannel.handle, ref);
- if ((bchannel = find_bchannel_handle(param->bchannel.handle))) {
- CERROR(NULL, NULL, "bchannel handle %x already assigned.\n", (int)param->bchannel.handle);
- return -1;
- }
- /* create bchannel */
- bchannel = alloc_bchannel(param->bchannel.handle);
- if (!bchannel) {
- CERROR(NULL, NULL, "alloc bchannel handle %x failed.\n", (int)param->bchannel.handle);
- return -1;
- }
-
- /* configure channel */
- bchannel->b_tx_gain = param->bchannel.tx_gain;
- bchannel->b_rx_gain = param->bchannel.rx_gain;
- strncpy(bchannel->b_pipeline, param->bchannel.pipeline, sizeof(bchannel->b_pipeline)-1);
- if (param->bchannel.crypt_len && param->bchannel.crypt_len <= sizeof(bchannel->b_bf_key)) {
- bchannel->b_bf_len = param->bchannel.crypt_len;
- memcpy(bchannel->b_bf_key, param->bchannel.crypt, param->bchannel.crypt_len);
- }
- bchannel->b_txdata = 0;
- bchannel->b_tx_dejitter = 1;
-
- /* in case, ref is not set, this bchannel instance must
- * be created until it is removed again by LCR */
- /* link to call */
- call = find_call_ref(ref);
- if (call) {
- bchannel->call = call;
- call->bchannel = bchannel;
- if (call->dsp_dtmf)
- bchannel_dtmf(bchannel, 1);
- if (call->bf_len)
- bchannel_blowfish(bchannel, call->bf_key, call->bf_len);
- if (call->pipeline[0])
- bchannel_pipeline(bchannel, call->pipeline);
- if (call->rx_gain)
- bchannel_gain(bchannel, call->rx_gain, 0);
- if (call->tx_gain)
- bchannel_gain(bchannel, call->tx_gain, 1);
- if (call->bridge_id) {
- CDEBUG(call, call->ast, "Join bchannel, because call is already bridged.\n");
- bchannel_join(bchannel, call->bridge_id);
- }
- /* ignore all dsp features, if it is a loopback interface */
- if (param->bchannel.isloopback)
- call->nodsp = 1;
-
- /* create only, if call exists, othewhise it bchannel is freed below... */
- if (bchannel_create(bchannel, ((call->nodsp || call->faxdetect > 0)?1:0) + ((call->hdlc)?2:0), call->nodsp_queue))
- bchannel_activate(bchannel, 1);
- }
- /* acknowledge */
- newparam.bchannel.type = BCHANNEL_ASSIGN_ACK;
- newparam.bchannel.handle = param->bchannel.handle;
- send_message(MESSAGE_BCHANNEL, 0, &newparam);
- /* if call has released before bchannel is assigned */
- if (!call) {
- newparam.bchannel.type = BCHANNEL_RELEASE;
- newparam.bchannel.handle = param->bchannel.handle;
- send_message(MESSAGE_BCHANNEL, 0, &newparam);
- }
-
- break;
-
- case BCHANNEL_REMOVE:
- CDEBUG(NULL, NULL, "Received BCHANNEL_REMOVE message. (handle=%08lx)\n", param->bchannel.handle);
- if (!(bchannel = find_bchannel_handle(param->bchannel.handle))) {
- CERROR(NULL, NULL, "Bchannel handle %x not assigned.\n", (int)param->bchannel.handle);
- return -1;
- }
- /* unklink from call and destroy bchannel */
- free_bchannel(bchannel);
-
- /* acknowledge */
- newparam.bchannel.type = BCHANNEL_REMOVE_ACK;
- newparam.bchannel.handle = param->bchannel.handle;
- send_message(MESSAGE_BCHANNEL, 0, &newparam);
-
- break;
-
- default:
- CDEBUG(NULL, NULL, "Received unknown bchannel message %d.\n", param->bchannel.type);
- }
- return 0;
- }
-
/* handle new ref */
if (message_type == MESSAGE_NEWREF) {
if (param->newref.direction) {
else if (call->state == CHAN_LCR_STATE_RELEASE) {
/* send release */
if (call->cause)
- send_release_and_import(call, call->cause, call->location);
+ send_release(call, call->cause, call->location);
else
- send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
+ send_release(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
/* free call */
free_call(call);
return 0;
call->audiopath = param->audiopath;
break;
+ case MESSAGE_TRAFFIC: // if remote audio connected or hold
+ {
+ unsigned char *p = param->traffic.data;
+ int i, len = param->traffic.len;
+ for (i = 0; i < len; i++, p++)
+ *p = flip_bits[*p];
+ }
+ rc = write(call->pipe[1], param->traffic.data, param->traffic.len);
+ break;
+
default:
CDEBUG(call, call->ast, "Message %d from LCR unhandled.\n", message_type);
break;
}
- return 0;
+ return rc;
}
/*
if (!wake_global) {
wake_global = 1;
char byte = 0;
- write(wake_pipe[1], &byte, 1);
+ int rc;
+ rc = write(wake_pipe[1], &byte, 1);
}
strcpy(call->queue_string, "H");
call = call->next;
}
-
- /* release all bchannels */
- while(bchannel_first)
- free_bchannel(bchannel_first);
}
void close_socket(void);
{
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;
}
static int wake_event(struct lcr_fd *fd, unsigned int what, void *instance, int index)
{
char byte;
+ int rc;
- read(wake_pipe[0], &byte, 1);
+ rc = read(wake_pipe[0], &byte, 1);
wake_global = 0;
memset(&socket_retry, 0, sizeof(socket_retry));
add_timer(&socket_retry, handle_retry, NULL, 0);
- bchannel_pid = getpid();
-
/* open socket the first time */
handle_retry(NULL, NULL, 0);
char exten[256], *dial, *interface, *opt;
struct ast_channel *ast;
struct chan_call *call;
+#ifdef AST_1_8_OR_HIGHER
+ const struct ast_party_redirecting *req_redir;
+ const struct ast_party_caller *req_caller;
+#endif
ast_mutex_lock(&chan_lock);
CDEBUG(NULL, NULL, "Received request from Asterisk. (data=%s)\n", (char *)data);
ast_mutex_unlock(&chan_lock);
return NULL;
}
+#if ASTERISK_VERSION_NUM < 110000
ast->tech = &lcr_tech;
ast->tech_pvt = (void *)1L; // set pointer or asterisk will not call
+#ifdef AST_1_8_OR_HIGHER
+ req_redir = &requestor->redirecting;
+ req_caller = &requestor->caller;
+#endif
+#else
+ ast_channel_tech_set(ast, &lcr_tech);
+ ast_channel_tech_pvt_set(ast, (void *)1L); // set pointer or asterisk will not call
+ req_redir = ast_channel_redirecting(requestor);
+ req_caller = ast_channel_caller(requestor);
+#endif
/* configure channel */
#if ASTERISK_VERSION_NUM < 100000
+#if ASTERISK_VERSION_NUM < 110000
ast->nativeformats = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
ast->readformat = ast->rawreadformat = ast->nativeformats;
ast->writeformat = ast->rawwriteformat = ast->nativeformats;
#else
+ ast_channel_nativeformats_set(ast, (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW);
+ ast->readformat = ast->rawreadformat = ast_channel_nativeformats(ast);
+ ast->writeformat = ast->rawwriteformat = ast_channel_nativeformats(ast);
+#endif
+#else
+#if ASTERISK_VERSION_NUM < 110000
ast_format_set(&ast->rawwriteformat ,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0);
ast_format_copy(&ast->rawreadformat, &ast->rawwriteformat);
ast_format_cap_set(ast->nativeformats, &ast->rawwriteformat);
ast_set_write_format(ast, &ast->rawwriteformat);
ast_set_read_format(ast, &ast->rawreadformat);
+#else
+ ast_format_set(ast_channel_rawwriteformat(ast) ,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0);
+ ast_format_copy(ast_channel_rawreadformat(ast), ast_channel_rawwriteformat(ast));
+ ast_format_cap_set(ast_channel_nativeformats(ast), ast_channel_rawwriteformat(ast));
+ ast_set_write_format(ast, ast_channel_rawwriteformat(ast));
+ ast_set_read_format(ast, ast_channel_rawreadformat(ast));
#endif
+#endif
+#if ASTERISK_VERSION_NUM < 110000
ast->priority = 1;
ast->hangupcause = 0;
+#else
+ ast_channel_priority_set(ast, 1);
+ ast_channel_hangupcause_set(ast, 0);
+#endif
/* link together */
call->ast = ast;
+#if ASTERISK_VERSION_NUM < 110000
ast->tech_pvt = call;
ast->fds[0] = call->pipe[0];
+#else
+ ast_channel_tech_pvt_set(ast, call);
+ ast_channel_set_fd(ast, 0, call->pipe[0]);
+#endif
call->pbx_started = 0;
/* set state */
call->state = CHAN_LCR_STATE_OUT_PREPARE;
// 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 && 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 && 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 && 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;
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";
/* send MESSAGE_NEWREF */
memset(&newparam, 0, sizeof(union parameter));
newparam.newref.direction = 0; /* request from app */
- if (!strcmp(call->interface, "pbx"))
- newparam.newref.mode = 1;
send_message(MESSAGE_NEWREF, 0, &newparam);
/* set hdlc if capability requires hdlc */
+#if ASTERISK_VERSION_NUM < 110000
if (ast->transfercapability == INFO_BC_DATAUNRESTRICTED
|| ast->transfercapability == INFO_BC_DATARESTRICTED
|| ast->transfercapability == INFO_BC_VIDEO)
+#else
+ transfercapability=ast_channel_transfercapability(ast);
+ if (transfercapability == INFO_BC_DATAUNRESTRICTED
+ || transfercapability == INFO_BC_DATARESTRICTED
+ || transfercapability == INFO_BC_VIDEO)
+#endif
call->hdlc = 1;
/* if hdlc is forced by option, we change transcap to data */
if (call->hdlc
+#if ASTERISK_VERSION_NUM < 110000
&& ast->transfercapability != INFO_BC_DATAUNRESTRICTED
&& ast->transfercapability != INFO_BC_DATARESTRICTED
&& ast->transfercapability != INFO_BC_VIDEO)
ast->transfercapability = INFO_BC_DATAUNRESTRICTED;
+#else
+ && transfercapability != INFO_BC_DATAUNRESTRICTED
+ && transfercapability != INFO_BC_DATARESTRICTED
+ && transfercapability != INFO_BC_VIDEO)
+ transfercapability = INFO_BC_DATAUNRESTRICTED;
+#endif
#ifndef AST_1_8_OR_HIGHER
call->cid_num[0] = 0;
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);
call->state = CHAN_LCR_STATE_CONNECT;
}
/* change state */
- /* request bchannel */
- if (!call->bchannel) {
- CDEBUG(call, ast, "Requesting B-channel.\n");
- memset(&newparam, 0, sizeof(union parameter));
- newparam.bchannel.type = BCHANNEL_REQUEST;
- send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
- }
/* enable keypad */
// memset(&newparam, 0, sizeof(union parameter));
// send_message(MESSAGE_ENABLEKEYPAD, call->ref, &newparam);
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);
+ send_release(call, ast->hangupcause, LOCATION_PRIVATE_LOCAL);
+#else
+ if (ast_channel_hangupcause(ast) > 0)
+ send_release(call, ast_channel_hangupcause(ast), LOCATION_PRIVATE_LOCAL);
+#endif
else
- send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
+ send_release(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
/* remove call */
free_call(call);
if (!pthread_equal(tid, chan_tid)) {
static int lcr_write(struct ast_channel *ast, struct ast_frame *fr)
{
+ union parameter newparam;
struct chan_call *call;
struct ast_frame * f = fr;
+ unsigned char *p, *q;
+ int len, l;
+#if ASTERISK_VERSION_NUM < 100000
#ifdef AST_1_8_OR_HIGHER
if (!f->subclass.codec)
#else
if (!f->subclass)
#endif
CDEBUG(NULL, ast, "No subclass\n");
+#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. "
#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) {
}
return -1;
}
- if (call->bchannel && f->samples)
- bchannel_transmit(call->bchannel, *((unsigned char **)&(f->data)), f->samples);
+ len = f->samples;
+ p = *((unsigned char **)&(f->data));
+ q = newparam.traffic.data;
+ memset(&newparam, 0, sizeof(union parameter));
+ while (len) {
+ l = (len > sizeof(newparam.traffic.data)) ? sizeof(newparam.traffic.data) : len;
+ newparam.traffic.len = l;
+ len -= l;
+ for (; l; l--)
+ *q++ = flip_bits[*p++];
+ send_message(MESSAGE_TRAFFIC, call->ref, &newparam);
+ }
ast_mutex_unlock(&chan_lock);
if (f != fr) {
ast_frfree(f);
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
#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;
union parameter newparam;
int res = 0;
struct chan_call *call;
- const struct tone_zone_sound *ts = NULL;
+ const struct ast_tone_zone_sound *ts = NULL;
ast_mutex_lock(&chan_lock);
+#if ASTERISK_VERSION_NUM < 110000
call = ast->tech_pvt;
+#else
+ call = ast_channel_tech_pvt(ast);
+#endif
if (!call) {
CERROR(NULL, ast, "Received indicate from Asterisk, but no call instance exists.\n");
ast_mutex_unlock(&chan_lock);
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:
CDEBUG(call, ast, "Received indicate AST_CONTROL_PROGRESS from Asterisk.\n");
/* request bchannel */
- if (!call->bchannel) {
- CDEBUG(call, ast, "Requesting B-channel.\n");
- memset(&newparam, 0, sizeof(union parameter));
- newparam.bchannel.type = BCHANNEL_REQUEST;
- send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
- }
+ CDEBUG(call, ast, "Requesting audio path.\n");
+ memset(&newparam, 0, sizeof(union parameter));
+ send_message(MESSAGE_AUDIOPATH, call->ref, &newparam);
break;
case -1:
CDEBUG(call, ast, "Received indicate -1.\n");
/*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);
/* join, if both call instances uses dsp
ignore the case of fax detection here it may be benificial for ISDN fax machines or pass through.
*/
- if (!call1->nodsp && !call2->nodsp) {
- CDEBUG(NULL, NULL, "Both calls use DSP, bridging via DSP.\n");
+ CDEBUG(NULL, NULL, "Both calls use DSP, bridging via DSP.\n");
- /* get bridge id and join */
- bridge_id = new_bridge_id();
+ /* get bridge id and join */
+ bridge_id = new_bridge_id();
- call1->bridge_id = bridge_id;
- if (call1->bchannel)
- bchannel_join(call1->bchannel, bridge_id);
+#if 0
+ call1->bridge_id = bridge_id;
+ if (call1->bchannel)
+ bchannel_join(call1->bchannel, bridge_id);
+
+ call2->bridge_id = bridge_id;
+ if (call2->bchannel)
+ bchannel_join(call2->bchannel, bridge_id);
+#else
+ printf("FIXME");
+ exit(0);
+#endif
- call2->bridge_id = bridge_id;
- if (call2->bchannel)
- bchannel_join(call2->bchannel, bridge_id);
- } else
- if (call1->nodsp && call2->nodsp)
- CDEBUG(NULL, NULL, "Both calls use no DSP, bridging in channel driver.\n");
- else
- CDEBUG(NULL, NULL, "One call uses no DSP, bridging in channel driver.\n");
call1->bridge_call = call2;
call2->bridge_call = call1;
/* split channels */
ast_mutex_lock(&chan_lock);
+#if ASTERISK_VERSION_NUM < 110000
call1 = ast1->tech_pvt;
call2 = ast2->tech_pvt;
+#else
+ call1 = ast_channel_tech_pvt(ast1);
+ call2 = ast_channel_tech_pvt(ast2);
+#endif
if (call1 && call1->bridge_id) {
call1->bridge_id = 0;
- if (call1->bchannel)
- bchannel_join(call1->bchannel, 0);
if (call1->bridge_call)
call1->bridge_call->bridge_call = NULL;
}
if (call2 && call1->bridge_id) {
call2->bridge_id = 0;
- if (call2->bchannel)
- bchannel_join(call2->bchannel, 0);
if (call2->bridge_call)
call2->bridge_call->bridge_call = NULL;
}
apply_opt(call, (char *)argv[0]);
#endif
+ /* send options */
+ if (call->tx_queue) {
+ union parameter newparam;
+
+ memset(&newparam, 0, sizeof(union parameter));
+ newparam.queue = call->tx_queue * 8;
+ send_message(MESSAGE_DISABLE_DEJITTER, call->ref, &newparam);
+ }
else
CERROR(NULL, ast, "lcr_config app not called by chan_lcr channel.\n");
ast_mutex_init(&chan_lock);
ast_mutex_init(&log_lock);
- if (bchannel_initialize()) {
- CERROR(NULL, NULL, "Unable to open mISDN device\n");
- close_socket();
-
- #ifdef LCR_FOR_ASTERISK
- return AST_MODULE_LOAD_DECLINE;
- #endif
-
- #ifdef LCR_FOR_CALLWEAVER
- return 0;
- #endif
- }
- mISDN_created = 1;
-
#if ASTERISK_VERSION_NUM < 100000
lcr_tech.capabilities = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
#else
#endif
if (ast_channel_register(&lcr_tech)) {
CERROR(NULL, NULL, "Unable to register channel class\n");
- bchannel_deinitialize();
close_socket();
#ifdef LCR_FOR_ASTERISK
" d - Send display text on called phone, text is the optarg.\n"
" n - Don't detect dtmf tones on called channel.\n"
" h - Force data call (HDLC).\n"
- " t - Disable mISDN_dsp features (required for fax application).\n"
" q - Add queue to make fax stream seamless (required for fax app).\n"
" Use queue size in miliseconds for optarg. (try 250)\n"
" f - Adding fax detection. It it timeouts, mISDN_dsp is used.\n"
" Use time to detect for optarg.\n"
+#if 0
" c - Make crypted outgoing call, optarg is keyindex.\n"
" e - Perform echo cancelation on this channel.\n"
+#endif
" Takes mISDN pipeline option as optarg.\n"
" s - Send Non Inband DTMF as inband.\n"
" r - re-buffer packets (160 bytes). Required for some SIP-phones and fax applications.\n"
+#if 0
" vr - rxgain control\n"
" vt - txgain control\n"
+#endif
" Volume changes at factor 2 ^ optarg.\n"
" k - use keypad to dial this call.\n"
"\n"
if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0)) {
/* failed to create thread */
- bchannel_deinitialize();
close_socket();
ast_channel_unregister(&lcr_tech);
ast_unregister_application("lcr_config");
- if (mISDN_created) {
- bchannel_deinitialize();
- mISDN_created = 0;
- }
-
if (lcr_sock >= 0) {
close(lcr_sock);
lcr_sock = -1;
projects / lcr.git / blobdiff