#include <asterisk/app.h>
#include <asterisk/features.h>
#include <asterisk/sched.h>
+#include <asterisk/version.h>
#include "extension.h"
#include "message.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;
{
int cause, ret;
union parameter newparam;
+#if ASTERISK_VERSION_NUM < 110000
char *exten = ast->exten;
+#else
+ char *exten = ast_channel_exten(ast);
+#endif
if (!*exten)
exten = "s";
+#if ASTERISK_VERSION_NUM < 110000
CDEBUG(call, ast, "Try to start pbx. (exten=%s context=%s complete=%s)\n", exten, ast->context, complete?"yes":"no");
+#else
+ CDEBUG(call, ast, "Try to start pbx. (exten=%s context=%s complete=%s)\n", exten, ast_channel_context(ast), complete?"yes":"no");
+#endif
if (complete) {
/* if not match */
+#if ASTERISK_VERSION_NUM < 110000
if (!ast_canmatch_extension(ast, ast->context, exten, 1, call->oad)) {
- CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at context '%s' - releasing.\n", exten, ast->context);
+CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at context '%s' - releasing.\n", exten, ast->context);
+#else
+ if (!ast_canmatch_extension(ast, ast_channel_context(ast), exten, 1, call->oad)) {
+CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at context '%s' - releasing.\n", exten, ast_channel_context(ast));
+#endif
cause = 1;
goto release;
}
+#if ASTERISK_VERSION_NUM < 110000
if (!ast_exists_extension(ast, ast->context, exten, 1, call->oad)) {
CDEBUG(call, ast, "Got 'sending complete', but extension '%s' would match at context '%s', if more digits would be dialed - releasing.\n", exten, ast->context);
+#else
+ if (!ast_exists_extension(ast, ast_channel_context(ast), exten, 1, call->oad)) {
+ CDEBUG(call, ast, "Got 'sending complete', but extension '%s' would match at context '%s', if more digits would be dialed - releasing.\n", exten, ast_channel_context(ast));
+#endif
cause = 28;
goto release;
}
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 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;
#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);
/* fill setup information */
if (param->setup.dialinginfo.id)
+#if ASTERISK_VERSION_NUM < 110000
strncpy(ast->exten, param->setup.dialinginfo.id, AST_MAX_EXTENSION-1);
if (param->setup.context[0])
strncpy(ast->context, param->setup.context, AST_MAX_CONTEXT-1);
else
strncpy(ast->context, param->setup.callerinfo.interface, AST_MAX_CONTEXT-1);
-
+#else
+ strncpy(ast_channel_exten(ast), param->setup.dialinginfo.id, AST_MAX_EXTENSION-1);
+ if (param->setup.context[0])
+ strncpy(ast_channel_context(ast), param->setup.context, AST_MAX_CONTEXT-1);
+ else
+ strncpy(ast_channel_context(ast), param->setup.callerinfo.interface, AST_MAX_CONTEXT-1);
+#endif
#ifdef AST_1_8_OR_HIGHER
strncpy(call->oad, numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, options.national, options.international), sizeof(call->oad)-1);
/* configure channel */
+#if ASTERISK_VERSION_NUM < 100000
ast->nativeformats = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
ast->readformat = ast->rawreadformat = ast->nativeformats;
ast->writeformat = ast->rawwriteformat = ast->nativeformats;
+#else
+ ast_format_set(&ast->rawwriteformat ,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0);
+ ast_format_copy(&ast->rawreadformat, &ast->rawwriteformat);
+ ast_format_cap_set(ast->nativeformats, &ast->rawwriteformat);
+ ast_set_write_format(ast, &ast->rawwriteformat);
+ ast_set_read_format(ast, &ast->rawreadformat);
+#endif
ast->priority = 1;
ast->hangupcause = 0;
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);
/* 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, const struct ast_channel *requestor, void *data, int *cause)
+#endif
+#else
struct ast_channel *lcr_request(const char *type, int format, void *data, int *cause)
#endif
{
ast->tech = &lcr_tech;
ast->tech_pvt = (void *)1L; // set pointer or asterisk will not call
/* configure channel */
+#if ASTERISK_VERSION_NUM < 100000
ast->nativeformats = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
ast->readformat = ast->rawreadformat = ast->nativeformats;
ast->writeformat = ast->rawwriteformat = ast->nativeformats;
+#else
+ ast_format_set(&ast->rawwriteformat ,(options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW , 0);
+ ast_format_copy(&ast->rawreadformat, &ast->rawwriteformat);
+ ast_format_cap_set(ast->nativeformats, &ast->rawwriteformat);
+ ast_set_write_format(ast, &ast->rawwriteformat);
+ ast_set_read_format(ast, &ast->rawreadformat);
+#endif
ast->priority = 1;
ast->hangupcause = 0;
/* store call information for setup */
/* caller ID */
- if (requestor->caller.id.number.valid) {
+ if (requestor && requestor->caller.id.number.valid) {
if (requestor->caller.id.number.str)
strncpy(call->callerinfo.id, requestor->caller.id.number.str, sizeof(call->callerinfo.id)-1);
switch(requestor->caller.id.number.presentation & AST_PRES_RESTRICTION) {
call->callerinfo.present = INFO_PRESENT_NOTAVAIL;
/* caller ID 2 */
- if (requestor->caller.ani.number.valid) {
+ if (requestor && requestor->caller.ani.number.valid) {
if (requestor->caller.ani.number.str)
strncpy(call->callerinfo.id2, requestor->caller.ani.number.str, sizeof(call->callerinfo.id2)-1);
switch(requestor->caller.ani.number.presentation & AST_PRES_RESTRICTION) {
call->callerinfo.present2 = INFO_PRESENT_NOTAVAIL;
/* caller name */
- if (requestor->caller.id.name.valid) {
+ if (requestor && requestor->caller.id.name.valid) {
if (requestor->caller.id.name.str)
strncpy(call->callerinfo.name, requestor->caller.id.name.str, sizeof(call->callerinfo.name)-1);
}
/* redir number */
- if (requestor->redirecting.from.number.valid) {
+ if (requestor && requestor->redirecting.from.number.valid) {
call->redirinfo.itype = INFO_ITYPE_CHAN;
if (requestor->redirecting.from.number.str)
strncpy(call->redirinfo.id, requestor->redirecting.from.number.str, sizeof(call->redirinfo.id)-1);
#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) {
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
}
}
struct chan_call *call;
struct ast_frame * f = fr;
+#if ASTERISK_VERSION_NUM < 100000
#ifdef AST_1_8_OR_HIGHER
- if (!f->subclass.integer)
+ if (!f->subclass.codec)
#else
if (!f->subclass)
#endif
CDEBUG(NULL, ast, "No subclass\n");
+#endif
#ifdef AST_1_8_OR_HIGHER
- if (!(f->subclass.integer & ast->nativeformats)) {
+#if ASTERISK_VERSION_NUM < 100000
+ if (!(f->subclass.codec & ast->nativeformats)) {
+#else
+ if (!ast_format_cap_iscompatible(ast->nativeformats, &f->subclass.format)) {
+#endif
#else
if (!(f->subclass & ast->nativeformats)) {
#endif
- CDEBUG(NULL, ast,
+ CDEBUG(NULL, ast,
"Unexpected format. "
"Activating emergency conversion...\n");
#ifdef AST_1_8_OR_HIGHER
- ast_set_write_format(ast, f->subclass.integer);
+#if ASTERISK_VERSION_NUM < 100000
+ ast_set_write_format(ast, f->subclass.codec);
+#else
+ ast_set_write_format(ast, &f->subclass.format);
+#endif
#else
ast_set_write_format(ast, f->subclass);
#endif
f = (ast->writetrans) ? ast_translate(
ast->writetrans, fr, 0) : fr;
}
-
+
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
if (!call) {
call->read_fr.frametype = AST_FRAME_VOICE;
#ifdef AST_1_8_OR_HIGHER
- call->read_fr.subclass.integer = ast->nativeformats;
+#if ASTERISK_VERSION_NUM < 100000
+ call->read_fr.subclass.codec = ast->nativeformats;
+#else
+ ast_best_codec(ast->nativeformats, &call->read_fr.subclass.format);
+ call->read_fr.subclass.integer = call->read_fr.subclass.format.id;
+#endif
#else
call->read_fr.subclass = ast->nativeformats;
#endif
/*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
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);
+
+ close_socket();
- quit = 1;
- pthread_join(chan_tid, NULL);
+ 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