Added display of current active TEI values (L2) at lcradmin.
[lcr.git] / chan_lcr.c
index ee5ae6b..00c27f8 100644 (file)
@@ -105,6 +105,11 @@ it is called from ast_channel process which has already locked ast_channel.
 
 */
 
+
+/* 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>
@@ -121,6 +126,16 @@ it is called from ast_channel process which has already locked ast_channel.
 
 #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>
@@ -135,7 +150,13 @@ it is called from ast_channel process which has already locked ast_channel.
 #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>
@@ -153,13 +174,27 @@ it is called from ast_channel process which has already locked ast_channel.
 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 */
@@ -253,6 +288,10 @@ 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;
@@ -343,7 +382,7 @@ void apply_opt(struct chan_call *call, char *data)
 {
        union parameter newparam;
        char string[1024], *p = string, *opt, *key;
-       int gain, i, newmode = 0;
+       int gain, i;
 
        if (!data[0])
                return; // no opts
@@ -431,10 +470,8 @@ void apply_opt(struct chan_call *call, char *data)
                                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') {
@@ -442,10 +479,8 @@ void apply_opt(struct chan_call *call, char *data)
                                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') {
@@ -457,6 +492,36 @@ void apply_opt(struct chan_call *call, char *data)
                        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);
@@ -464,6 +529,7 @@ void apply_opt(struct chan_call *call, char *data)
                        }
                        CDEBUG(call, call->ast, "Option 'r' (re-buffer 160 bytes)");
                        call->rebuffer = 1;
+                       call->framepos = 0;
                        break;
                case 's':
                        if (opt[1] != '\0') {
@@ -502,7 +568,7 @@ void apply_opt(struct chan_call *call, char *data)
        /* 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);
        }
 }
@@ -543,17 +609,15 @@ static void send_setup_to_lcr(struct chan_call *call)
        }
        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)
        {
@@ -649,21 +713,24 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
 {
        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;
                }
@@ -678,7 +745,7 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
                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) {
@@ -690,7 +757,7 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
                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;
                }
@@ -700,6 +767,12 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
                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:
@@ -717,6 +790,12 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
        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)
        {
@@ -724,11 +803,7 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
                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);
 }
 
 /*
@@ -741,7 +816,15 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
        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 */
@@ -881,7 +964,7 @@ static void lcr_in_connect(struct chan_call *call, int message_type, union param
        memcpy(&call->connectinfo, &param->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);
 }
 
 /*
@@ -1035,6 +1118,34 @@ static void lcr_in_facility(struct chan_call *call, int message_type, union para
 }
 
 /*
+ * 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)
@@ -1120,7 +1231,7 @@ int receive_message(int message_type, unsigned int ref, union parameter *param)
                                        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 */
@@ -1271,6 +1382,8 @@ int receive_message(int message_type, unsigned int ref, union parameter *param)
                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
@@ -1489,6 +1602,10 @@ static int queue_send(void)
                        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);
@@ -1496,8 +1613,9 @@ static int queue_send(void)
                                        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;
@@ -1505,22 +1623,34 @@ static int queue_send(void)
                                                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++;
                                }
@@ -1598,7 +1728,15 @@ static void *chan_thread(void *arg)
                /* 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);
                }
        }
@@ -1645,7 +1783,15 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c
        }
 
        /* 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");
@@ -1710,6 +1856,12 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout)
 
        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);
@@ -1791,13 +1943,21 @@ static void send_digit_to_chan(struct ast_channel * ast, char digit )
         }
 }
 
-
+#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;
@@ -1830,6 +1990,8 @@ static int lcr_digit_begin(struct ast_channel *ast, char digit)
        }
 
        ast_mutex_unlock(&chan_lock);
+
+#ifdef LCR_FOR_ASTERISK
        return(0);
 }
 
@@ -1837,6 +1999,7 @@ static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int durat
 {
        int inband_dtmf = 0;
         struct chan_call *call;
+#endif
 
        ast_mutex_lock(&chan_lock);
 
@@ -1961,6 +2124,7 @@ static int lcr_hangup(struct ast_channel *ast)
                        /* 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))
@@ -1984,7 +2148,7 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *f)
                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;
 }
@@ -2003,28 +2167,50 @@ static struct ast_frame *lcr_read(struct ast_channel *ast)
        }
        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;
@@ -2094,6 +2280,16 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
                                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;
@@ -2111,7 +2307,14 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
                        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:
@@ -2127,8 +2330,7 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
                        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:
@@ -2221,7 +2423,9 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
                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, bridging via DSP.\n");
 
@@ -2352,20 +2556,29 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
 }
 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
 };
 
 
@@ -2459,13 +2672,26 @@ static struct ast_cli_entry cli_port_unload =
 #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) {
@@ -2474,7 +2700,15 @@ static int lcr_config_exec(struct ast_channel *ast, void *data)
                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");
 
@@ -2496,7 +2730,15 @@ int load_module(void)
 
        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);
@@ -2509,7 +2751,14 @@ int load_module(void)
        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;
 
@@ -2518,11 +2767,26 @@ int load_module(void)
                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"
@@ -2530,10 +2794,13 @@ int load_module(void)
                                 "    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"
+                                "    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"
@@ -2557,7 +2824,15 @@ int load_module(void)
                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;
 }
@@ -2594,12 +2869,32 @@ int reload_module(void)
        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