Call is initiated by LCR:
If a call is received from LCR, a MESSAGE_NEWREF is received first.
+The ref_was_assigned ist set to 1.
A new chan_call instance is created. The call reference (ref) is given by
-MESSAGE_NEWREF. The state is CHAN_LCR_STATE_IN_PREPARE.
+the received MESSAGE_NEWREF. The state is CHAN_LCR_STATE_IN_PREPARE.
After receiving MESSAGE_SETUP from LCR, the ast_channel instance is created
using ast_channel_alloc(1). The setup information is given to asterisk.
The new Asterisk instance pointer (ast) is stored to chan_call structure.
If a call is requested from Asterisk, a new chan_call instance is created.
The new Asterisk instance pointer (ast) is stored to chan_call structure.
The current call ref is set to 0, the state is CHAN_LCR_STATE_OUT_PREPARE.
-If the call is received (lcr_call) A MESSASGE_NEWREF is sent to LCR requesting
+If the call is received (lcr_call) A MESSAGE_NEWREF is sent to LCR requesting
a new call reference (ref).
+The ref_was_assigned ist set to 1.
Further dialing information is queued.
After the new callref is received by special MESSAGE_NEWREF reply, new ref
is stored in the chan_call structure.
A MESSAGE_RELEASE is received with the call reference (ref) to be released.
The current ref is set to 0, to indicate released reference.
+The ref_was_assigned==1 shows that there is no other ref to be assigned.
The state changes to CHAN_LCR_STATE_RELEASE.
ast_queue_hangup() is called, if asterisk instance (ast) exists, if not,
the chan_call instance is destroyed.
a MESSAGE_RELEASE is sent to LCR and the chan_call instance is destroyed.
If the ref is 0 and the state is not CHAN_LCR_STATE_RELEASE, the new state is
set to CHAN_LCR_STATE_RELEASE.
+The ref_was_assigned==0 shows that a ref is still requested.
Later, if the MESSAGE_NEWREF reply is received, a MESSAGE_RELEASE is sent to
LCR and the chan_call instance is destroyed.
If the ref is 0 and the state is CHAN_LCR_STATE_RELEASE, see the proceedure
*/
+
+/* Choose if you want to have chan_lcr for Asterisk 1.4.x or CallWeaver 1.2.x */
+#define LCR_FOR_ASTERISK
+/* #define LCR_FOR_CALLWEAVER */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <semaphore.h>
+#define HAVE_ATTRIBUTE_always_inline 1
+#define HAVE_ARPA_INET_H 1
+#define HAVE_TIMERSUB 1
+#define HAVE_STRTOQ 1
+#define HAVE_INET_ATON 1
+
+#include <asterisk/compiler.h>
+#ifdef LCR_FOR_ASTERISK
+#include <asterisk/buildopts.h>
+#endif
#include <asterisk/module.h>
#include <asterisk/channel.h>
#include <asterisk/config.h>
#include <asterisk/dsp.h>
#include <asterisk/translate.h>
#include <asterisk/file.h>
+#ifdef LCR_FOR_ASTERISK
#include <asterisk/callerid.h>
+#endif
+#ifdef LCR_FOR_CALLWEAVER
+#include <asterisk/phone_no_utils.h>
+#endif
+
#include <asterisk/indications.h>
#include <asterisk/app.h>
#include <asterisk/features.h>
CHAN_LCR_STATE // state description structure
MESSAGES // message text
+#ifdef LCR_FOR_CALLWEAVER
+AST_MUTEX_DEFINE_STATIC(rand_lock);
+#endif
+
unsigned char flip_bits[256];
+#ifdef LCR_FOR_CALLWEAVER
+static struct ast_frame nullframe = { AST_FRAME_NULL, };
+#endif
+
int lcr_debug=1;
int mISDN_created=1;
char lcr_type[]="lcr";
+#ifdef LCR_FOR_CALLWEAVER
+static ast_mutex_t usecnt_lock;
+static int usecnt=0;
+static char *desc = "Channel driver for mISDN/LCR Support (Bri/Pri)";
+#endif
+
pthread_t chan_tid;
ast_mutex_t chan_lock; /* global lock */
ast_mutex_t log_lock; /* logging log */
*/
struct chan_call *call_first;
-struct chan_call *find_call_ref(unsigned int ref)
-{
- struct chan_call *call = call_first;
-
- while(call)
- {
- if (call->ref == ref)
- break;
- call = call->next;
- }
- return(call);
-}
-
-#if 0
-struct chan_call *find_call_ast(struct ast_channel *ast)
-{
- struct chan_call *call = call_first;
-
- while(call)
- {
- if (call->ast == ast)
- break;
- call = call->next;
- }
- return(call);
-}
+/*
+ * find call by ref
+ * special case: 0: find new ref, that has not been assigned a ref yet
+ */
-struct chan_call *find_call_handle(unsigned int handle)
+struct chan_call *find_call_ref(unsigned int ref)
{
struct chan_call *call = call_first;
-
+ int assigned = (ref > 0);
+
while(call)
{
- if (call->bchannel_handle == handle)
+ if (call->ref == ref && call->ref_was_assigned == assigned)
break;
call = call->next;
}
return(call);
}
-#endif
void free_call(struct chan_call *call)
{
CERROR(call, NULL, "Linked call structure has no link to us.\n");
call->bridge_call->bridge_call = NULL;
}
+ if (call->trans)
+ ast_translator_free_path(call->trans);
+ if (call->dsp)
+ ast_dsp_free(call->dsp);
CDEBUG(call, NULL, "Call instance freed.\n");
free(call);
return;
return(*callp);
}
-
unsigned short new_bridge_id(void)
{
struct chan_call *call;
{
union parameter newparam;
char string[1024], *p = string, *opt, *key;
- int gain, i, newmode = 0;
+ int gain, i;
if (!data[0])
return; // no opts
break;
}
CDEBUG(call, call->ast, "Option 'h' (HDLC).\n");
- if (!call->hdlc) {
+ if (!call->hdlc)
call->hdlc = 1;
- newmode = 1;
- }
break;
case 't':
if (opt[1] != '\0') {
break;
}
CDEBUG(call, call->ast, "Option 't' (no dsp).\n");
- if (!call->nodsp) {
+ if (!call->nodsp)
call->nodsp = 1;
- newmode = 1;
- }
break;
case 'e':
if (opt[1] == '\0') {
if (call->bchannel)
bchannel_pipeline(call->bchannel, call->pipeline);
break;
+ case 'f':
+ if (opt[1] == '\0') {
+ CERROR(call, call->ast, "Option 'f' (faxdetect) expects parameter.\n", opt);
+ break;
+ }
+ call->faxdetect=atoi(opt+1);
+ if (!call->dsp)
+ call->dsp=ast_dsp_new();
+ if (call->dsp) {
+ #ifdef LCR_FOR_CALLWEAVER
+ ast_dsp_set_features(call->dsp, DSP_FEATURE_DTMF_DETECT| DSP_FEATURE_FAX_CNG_DETECT);
+ #endif
+ #ifdef LCR_FOR_ASTERISK
+ #ifdef DSP_FEATURE_DTMF_DETECT
+ ast_dsp_set_features(call->dsp, DSP_FEATURE_DTMF_DETECT| DSP_FEATURE_FAX_DETECT);
+ #else
+ ast_dsp_set_features(call->dsp, DSP_FEATURE_DIGIT_DETECT| DSP_FEATURE_FAX_DETECT);
+ #endif
+
+ #endif
+ 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
+ call->trans=ast_translator_build_path(AST_FORMAT_SLINEAR, (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW);
+ #endif
+ }
+ CDEBUG(call, call->ast, "Option 'f' (faxdetect) with config '%s'.\n", call->faxdetect);
+ break;
case 'r':
if (opt[1] != '\0') {
CERROR(call, call->ast, "Option 'r' (re-buffer 160 bytes) expects no parameter.\n", opt);
}
CDEBUG(call, call->ast, "Option 'r' (re-buffer 160 bytes)");
call->rebuffer = 1;
+ call->framepos = 0;
break;
-#if 0
case 's':
if (opt[1] != '\0') {
CERROR(call, call->ast, "Option 's' (inband DTMF) expects no parameter.\n", opt);
}
CDEBUG(call, call->ast, "Option 's' (inband DTMF).\n");
call->inband_dtmf = 1;
-todo
break;
-#endif
case 'v':
if (opt[1] != 'r' && opt[1] != 't') {
CERROR(call, call->ast, "Option 'v' (volume) expects parameter.\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)?1:0) + ((call->hdlc)?2:0)))
+ if (bchannel_create(call->bchannel, ((call->nodsp || call->faxdetect > 0)?1:0) + ((call->hdlc)?2:0)))
bchannel_activate(call->bchannel, 1);
}
}
}
switch(ast->cid.cid_pres & AST_PRES_RESTRICTION)
{
- case AST_PRES_ALLOWED:
- newparam.setup.callerinfo.present = INFO_PRESENT_ALLOWED;
- break;
case AST_PRES_RESTRICTED:
newparam.setup.callerinfo.present = INFO_PRESENT_RESTRICTED;
break;
case AST_PRES_UNAVAILABLE:
newparam.setup.callerinfo.present = INFO_PRESENT_NOTAVAIL;
break;
+ case AST_PRES_ALLOWED:
default:
- newparam.setup.callerinfo.present = INFO_PRESENT_NULL;
+ newparam.setup.callerinfo.present = INFO_PRESENT_ALLOWED;
}
switch(ast->cid.cid_ton)
{
/* check bridge */
if (!call) return;
if (!call->bridge_call) return;
- CDEBUG(call, NULL, "Sending message due briding.\n");
+ CDEBUG(call, NULL, "Sending message due bridging.\n");
send_message(message_type, call->bridge_call->ref, param);
}
{
int cause, ret;
union parameter newparam;
+ char *exten = ast->exten;
+ if (!*exten)
+ exten = "s";
- CDEBUG(call, ast, "Try to start pbx. (exten=%s context=%s complete=%s)\n", ast->exten, ast->context, complete?"yes":"no");
+ CDEBUG(call, ast, "Try to start pbx. (exten=%s context=%s complete=%s)\n", exten, ast->context, complete?"yes":"no");
if (complete)
{
/* if not match */
- if (!ast_canmatch_extension(ast, ast->context, ast->exten, 1, call->oad))
+ 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", ast->exten, ast->context);
+ CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at context '%s' - releasing.\n", exten, ast->context);
cause = 1;
goto release;
}
- if (!ast_exists_extension(ast, ast->context, ast->exten, 1, call->oad))
+ 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", ast->exten, ast->context);
+ 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);
cause = 28;
goto release;
}
goto start;
}
- if (ast_canmatch_extension(ast, ast->context, ast->exten, 1, call->oad))
+ if (ast_canmatch_extension(ast, ast->context, exten, 1, call->oad))
{
/* send setup acknowledge to lcr */
if (call->state != CHAN_LCR_STATE_IN_DIALING) {
call->state = CHAN_LCR_STATE_IN_DIALING;
/* if match, start pbx */
- if (ast_exists_extension(ast, ast->context, ast->exten, 1, call->oad)) {
+ if (ast_exists_extension(ast, ast->context, exten, 1, call->oad)) {
CDEBUG(call, ast, "Extensions matches.\n");
goto start;
}
return;
}
+ if (!*ast->exten) {
+ /* 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;
+ }
+
/* if not match */
cause = 1;
release:
start:
/* send setup to asterisk */
CDEBUG(call, ast, "Starting call to Asterisk due to matching extension.\n");
+
+ #ifdef LCR_FOR_CALLWEAVER
+ ast->type = "LCR";
+ snprintf(ast->name, sizeof(ast->name), "LCR/%s-%04x",ast->cid.cid_num, ast_random() & 0xffff);
+ #endif
+
ret = ast_pbx_start(ast);
if (ret < 0)
{
goto release;
}
call->pbx_started = 1;
-// if (call->state == CHAN_LCR_STATE_IN_DIALING)
- ast_setstate(ast, AST_STATE_RINGING);
-// else
-// ast_setstate(ast, AST_STATE_RINGING);
-// return;
+ ast_setstate(ast, AST_STATE_RING);
}
/*
CDEBUG(call, NULL, "Incomming setup from LCR. (callerid %s, dialing %s)\n", param->setup.callerinfo.id, param->setup.dialinginfo.id);
/* create asterisk channel instrance */
+
+ #ifdef LCR_FOR_CALLWEAVER
+ ast = ast_channel_alloc(1);
+ #endif
+
+ #ifdef LCR_FOR_ASTERISK
ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel);
+ #endif
+
if (!ast)
{
/* release */
memcpy(&call->connectinfo, ¶m->connectinfo, sizeof(struct connect_info));
/* queue event to asterisk */
if (call->ast && call->pbx_started)
- strncat(call->queue_string, "A", sizeof(call->queue_string)-1);
+ strncat(call->queue_string, "N", sizeof(call->queue_string)-1);
}
/*
}
/*
- * incoming setup acknowledge from LCR
+ * incoming release from LCR
*/
static void lcr_in_release(struct chan_call *call, int message_type, union parameter *param)
{
/* use bridge to forware message not supported by asterisk */
if (call->state == CHAN_LCR_STATE_CONNECT) {
- CDEBUG(call, call->ast, "Call is connected, briding.\n");
+ CDEBUG(call, call->ast, "Call is connected, bridging.\n");
bridge_message_if_bridged(call, message_type, param);
}
}
}
/*
+ * incoming pattern from LCR
+ */
+static void lcr_in_pattern(struct chan_call *call, int message_type, union parameter *param)
+{
+ union parameter newparam;
+
+ CDEBUG(call, call->ast, "Incomming pattern indication from LCR.\n");
+
+ if (!call->ast) return;
+
+ /* pattern are indicated only once */
+ if (call->has_pattern)
+ return;
+ call->has_pattern = 1;
+
+ /* request bchannel */
+ if (!call->bchannel) {
+ CDEBUG(call, call->ast, "Requesting B-channel.\n");
+ memset(&newparam, 0, sizeof(union parameter));
+ newparam.bchannel.type = BCHANNEL_REQUEST;
+ send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
+ }
+ /* queue PROGRESS, because tones are available */
+ if (call->ast && call->pbx_started)
+ strncat(call->queue_string, "T", sizeof(call->queue_string)-1);
+}
+
+/*
* got dtmf from bchannel (locked state)
*/
void lcr_in_dtmf(struct chan_call *call, int val)
bchannel_join(bchannel, call->bridge_id);
}
/* create only, if call exists, othewhise it bchannel is freed below... */
- if (bchannel_create(bchannel, ((call->nodsp)?1:0) + ((call->hdlc)?2:0)))
+ if (bchannel_create(bchannel, ((call->nodsp || call->faxdetect > 0)?1:0) + ((call->hdlc)?2:0)))
bchannel_activate(bchannel, 1);
}
/* acknowledge */
call->state = CHAN_LCR_STATE_IN_PREPARE;
/* set ref */
call->ref = ref;
+ call->ref_was_assigned = 1;
/* wait for setup (or release from asterisk) */
} else
{
}
/* store new ref */
call->ref = ref;
+ call->ref_was_assigned = 1;
/* send pending setup info */
if (call->state == CHAN_LCR_STATE_OUT_PREPARE)
send_setup_to_lcr(call);
break;
case MESSAGE_PATTERN: // audio available from LCR
+ if (!call->has_pattern)
+ lcr_in_pattern(call, message_type, param);
break;
case MESSAGE_NOPATTERN: // audio not available from LCR
if (!ast_channel_trylock(ast)) { /* succeed */
while(*p) {
switch (*p) {
+ case 'T':
+ CDEBUG(call, ast, "Sending queued PROGRESS to Asterisk.\n");
+ ast_queue_control(ast, AST_CONTROL_PROGRESS);
+ break;
case 'P':
CDEBUG(call, ast, "Sending queued PROCEEDING to Asterisk.\n");
ast_queue_control(ast, AST_CONTROL_PROCEEDING);
case 'R':
CDEBUG(call, ast, "Sending queued RINGING to Asterisk.\n");
ast_queue_control(ast, AST_CONTROL_RINGING);
+ ast_setstate(ast, AST_STATE_RINGING);
break;
- case 'A':
+ case 'N':
CDEBUG(call, ast, "Sending queued ANSWER to Asterisk.\n");
ast_queue_control(ast, AST_CONTROL_ANSWER);
break;
CDEBUG(call, ast, "Sending queued HANGUP to Asterisk.\n");
ast_queue_hangup(ast);
break;
- case '1': case '2': case '3': case 'a':
- case '4': case '5': case '6': case 'b':
- case '7': case '8': case '9': case 'c':
- case '*': case '0': case '#': case 'd':
+ case '1': case '2': case '3': case 'A':
+ case '4': case '5': case '6': case 'B':
+ case '7': case '8': case '9': case 'C':
+ case '*': case '0': case '#': case 'D':
CDEBUG(call, ast, "Sending queued digit '%c' to Asterisk.\n", *p);
/* send digit to asterisk */
memset(&fr, 0, sizeof(fr));
+
+ #ifdef LCR_FOR_ASTERISK
fr.frametype = AST_FRAME_DTMF_BEGIN;
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ fr.frametype = AST_FRAME_DTMF;
+ #endif
+
fr.subclass = *p;
fr.delivery = ast_tv(0, 0);
ast_queue_frame(ast, &fr);
+
+ #ifdef LCR_FOR_ASTERISK
fr.frametype = AST_FRAME_DTMF_END;
ast_queue_frame(ast, &fr);
+ #endif
+
break;
default:
- CDEBUG(call, ast, "Ignoring queued digit 0x%02d.\n", *p);
+ CDEBUG(call, ast, "Ignoring queued digit 0x%02x.\n", *p);
}
p++;
}
/* delay if no work done */
if (!work) {
ast_mutex_unlock(&chan_lock);
+
+ #ifdef LCR_FOR_ASTERISK
usleep(30000);
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ usleep(20000);
+ #endif
+
ast_mutex_lock(&chan_lock);
}
}
}
/* create asterisk channel instrance */
+
+ #ifdef LCR_FOR_ASTERISK
ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel);
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ ast = ast_channel_alloc(1);
+ #endif
+
if (!ast)
{
CERROR(NULL, NULL, "Failed to create Asterisk channel.\n");
ast_mutex_lock(&chan_lock);
call = ast->tech_pvt;
+
+ #ifdef LCR_FOR_CALLWEAVER
+ ast->type = "LCR";
+ snprintf(ast->name, sizeof(ast->name), "LCR/%s-%04x",call->dialstring, ast_random() & 0xffff);
+ #endif
+
if (!call) {
CERROR(NULL, ast, "Received call from Asterisk, but call instance does not exist.\n");
ast_mutex_unlock(&chan_lock);
return 0;
}
+static void send_digit_to_chan(struct ast_channel * ast, char digit )
+{
+ static const char* dtmf_tones[] = {
+ "!941+1336/100,!0/100", /* 0 */
+ "!697+1209/100,!0/100", /* 1 */
+ "!697+1336/100,!0/100", /* 2 */
+ "!697+1477/100,!0/100", /* 3 */
+ "!770+1209/100,!0/100", /* 4 */
+ "!770+1336/100,!0/100", /* 5 */
+ "!770+1477/100,!0/100", /* 6 */
+ "!852+1209/100,!0/100", /* 7 */
+ "!852+1336/100,!0/100", /* 8 */
+ "!852+1477/100,!0/100", /* 9 */
+ "!697+1633/100,!0/100", /* A */
+ "!770+1633/100,!0/100", /* B */
+ "!852+1633/100,!0/100", /* C */
+ "!941+1633/100,!0/100", /* D */
+ "!941+1209/100,!0/100", /* * */
+ "!941+1477/100,!0/100" }; /* # */
+
+ if (digit >= '0' && digit <='9')
+ ast_playtones_start(ast,0,dtmf_tones[digit-'0'], 0);
+ else if (digit >= 'A' && digit <= 'D')
+ ast_playtones_start(ast,0,dtmf_tones[digit-'A'+10], 0);
+ else if (digit == '*')
+ ast_playtones_start(ast,0,dtmf_tones[14], 0);
+ else if (digit == '#')
+ ast_playtones_start(ast,0,dtmf_tones[15], 0);
+ else {
+ /* not handled */
+ ast_log(LOG_DEBUG, "Unable to handle DTMF tone "
+ "'%c' for '%s'\n", digit, ast->name);
+ }
+}
+
+#ifdef LCR_FOR_ASTERISK
static int lcr_digit_begin(struct ast_channel *ast, char digit)
+#endif
+#ifdef LCR_FOR_CALLWEAVER
+static int lcr_digit(struct ast_channel *ast, char digit)
+#endif
{
struct chan_call *call;
union parameter newparam;
char buf[]="x";
+#ifdef LCR_FOR_CALLWEAVER
+ int inband_dtmf = 0;
+#endif
+
/* only pass IA5 number space */
if (digit > 126 || digit < 32)
return 0;
}
ast_mutex_unlock(&chan_lock);
+
+#ifdef LCR_FOR_ASTERISK
return(0);
}
static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
{
- printf("DIGIT END %c\n", digit);
+ int inband_dtmf = 0;
+ struct chan_call *call;
+#endif
+
+ ast_mutex_lock(&chan_lock);
+
+ call = ast->tech_pvt;
+
+ if (!call) {
+ CERROR(NULL, ast,
+ "Received digit from Asterisk, "
+ "but no call instance exists.\n");
+ ast_mutex_unlock(&chan_lock);
+ return -1;
+ }
+
+ CDEBUG(call, ast, "DIGIT END '%c' from Asterisk.\n", digit);
+
+ if (call->state == CHAN_LCR_STATE_CONNECT && call->inband_dtmf) {
+ inband_dtmf = 1;
+ }
+
+ ast_mutex_unlock(&chan_lock);
+
+ if (inband_dtmf) {
+ CDEBUG(call, ast, "-> sending '%c' inband.\n", digit);
+ send_digit_to_chan(ast, digit);
+ }
+
return (0);
}
/* during prepare, we change to release state */
CDEBUG(call, ast, "We must wait until we received our ref, until we can free call instance.\n");
call->state = CHAN_LCR_STATE_RELEASE;
+ call->ast = NULL;
}
}
if (!pthread_equal(tid, chan_tid))
return -1;
}
if (call->bchannel && f->samples)
- bchannel_transmit(call->bchannel, f->data, f->samples);
+ bchannel_transmit(call->bchannel, *((unsigned char **)&(f->data)), f->samples);
ast_mutex_unlock(&chan_lock);
return 0;
}
}
if (call->pipe[0] > -1) {
if (call->rebuffer && !call->hdlc) {
- len = read(call->pipe[0], call->read_buff, 160);
+ /* Make sure we have a complete 20ms (160byte) frame */
+ len=read(call->pipe[0],call->read_buff + call->framepos, 160 - call->framepos);
+ if (len > 0) {
+ call->framepos += len;
+ }
} else {
len = read(call->pipe[0], call->read_buff, sizeof(call->read_buff));
}
if (len < 0 && errno == EAGAIN) {
ast_mutex_unlock(&chan_lock);
+
+ #ifdef LCR_FOR_ASTERISK
return &ast_null_frame;
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ return &nullframe;
+ #endif
+
}
if (len <= 0) {
close(call->pipe[0]);
call->pipe[0] = -1;
ast_mutex_unlock(&chan_lock);
return NULL;
+ } else if (call->rebuffer && call->framepos < 160) {
+ /* Not a complete frame, so we send a null-frame */
+ ast_mutex_unlock(&chan_lock);
+ return &ast_null_frame;
}
}
call->read_fr.frametype = AST_FRAME_VOICE;
call->read_fr.subclass = ast->nativeformats;
- call->read_fr.datalen = len;
- call->read_fr.samples = len;
+ if (call->rebuffer) {
+ call->read_fr.datalen = call->framepos;
+ call->read_fr.samples = call->framepos;
+ call->framepos = 0;
+ } else {
+ call->read_fr.datalen = len;
+ call->read_fr.samples = len;
+ }
call->read_fr.delivery = ast_tv(0,0);
- call->read_fr.data = call->read_buff;
+ *((unsigned char **)&(call->read_fr.data)) = call->read_buff;
ast_mutex_unlock(&chan_lock);
return &call->read_fr;
call->state = CHAN_LCR_STATE_IN_ALERTING;
}
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);
+ }
+ break;
case -1:
CDEBUG(call, ast, "Received indicate -1.\n");
res = -1;
send_message(MESSAGE_NOTIFY, call->ref, &newparam);
/*start music onhold*/
+ #ifdef LCR_FOR_ASTERISK
ast_moh_start(ast,data,ast->musicclass);
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ ast_moh_start(ast, NULL);
+ #endif
+
call->on_hold = 1;
break;
case AST_CONTROL_UNHOLD:
break;
#ifdef AST_CONTROL_SRCUPDATE
case AST_CONTROL_SRCUPDATE:
- CDEBUG(call, ast, "Received indicate AST_CONTROL_SRCUPDATE from Asterisk.\n");
- res = -1;
+ CDEBUG(call, ast, "Received AST_CONTROL_SRCUPDATE from Asterisk.\n");
break;
#endif
default:
struct ast_frame *f;
int bridge_id;
- CDEBUG(NULL, NULL, "Received briding request from Asterisk.\n");
+ CDEBUG(NULL, NULL, "Received bridging request from Asterisk.\n");
carr[0] = ast1;
carr[1] = ast2;
return AST_BRIDGE_COMPLETE;
}
- /* join, if both call instances uses dsp */
+ /* 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, briding via DSP.\n");
+ CDEBUG(NULL, NULL, "Both calls use DSP, bridging via DSP.\n");
/* get bridge id and join */
bridge_id = new_bridge_id();
bchannel_join(call2->bchannel, bridge_id);
} else
if (call1->nodsp && call2->nodsp)
- CDEBUG(NULL, NULL, "Both calls use no DSP, briding in channel driver.\n");
+ CDEBUG(NULL, NULL, "Both calls use no DSP, bridging in channel driver.\n");
else
- CDEBUG(NULL, NULL, "One call uses no DSP, briding in channel driver.\n");
+ CDEBUG(NULL, NULL, "One call uses no DSP, bridging in channel driver.\n");
call1->bridge_call = call2;
call2->bridge_call = call1;
}
- CDEBUG(NULL, NULL, "Releasing bride.\n");
+ CDEBUG(NULL, NULL, "Releasing bridge.\n");
/* split channels */
ast_mutex_lock(&chan_lock);
}
static struct ast_channel_tech lcr_tech = {
.type="LCR",
- .description="Channel driver for connecting to Linux-Call-Router",
- .requester=lcr_request,
- .send_digit_begin=lcr_digit_begin,
- .send_digit_end=lcr_digit_end,
- .call=lcr_call,
- .bridge=lcr_bridge,
- .hangup=lcr_hangup,
- .answer=lcr_answer,
- .read=lcr_read,
- .write=lcr_write,
- .indicate=lcr_indicate,
- .fixup=lcr_fixup,
- .send_text=lcr_send_text,
- .properties=0
+ .description = "Channel driver for connecting to Linux-Call-Router",
+ .capabilities = AST_FORMAT_ALAW,
+ .requester = lcr_request,
+
+ #ifdef LCR_FOR_ASTERISK
+ .send_digit_begin = lcr_digit_begin,
+ .send_digit_end = lcr_digit_end,
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ .send_digit = lcr_digit,
+ #endif
+
+ .call = lcr_call,
+ .bridge = lcr_bridge,
+ .hangup = lcr_hangup,
+ .answer = lcr_answer,
+ .read = lcr_read,
+ .write = lcr_write,
+ .indicate = lcr_indicate,
+ .fixup = lcr_fixup,
+ .send_text = lcr_send_text,
+ .properties = 0
};
#endif
-
+#ifdef LCR_FOR_ASTERISK
static int lcr_config_exec(struct ast_channel *ast, void *data)
+#endif
+
+#ifdef LCR_FOR_CALLWEAVER
+static int lcr_config_exec(struct ast_channel *ast, void *data, char **argv)
+#endif
{
struct chan_call *call;
ast_mutex_lock(&chan_lock);
+
+ #ifdef LCR_FOR_ASTERISK
CDEBUG(NULL, ast, "Received lcr_config (data=%s)\n", (char *)data);
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ CDEBUG(NULL, ast, "Received lcr_config (data=%s)\n", argv[0]);
+ #endif
+
/* find channel */
call = call_first;
while(call) {
call = call->next;
}
if (call)
+
+ #ifdef LCR_FOR_ASTERISK
apply_opt(call, (char *)data);
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ apply_opt(call, (char *)argv[0]);
+ #endif
+
else
CERROR(NULL, ast, "lcr_config app not called by chan_lcr channel.\n");
if (read_options() == 0) {
CERROR(NULL, NULL, "%s", options_error);
+
+ #ifdef LCR_FOR_ASTERISK
return AST_MODULE_LOAD_DECLINE;
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ return 0;
+ #endif
+
}
ast_mutex_init(&chan_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;
CERROR(NULL, NULL, "Unable to register channel class\n");
bchannel_deinitialize();
close_socket();
+
+ #ifdef LCR_FOR_ASTERISK
return AST_MODULE_LOAD_DECLINE;
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ return 0;
+ #endif
}
ast_register_application("lcr_config", lcr_config_exec, "lcr_config",
+
+ #ifdef LCR_FOR_ASTERISK
"lcr_config(<opt><optarg>:<opt>:...)\n"
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ "lcr_config(<opt><optarg>:<opt>:...)\n",
+ #endif
+
"Sets LCR opts. and optargs\n"
"\n"
"The available options are:\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"
+ " f - Adding fax detection. It it timeouts, mISDN_dsp is used.\n"
+ " Use time to detect for optarg.\n"
" c - Make crypted outgoing call, optarg is keyindex.\n"
" e - Perform echo cancelation on this channel.\n"
" Takes mISDN pipeline option as optarg.\n"
-// " s - Send Non Inband DTMF as inband.\n"
+ " s - Send Non Inband DTMF as inband.\n"
+ " r - re-buffer packets (160 bytes). Required for some SIP-phones and fax applications.\n"
" vr - rxgain control\n"
" vt - txgain control\n"
" Volume changes at factor 2 ^ optarg.\n"
bchannel_deinitialize();
close_socket();
ast_channel_unregister(&lcr_tech);
+
+ #ifdef LCR_FOR_ASTERISK
return AST_MODULE_LOAD_DECLINE;
+ #endif
+
+ #ifdef LCR_FOR_CALLWEAVER
+ return 0;
+ #endif
+
}
return 0;
}
return 0;
}
-
+#ifdef LCR_FOR_ASTERISK
#define AST_MODULE "chan_lcr"
+#endif
+
+#ifdef LCR_FOR_CALLWEAVER
+int usecount(void)
+{
+ int res;
+ ast_mutex_lock(&usecnt_lock);
+ res = usecnt;
+ ast_mutex_unlock(&usecnt_lock);
+ return res;
+}
+#endif
+#ifdef LCR_FOR_ASTERISK
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Channel driver for Linux-Call-Router Support (ISDN BRI/PRI)",
.load = load_module,
.unload = unload_module,
.reload = reload_module,
);
+#endif
+#ifdef LCR_FOR_CALLWEAVER
+char *description(void)
+{
+ return desc;
+}
+#endif
projects / lcr.git / blobdiff