[chan_lcr] Fixed caller ID by clearing ast->cid first
[lcr.git] / chan_lcr.c
index fa37ef6..25515d0 100644 (file)
@@ -21,8 +21,9 @@ Now the channel driver is linked to LCR and can receive and make calls.
 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.
@@ -31,10 +32,12 @@ The state changes to CHAN_LCR_STATE_IN_SETUP.
 
 Call is initiated by Asterisk:
 
-If a call is reveiced from Asterisk, a new chan_call instance is created.
+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.
-A MESSASGE_NEWREF is sent to LCR requesting a new call reference (ref).
 The current call ref is set to 0, the state is CHAN_LCR_STATE_OUT_PREPARE.
+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. 
@@ -56,6 +59,7 @@ Call is released by LCR:
 
 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.
@@ -72,13 +76,40 @@ lcr_hangup() is called-back by Asterisk. If the call reference (ref) is set,
 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
 "Call is released by LCR".
 
+
+Locking issues:
+
+The deadlocking problem:
+
+- chan_lcr locks chan_lock and waits inside ast_queue_xxxx() for ast_channel
+to be unlocked.
+- ast_channel thread locks ast_channel and calls a tech function and waits
+there for chan_lock to be unlocked.
+
+The solution:
+
+Never call ast_queue_xxxx() if ast_channel is not locked and don't wait until
+ast_channel can be locked. All messages to asterisk are queued inside call
+instance and will be handled using a try-lock to get ast_channel lock.
+If it succeeds to lock ast_channel, the ast_queue_xxxx can safely called even
+if the lock is incremented and decremented there.
+
+Exception: Calling ast_queue_frame inside ast->tech->read is safe, because
+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>
@@ -86,6 +117,7 @@ If the ref is 0 and the state is CHAN_LCR_STATE_RELEASE, see the proceedure
 #include <errno.h>
 #include <sys/types.h>
 #include <time.h>
+//#include <signal.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -94,6 +126,16 @@ If the ref is 0 and the state is CHAN_LCR_STATE_RELEASE, see the proceedure
 
 #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>
@@ -108,7 +150,13 @@ If the ref is 0 and the state is CHAN_LCR_STATE_RELEASE, see the proceedure
 #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>
@@ -116,33 +164,61 @@ If the ref is 0 and the state is CHAN_LCR_STATE_RELEASE, see the proceedure
 
 #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"
-#include "callerid.h"
 
 CHAN_LCR_STATE // state description structure
+MESSAGES // message text
 
-u_char flip_bits[256];
+#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 */
+/* global_change:
+ * used to indicate change in file descriptors, so select function's result may
+ * be obsolete.
+ */
+int global_change = 0;
+int wake_global = 0;
+int wake_pipe[2];
+struct lcr_fd wake_fd;
+       
 int quit;
 
 int glob_channel = 0;
 
 int lcr_sock = -1;
+struct lcr_fd socket_fd;
+struct lcr_timer socket_retry;
 
 struct admin_list {
        struct admin_list *next;
-       struct admin_msg msg;
+       struct admin_message msg;
 } *admin_first = NULL;
 
 static struct ast_channel_tech lcr_tech;
@@ -150,7 +226,7 @@ static struct ast_channel_tech lcr_tech;
 /*
  * logging
  */
-void chan_lcr_log(int type, const char *file, int line, struct chan_call *call, struct ast_channel *ast, const char *fmt, ...)
+void chan_lcr_log(int type, const char *file, int line, const char *function, struct chan_call *call, struct ast_channel *ast, const char *fmt, ...)
 {
        char buffer[1024];
        char call_text[128] = "NULL";
@@ -165,12 +241,13 @@ void chan_lcr_log(int type, const char *file, int line, struct chan_call *call,
        va_end(args);
 
        if (call)
-               sprintf(call_text, "%ld", call->ref);
+               sprintf(call_text, "%d", call->ref);
        if (ast)
                strncpy(ast_text, ast->name, sizeof(ast_text)-1);
        ast_text[sizeof(ast_text)-1] = '\0';
-       
-       ast_log(type, file, line, "[call=%s ast=%s] %s", call_text, ast_text, buffer);
+
+//     ast_log(type, file, line, function, "[call=%s ast=%s] %s", call_text, ast_text, buffer);
+       printf("[call=%s ast=%s] %s", call_text, ast_text, buffer);
 
        ast_mutex_unlock(&log_lock);
 }
@@ -180,74 +257,52 @@ void chan_lcr_log(int type, const char *file, int line, struct chan_call *call,
  */
 struct chan_call *call_first;
 
-struct chan_call *find_call_ref(unsigned long 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 long handle)
+struct chan_call *find_call_ref(unsigned int ref)
 {
        struct chan_call *call = call_first;
-
-       while(call)
-       {
-               if (call->bchannel_handle == handle)
+       int assigned = (ref > 0);
+       
+       while(call) {
+               if (call->ref == ref && call->ref_was_assigned == assigned)
                        break;
                call = call->next;
        }
-       return(call);
+       return call;
 }
-#endif
 
 void free_call(struct chan_call *call)
 {
        struct chan_call **temp = &call_first;
 
-       while(*temp)
-       {
-               if (*temp == call)
-               {
+       while(*temp) {
+               if (*temp == call) {
                        *temp = (*temp)->next;
-                       if (call->pipe[0])
+                       if (call->pipe[0] > -1)
                                close(call->pipe[0]);
-                       if (call->pipe[1])
+                       if (call->pipe[1] > -1)
                                close(call->pipe[1]);
-                       if (call->bchannel)
-                       {
+                       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) {
                                if (call->bridge_call->bridge_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);
+                       global_change = 1;
                        return;
                }
                temp = &((*temp)->next);
@@ -262,30 +317,28 @@ struct chan_call *alloc_call(void)
        while(*callp)
                callp = &((*callp)->next);
 
-       *callp = (struct chan_call *)malloc(sizeof(struct chan_call));
+       *callp = (struct chan_call *)calloc(1, sizeof(struct chan_call));
        if (*callp)
                memset(*callp, 0, sizeof(struct chan_call));
        if (pipe((*callp)->pipe) < 0) {
                CERROR(*callp, NULL, "Failed to create pipe.\n");
                free_call(*callp);
-               return(NULL);
+               return NULL;
        }
+       fcntl((*callp)->pipe[0], F_SETFL, O_NONBLOCK);
        CDEBUG(*callp, NULL, "Call instance allocated.\n");
-       return(*callp);
+       return *callp;
 }
 
-
 unsigned short new_bridge_id(void)
 {
        struct chan_call *call;
        unsigned short id = 1;
 
        /* search for lowest bridge id that is not in use and not 0 */
-       while(id)
-       {
+       while(id) {
                call = call_first;
-               while(call)
-               {
+               while(call) {
                        if (call->bridge_id == id)
                                break;
                        call = call->next;
@@ -295,14 +348,13 @@ unsigned short new_bridge_id(void)
                id++;
        }
        CDEBUG(NULL, NULL, "New bridge ID %d.\n", id);
-       return(id);
+       return id;
 }
 
-
 /*
  * enque message to LCR
  */
-int send_message(int message_type, unsigned long ref, union parameter *param)
+int send_message(int message_type, unsigned int ref, union parameter *param)
 {
        struct admin_list *admin, **adminp;
 
@@ -310,19 +362,247 @@ int send_message(int message_type, unsigned long ref, union parameter *param)
                CDEBUG(NULL, NULL, "Ignoring message %d, because socket is closed.\n", message_type);
                return -1;
        }
-       CDEBUG(NULL, NULL, "Sending message %d to socket.\n", message_type);
+       CDEBUG(NULL, NULL, "Sending %s to socket.\n", messages_txt[message_type]);
 
        adminp = &admin_first;
        while(*adminp)
                adminp = &((*adminp)->next);
-       admin = (struct admin_list *)malloc(sizeof(struct admin_list));
+       admin = (struct admin_list *)calloc(1, sizeof(struct admin_list));
+       if (!admin) {
+               CERROR(NULL, NULL, "No memory for message to LCR.\n");
+               return -1;
+       }
        *adminp = admin;
 
-       admin->msg.type = message_type;
-       admin->msg.ref = ref;
-       memcpy(&admin->msg.param, param, sizeof(union parameter));
+       admin->msg.message = ADMIN_MESSAGE;
+       admin->msg.u.msg.type = message_type;
+       admin->msg.u.msg.ref = ref;
+       memcpy(&admin->msg.u.msg.param, param, sizeof(union parameter));
+       socket_fd.when |= LCR_FD_WRITE;
+       if (!wake_global) {
+               wake_global = 1;
+               char byte = 0;
+               write(wake_pipe[1], &byte, 1);
+       }
+
+       return 0;
+}
+
+/*
+ * apply options (in locked state)
+ */
+void apply_opt(struct chan_call *call, char *data)
+{
+       union parameter newparam;
+       char string[1024], *p = string, *opt, *key;
+       int gain, i;
+
+       if (!data[0])
+               return; // no opts
+
+       strncpy(string, data, sizeof(string)-1);
+       string[sizeof(string)-1] = '\0';
 
-       return(0);
+       /* parse options */
+       while((opt = strsep(&p, ":"))) {
+               switch(opt[0]) {
+               case 'd':
+                       if (opt[1] == '\0') {
+                               CERROR(call, call->ast, "Option 'd' (display) expects parameter.\n", opt);
+                               break;
+                       }
+                       CDEBUG(call, call->ast, "Option 'd' (display) with text '%s'.\n", opt+1);
+                       if (call->state == CHAN_LCR_STATE_OUT_PREPARE)
+                               strncpy(call->display, opt+1, sizeof(call->display)-1);
+                       else {
+                               memset(&newparam, 0, sizeof(union parameter));
+                               strncpy(newparam.notifyinfo.display, opt+1, sizeof(newparam.notifyinfo.display)-1);
+                               send_message(MESSAGE_NOTIFY, call->ref, &newparam);
+                       }
+                       break;
+               case 'n':
+                       if (opt[1] != '\0') {
+                               CERROR(call, call->ast, "Option 'n' (no DTMF) expects no parameter.\n", opt);
+                               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);
+                       }
+                       break;
+               case 'c':
+                       if (opt[1] == '\0') {
+                               CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter.\n", opt);
+                               break;
+                       }
+                       key = opt+1;
+                       /* check for 0xXXXX... type of key */
+                       if (!!strncmp((char *)key, "0x", 2)) {
+                               CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter starting with '0x'.\n", opt);
+                               break;
+                       }
+                       key+=2;
+                       if (strlen(key) > 56*2 || (strlen(key) % 1)) {
+                               CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter with max 56 bytes ('0x' + 112 characters)\n", opt);
+                               break;
+                       }
+                       i = 0;
+                       while(*key) {
+                               if (*key>='0' && *key<='9')
+                                       call->bf_key[i] = (*key-'0') << 8;
+                               else if (*key>='a' && *key<='f')
+                                       call->bf_key[i] = (*key-'a'+10) << 8;
+                               else if (*key>='A' && *key<='F')
+                                       call->bf_key[i] = (*key-'A'+10) << 8;
+                               else
+                                       break;
+                               key++;
+                               if (*key>='0' && *key<='9')
+                                       call->bf_key[i] += (*key - '0');
+                               else if (*key>='a' && *key<='f')
+                                       call->bf_key[i] += (*key - 'a' + 10);
+                               else if (*key>='A' && *key<='F')
+                                       call->bf_key[i] += (*key - 'A' + 10);
+                               else
+                                       break;
+                               key++;
+                               i++;
+                       }
+                       if (*key) {
+                               CERROR(call, call->ast, "Option 'c' (encrypt) expects key parameter with hex values 0-9,a-f.\n");
+                               break;
+                       }
+                       call->bf_len = i;
+                       CDEBUG(call, call->ast, "Option 'c' (encrypt) blowfish key '%s' (len=%d).\n", opt+1, i);
+                       if (call->bchannel)
+                               bchannel_blowfish(call->bchannel, call->bf_key, call->bf_len);
+                       break;
+               case 'h':
+                       if (opt[1] != '\0') {
+                               CERROR(call, call->ast, "Option 'h' (HDLC) expects no parameter.\n", opt);
+                               break;
+                       }
+                       CDEBUG(call, call->ast, "Option 'h' (HDLC).\n");
+                       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);
+                       break;
+               case 'e':
+                       if (opt[1] == '\0') {
+                               CERROR(call, call->ast, "Option 'e' (echo cancel) expects parameter.\n", opt);
+                               break;
+                       }
+                       CDEBUG(call, call->ast, "Option 'e' (echo cancel) with config '%s'.\n", opt+1);
+                       strncpy(call->pipeline, opt+1, sizeof(call->pipeline)-1);
+                       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);
+                               break;
+                       }
+                       CDEBUG(call, call->ast, "Option 'r' (re-buffer 160 bytes)");
+                       call->rebuffer = 1;
+                       call->framepos = 0;
+                       break;
+               case 's':
+                       if (opt[1] != '\0') {
+                               CERROR(call, call->ast, "Option 's' (inband DTMF) expects no parameter.\n", opt);
+                               break;
+                       }
+                       CDEBUG(call, call->ast, "Option 's' (inband DTMF).\n");
+                       call->inband_dtmf = 1;
+                       break;
+               case 'v':
+                       if (opt[1] != 'r' && opt[1] != 't') {
+                               CERROR(call, call->ast, "Option 'v' (volume) expects parameter.\n", opt);
+                               break;
+                       }
+                       gain = atoi(opt+2);
+                       if (gain < -8 || gain >8) {
+                               CERROR(call, call->ast, "Option 'v' (volume) expects parameter in range of -8 through 8.\n");
+                               break;
+                       }
+                       CDEBUG(call, call->ast, "Option 'v' (volume) with gain 2^%d.\n", gain);
+                       if (opt[1] == 'r') {
+                               call->rx_gain = gain;
+                               if (call->bchannel)
+                                       bchannel_gain(call->bchannel, call->rx_gain, 0);
+                       } else {
+                               call->tx_gain = gain;
+                               if (call->bchannel)
+                                       bchannel_gain(call->bchannel, call->tx_gain, 1);
+                       }
+                       break;
+               case 'k':
+                       if (opt[1] != '\0') {
+                               CERROR(call, call->ast, "Option 'k' (keypad) expects no parameter.\n", opt);
+                               break;
+                       }
+                       CDEBUG(call, call->ast, "Option 'k' (keypad).\n");
+                       if (!call->keypad)
+                               call->keypad = 1;
+                       break;
+               default:
+                       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);
+       }
 }
 
 /*
@@ -333,42 +613,47 @@ static void send_setup_to_lcr(struct chan_call *call)
 {
        union parameter newparam;
        struct ast_channel *ast = call->ast;
+//     const char *tmp;
 
        if (!call->ast || !call->ref)
                return;
 
-       CDEBUG(call, call->ast, "Sending setup to LCR.\n");
+       CDEBUG(call, call->ast, "Sending setup to LCR. (interface=%s dialstring=%s, cid=%s)\n", call->interface, call->dialstring, call->cid_num);
 
        /* send setup message to LCR */
        memset(&newparam, 0, sizeof(union parameter));
+               newparam.setup.dialinginfo.itype = INFO_ITYPE_ISDN;     
+               newparam.setup.dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
+       if (call->keypad)
+               strncpy(newparam.setup.dialinginfo.keypad, call->dialstring, sizeof(newparam.setup.dialinginfo.keypad)-1);
+       else
+               strncpy(newparam.setup.dialinginfo.id, call->dialstring, sizeof(newparam.setup.dialinginfo.id)-1);
+       strncpy(newparam.setup.dialinginfo.interfaces, call->interface, sizeof(newparam.setup.dialinginfo.interfaces)-1);
                newparam.setup.callerinfo.itype = INFO_ITYPE_CHAN;      
-               newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;   
-       if (ast->cid.cid_num) if (ast->cid.cid_num[0])
-               strncpy(newparam.setup.callerinfo.id, ast->cid.cid_num, sizeof(newparam.setup.callerinfo.id)-1);
-       if (ast->cid.cid_name) if (ast->cid.cid_name[0])
-               strncpy(newparam.setup.callerinfo.name, ast->cid.cid_name, sizeof(newparam.setup.callerinfo.name)-1);
-       if (ast->cid.cid_rdnis) if (ast->cid.cid_rdnis[0])
-       {
-               strncpy(newparam.setup.redirinfo.id, ast->cid.cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1);
+               newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
+       strncpy(newparam.setup.callerinfo.display, call->display, sizeof(newparam.setup.callerinfo.display)-1);
+       call->display[0] = '\0';
+       if (call->cid_num[0])
+               strncpy(newparam.setup.callerinfo.id, call->cid_num, sizeof(newparam.setup.callerinfo.id)-1);
+       if (call->cid_name[0])
+               strncpy(newparam.setup.callerinfo.name, call->cid_name, sizeof(newparam.setup.callerinfo.name)-1);
+       if (call->cid_rdnis[0]) {
+               strncpy(newparam.setup.redirinfo.id, call->cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1);
                        newparam.setup.redirinfo.itype = INFO_ITYPE_CHAN;       
                newparam.setup.redirinfo.ntype = INFO_NTYPE_UNKNOWN;    
        }
-       switch(ast->cid.cid_pres & AST_PRES_RESTRICTION)
-       {
-               case AST_PRES_ALLOWED:
-               newparam.setup.callerinfo.present = INFO_PRESENT_ALLOWED;
-               break;
+       switch(ast->cid.cid_pres & AST_PRES_RESTRICTION) {
                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)
-       {
+       switch(ast->cid.cid_ton) {
                case 4:
                newparam.setup.callerinfo.ntype = INFO_NTYPE_SUBSCRIBER;
                break;
@@ -381,12 +666,18 @@ static void send_setup_to_lcr(struct chan_call *call)
                default:
                newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
        }
+#warning DISABLED DUE TO DOUBLE LOCKING PROBLEM
+//     tmp = pbx_builtin_getvar_helper(ast, "LCR_TRANSFERCAPABILITY");
+//     if (tmp && *tmp)
+//             ast->transfercapability = atoi(tmp);
        newparam.setup.capainfo.bearer_capa = ast->transfercapability;
-#ifdef TODO
-       newparam.setup.capainfo.bearer_info1 = alaw 3, ulaw 2;
-#endif
-       newparam.setup.capainfo.bearer_info1 = 3;
        newparam.setup.capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
+       if (call->hdlc)
+               newparam.setup.capainfo.source_mode = B_MODE_HDLC;
+       else {
+               newparam.setup.capainfo.source_mode = B_MODE_TRANSPARENT;
+               newparam.setup.capainfo.bearer_info1 = (options.law=='a')?3:2;
+       }
        newparam.setup.capainfo.hlc = INFO_HLC_NONE;
        newparam.setup.capainfo.exthlc = INFO_HLC_NONE;
        send_message(MESSAGE_SETUP, call->ref, &newparam);
@@ -404,14 +695,17 @@ static void send_dialque_to_lcr(struct chan_call *call)
 {
        union parameter newparam;
 
-       if (!call->ast || !call->ref || !call->dialque)
+       if (!call->ast || !call->ref || !call->dialque[0])
                return;
        
-       CDEBUG(call, call->ast, "Sending dial queue to LCR.\n");
+       CDEBUG(call, call->ast, "Sending dial queue to LCR. (dialing=%s)\n", call->dialque);
 
        /* send setup message to LCR */
        memset(&newparam, 0, sizeof(union parameter));
-       strncpy(newparam.information.id, call->dialque, sizeof(newparam.information.id)-1);
+       if (call->keypad)
+               strncpy(newparam.information.keypad, call->dialque, sizeof(newparam.information.keypad)-1);
+       else
+               strncpy(newparam.information.id, call->dialque, sizeof(newparam.information.id)-1);
        call->dialque[0] = '\0';
        send_message(MESSAGE_INFORMATION, call->ref, &newparam);
 }
@@ -425,11 +719,32 @@ static void bridge_message_if_bridged(struct chan_call *call, int message_type,
        /* 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);
 }
 
 /*
+ * send release message to LCR and import bchannel if exported
+ */
+static void send_release_and_import(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;
+       newparam.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+       send_message(MESSAGE_RELEASE, call->ref, &newparam);
+}
+
+/*
  * check if extension matches and start asterisk
  * if it can match, proceed
  * if not, release
@@ -438,19 +753,21 @@ 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";
 
-       if (complete)
-       {
+       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))
-               {
-                       CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at context '%s' - releasing.\n", ast->exten, ast->context);
+               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);
                        cause = 1;
                        goto release;
                }
-               if (!ast_exists_extension(ast, ast->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", ast->exten, ast->context);
+               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);
                        cause = 28;
                        goto release;
                }
@@ -465,17 +782,18 @@ 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 */
-               memset(&newparam, 0, sizeof(union parameter));
-               send_message(MESSAGE_OVERLAP, call->ref, &newparam);
+               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 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;
                }
@@ -485,15 +803,18 @@ 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:
        /* release lcr */
        CDEBUG(call, ast, "Releasing due to extension missmatch.\n");
-       memset(&newparam, 0, sizeof(union parameter));
-       newparam.disconnectinfo.cause = cause;
-       newparam.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
-       send_message(MESSAGE_RELEASE, call->ref, &newparam);
+       send_release_and_import(call, cause, LOCATION_PRIVATE_LOCAL);
        call->ref = 0;
        /* release asterisk */
        ast->hangupcause = call->cause;
@@ -505,14 +826,19 @@ 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)
-       {
+       if (ret < 0) {
                cause = (ret==-2)?34:27;
                goto release;
        }
        call->pbx_started = 1;
-       return;
+               ast_setstate(ast, AST_STATE_RING);
 }
 
 /*
@@ -521,25 +847,28 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
 static void lcr_in_setup(struct chan_call *call, int message_type, union parameter *param)
 {
        struct ast_channel *ast;
-       union parameter newparam;
 
-       CDEBUG(call, NULL, "Incomming setup from LCR. (callerid %d, dialing %d)\n", param->setup.callerinfo.id, param->setup.dialinginfo.id);
+       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);
-       if (!ast)
-       {
+       #endif
+       
+       if (!ast) {
                /* release */
                CERROR(call, NULL, "Failed to create Asterisk channel - releasing.\n");
-               memset(&newparam, 0, sizeof(union parameter));
-               newparam.disconnectinfo.cause = CAUSE_RESSOURCEUNAVAIL;
-               newparam.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
-               send_message(MESSAGE_RELEASE, call->ref, &newparam);
+               send_release_and_import(call, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL);
                /* remove call */
                free_call(call);
                return;
        }
-       /* set ast pointer */
+       /* link together */
        call->ast = ast;
        ast->tech_pvt = call;
        ast->tech = &lcr_tech;
@@ -550,16 +879,18 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
                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);
+       memset(&ast->cid, 0, sizeof(ast->cid));
        if (param->setup.callerinfo.id[0])
                ast->cid.cid_num = strdup(param->setup.callerinfo.id);
+       if (param->setup.callerinfo.id2[0])
+               ast->cid.cid_ani = strdup(param->setup.callerinfo.id2);
        if (param->setup.callerinfo.name[0])
                ast->cid.cid_name = strdup(param->setup.callerinfo.name);
-#ifdef TODO
        if (param->setup.redirinfo.id[0])
-               ast->cid.cid_name = strdup(numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, configfile->prefix_nat, configfile->prefix_inter));
-#endif
-       switch (param->setup.callerinfo.present)
-       {
+               ast->cid.cid_rdnis = strdup(numberrize_callerinfo(param->setup.redirinfo.id, param->setup.redirinfo.ntype, options.national, options.international));
+       switch (param->setup.callerinfo.present) {
                case INFO_PRESENT_ALLOWED:
                        ast->cid.cid_pres = AST_PRES_ALLOWED;
                break;
@@ -569,8 +900,7 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
                default:
                        ast->cid.cid_pres = AST_PRES_UNAVAILABLE;
        }
-       switch (param->setup.callerinfo.ntype)
-       {
+       switch (param->setup.callerinfo.ntype) {
                case INFO_NTYPE_SUBSCRIBER:
                        ast->cid.cid_ton = 4;
                break;
@@ -584,28 +914,23 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
                        ast->cid.cid_ton = 0;
        }
        ast->transfercapability = param->setup.capainfo.bearer_capa;
-#ifdef TODO
-       strncpy(call->oad, numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, configfile->prefix_nat, configfile->prefix_inter), sizeof(call->oad)-1);
-#else
-       strncpy(call->oad, numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, "0", "00"), sizeof(call->oad)-1);
-#endif
+       /* enable hdlc if transcap is data */
+       if (param->setup.capainfo.source_mode == B_MODE_HDLC)
+               call->hdlc = 1;
+       strncpy(call->oad, numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, options.national, options.international), sizeof(call->oad)-1);
 
        /* configure channel */
-#ifdef TODO
-       ast->nativeformats = configfile->lawformat;
-       ast->readformat = ast->rawreadformat = configfile->lawformat;
-       ast->writeformat = ast->rawwriteformat = configfile->lawformat;
-#else
-       ast->nativeformats = AST_FORMAT_ALAW;
-       ast->readformat = ast->rawreadformat = AST_FORMAT_ALAW;
-       ast->writeformat = ast->rawwriteformat = AST_FORMAT_ALAW;
-#endif
+       ast->nativeformats = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
+       ast->readformat = ast->rawreadformat = ast->nativeformats;
+       ast->writeformat = ast->rawwriteformat =  ast->nativeformats;
+       ast->priority = 1;
        ast->hangupcause = 0;
 
        /* change state */
        call->state = CHAN_LCR_STATE_IN_SETUP;
 
-       lcr_start_pbx(call, ast, param->setup.dialinginfo.sending_complete);
+       if (!call->pbx_started)
+               lcr_start_pbx(call, ast, param->setup.dialinginfo.sending_complete);
 }
 
 /*
@@ -618,7 +943,7 @@ static void lcr_in_overlap(struct chan_call *call, int message_type, union param
        CDEBUG(call, call->ast, "Incomming setup acknowledge from LCR.\n");
 
        /* send pending digits in dialque */
-       if (call->dialque)
+       if (call->dialque[0])
                send_dialque_to_lcr(call);
        /* change to overlap state */
        call->state = CHAN_LCR_STATE_OUT_DIALING;
@@ -633,9 +958,16 @@ static void lcr_in_proceeding(struct chan_call *call, int message_type, union pa
 
        /* change state */
        call->state = CHAN_LCR_STATE_OUT_PROCEEDING;
-       /* send event to asterisk */
-       if (call->ast && call->pbx_started)
-               ast_queue_control(call->ast, AST_CONTROL_PROCEEDING);
+       /* queue event for asterisk */
+       if (call->ast && call->pbx_started) {
+               if (!wake_global) {
+                       wake_global = 1;
+                       char byte = 0;
+                       write(wake_pipe[1], &byte, 1);
+               }
+               strncat(call->queue_string, "P", sizeof(call->queue_string)-1);
+       }
+
 }
 
 /*
@@ -647,9 +979,15 @@ static void lcr_in_alerting(struct chan_call *call, int message_type, union para
 
        /* change state */
        call->state = CHAN_LCR_STATE_OUT_ALERTING;
-       /* send event to asterisk */
-       if (call->ast && call->pbx_started)
-               ast_queue_control(call->ast, AST_CONTROL_RINGING);
+       /* queue event to asterisk */
+       if (call->ast && call->pbx_started) {
+               if (!wake_global) {
+                       wake_global = 1;
+                       char byte = 0;
+                       write(wake_pipe[1], &byte, 1);
+               }
+               strncat(call->queue_string, "R", sizeof(call->queue_string)-1);
+       }
 }
 
 /*
@@ -657,15 +995,30 @@ static void lcr_in_alerting(struct chan_call *call, int message_type, union para
  */
 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.\n");
+               memset(&newparam, 0, sizeof(union parameter));
+               newparam.bchannel.type = BCHANNEL_REQUEST;
+               send_message(MESSAGE_BCHANNEL, call->ref, &newparam);
+       }
        /* copy connectinfo */
        memcpy(&call->connectinfo, &param->connectinfo, sizeof(struct connect_info));
-       /* send event to asterisk */
-       if (call->ast && call->pbx_started)
-               ast_queue_control(call->ast, AST_CONTROL_ANSWER);
+       /* queue event to asterisk */
+       if (call->ast && call->pbx_started) {
+               if (!wake_global) {
+                       wake_global = 1;
+                       char byte = 0;
+                       write(wake_pipe[1], &byte, 1);
+               }
+               strncat(call->queue_string, "N", sizeof(call->queue_string)-1);
+       }
 }
 
 /*
@@ -685,60 +1038,65 @@ static void lcr_in_disconnect(struct chan_call *call, int message_type, union pa
        /* if bridge, forward disconnect and return */
 #ifdef TODO
        feature flag
-       if (call->bridge_call)
-       {
+       if (call->bridge_call) {
                CDEBUG(call, call->ast, "Only signal disconnect via bridge.\n");
                bridge_message_if_bridged(call, message_type, param);
                return;
        }
 #endif
        /* release lcr with same cause */
-       send_message(MESSAGE_RELEASE, call->ref, param);
+       send_release_and_import(call, call->cause, call->location);
        call->ref = 0;
        /* change to release state */
        call->state = CHAN_LCR_STATE_RELEASE;
-       /* release asterisk */
-       if (ast)
-       {
+       /* queue release asterisk */
+       if (ast) {
                ast->hangupcause = call->cause;
-               if (call->pbx_started)
-                       ast_queue_hangup(ast);
-               else {
+               if (call->pbx_started) {
+                       if (!wake_global) {
+                               wake_global = 1;
+                               char byte = 0;
+                               write(wake_pipe[1], &byte, 1);
+                       }
+                       strcpy(call->queue_string, "H"); // overwrite other indications
+               } else {
                        ast_hangup(ast); // call will be destroyed here
                }
        }
 }
 
 /*
- * incoming setup acknowledge from LCR
+ * incoming release from LCR
  */
 static void lcr_in_release(struct chan_call *call, int message_type, union parameter *param)
 {
        struct ast_channel *ast = call->ast;
 
-       CDEBUG(call, call->ast, "Incomming release from LCR. (cause=%d)\n", param->disconnectinfo.cause);
+       CDEBUG(call, call->ast, "Incomming release from LCR, releasing ref. (cause=%d)\n", param->disconnectinfo.cause);
 
        /* release ref */
        call->ref = 0;
        /* change to release state */
        call->state = CHAN_LCR_STATE_RELEASE;
        /* copy release info */
-       if (!call->cause)
-       {
+       if (!call->cause) {
               call->cause = param->disconnectinfo.cause;
               call->location = param->disconnectinfo.location;
        }
-       /* if we have an asterisk instance, send hangup, else we are done */
-       if (ast)
-       {
+       /* if we have an asterisk instance, queue hangup, else we are done */
+       if (ast) {
                ast->hangupcause = call->cause;
-               if (call->pbx_started)
-                       ast_queue_hangup(ast);
-               else {
+               if (call->pbx_started) {
+                       if (!wake_global) {
+                               wake_global = 1;
+                               char byte = 0;
+                               write(wake_pipe[1], &byte, 1);
+                       }
+                       strcpy(call->queue_string, "H");
+               } else {
                        ast_hangup(ast); // call will be destroyed here
                }
-       } else
-       {
+       } else {
                free_call(call);
        }
        
@@ -750,41 +1108,39 @@ static void lcr_in_release(struct chan_call *call, int message_type, union param
 static void lcr_in_information(struct chan_call *call, int message_type, union parameter *param)
 {
        struct ast_channel *ast = call->ast;
-       struct ast_frame fr;
-       char *p;
 
-       CDEBUG(call, call->ast, "Incomming information from LCR. (dialing=%d)\n", param->information.id);
+       CDEBUG(call, call->ast, "Incoming information from LCR. (dialing=%s)\n", param->information.id);
        
        if (!ast) return;
 
        /* pbx not started */
-       if (!call->pbx_started)
-       {
+       if (!call->pbx_started) {
                CDEBUG(call, call->ast, "Asterisk not started, adding digits to number.\n");
                strncat(ast->exten, param->information.id, AST_MAX_EXTENSION-1);
                lcr_start_pbx(call, ast, param->information.sending_complete);
                return;
        }
        
-       /* copy digits */
-       p = param->information.id;
-       if (call->state == CHAN_LCR_STATE_IN_DIALING && *p)
-       {
-               CDEBUG(call, call->ast, "Asterisk is started, sending DTMF frame.\n");
-               while (*p)
-               {
-                       /* send digit to asterisk */
-                       memset(&fr, 0, sizeof(fr));
-                       fr.frametype = AST_FRAME_DTMF;
-                       fr.subclass = *p;
-                       fr.delivery = ast_tv(0, 0);
-                       ast_queue_frame(call->ast, &fr);
-                       p++;
+       /* change dailing state after setup */
+       if (call->state == CHAN_LCR_STATE_IN_SETUP) {
+               CDEBUG(call, call->ast, "Changing from SETUP to DIALING state.\n");
+               call->state = CHAN_LCR_STATE_IN_DIALING;
+//             ast_setstate(ast, AST_STATE_DIALING);
+       }
+       
+       /* queue digits */
+       if (call->state == CHAN_LCR_STATE_IN_DIALING && param->information.id[0]) {
+               if (!wake_global) {
+                       wake_global = 1;
+                       char byte = 0;
+                       write(wake_pipe[1], &byte, 1);
                }
+               strncat(call->queue_string, param->information.id, sizeof(call->queue_string)-1);
        }
+
        /* 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);
        }
 }
@@ -794,8 +1150,18 @@ static void lcr_in_information(struct chan_call *call, int message_type, union p
  */
 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.\n");
+               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 */
@@ -816,80 +1182,149 @@ static void lcr_in_facility(struct chan_call *call, int message_type, union para
 }
 
 /*
- * message received from LCR
+ * incoming pattern from LCR
  */
-int receive_message(int message_type, unsigned long ref, union parameter *param)
+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) {
+               if (!wake_global) {
+                       wake_global = 1;
+                       char byte = 0;
+                       write(wake_pipe[1], &byte, 1);
+               }
+               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)
+{
+       struct ast_channel *ast = call->ast;
+       char digit[2];
+
+       if (!ast)
+               return;
+       if (!call->pbx_started)
+               return;
+
+       if (!call->dsp_dtmf) {
+               CDEBUG(call, call->ast, "Recognised DTMF digit '%c', but ignoring. This is fixed in later mISDN driver.\n", val);
+               return;
+       }
+
+       CDEBUG(call, call->ast, "Recognised DTMF digit '%c'.\n", val);
+       digit[0] = val;
+       digit[1] = '\0';
+       if (!wake_global) {
+               wake_global = 1;
+               char byte = 0;
+               write(wake_pipe[1], &byte, 1);
+       }
+       strncat(call->queue_string, digit, sizeof(call->queue_string)-1);
+}
+
+/*
+ * message received from LCR
+ */
+int receive_message(int message_type, unsigned int ref, union parameter *param)
+{
        struct bchannel *bchannel;
        struct chan_call *call;
+       union parameter newparam;
 
        memset(&newparam, 0, sizeof(union parameter));
 
        /* handle bchannel message*/
-       if (message_type == MESSAGE_BCHANNEL)
-       {
-               switch(param->bchannel.type)
-               {
+       if (message_type == MESSAGE_BCHANNEL) {
+               switch(param->bchannel.type) {
                        case BCHANNEL_ASSIGN:
-                       CDEBUG(NULL, NULL, "Received BCHANNEL_ASSIGN message. (handle=%08lx)\n", param->bchannel.handle);
-                       if ((bchannel = find_bchannel_handle(param->bchannel.handle)))
-                       {
+                       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);
+                               return -1;
                        }
                        /* create bchannel */
                        bchannel = alloc_bchannel(param->bchannel.handle);
-                       if (!bchannel)
-                       {
+                       if (!bchannel) {
                                CERROR(NULL, NULL, "alloc bchannel handle %x failed.\n", (int)param->bchannel.handle);
-                               return(-1);
+                               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)
-                       {
-                               bchannel->b_crypt_len = param->bchannel.crypt_len;
-                               bchannel->b_crypt_type = param->bchannel.crypt_type;
-                               memcpy(bchannel->b_crypt_key, param->bchannel.crypt, param->bchannel.crypt_len);
+                       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_dtmf = 1;
                        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 */
-                       if ((call = find_call_ref(ref)))
-                       {
+                       call = find_call_ref(ref);
+                       if (call) {
                                bchannel->call = call;
                                call->bchannel = bchannel;
-#ifdef TODO
-hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor dem b-kanal verfügbar waren
-#endif
+                               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);
                                }
+                               /* 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);
                        }
-                       if (bchannel_create(bchannel))
-                               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)))
-                       {
+                       if (!(bchannel = find_bchannel_handle(param->bchannel.handle))) {
                                CERROR(NULL, NULL, "Bchannel handle %x not assigned.\n", (int)param->bchannel.handle);
-                               return(-1);
+                               return -1;
                        }
                        /* unklink from call and destroy bchannel */
                        free_bchannel(bchannel);
@@ -904,20 +1339,17 @@ hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor de
                        default:
                        CDEBUG(NULL, NULL, "Received unknown bchannel message %d.\n", param->bchannel.type);
                }
-               return(0);
+               return 0;
        }
 
        /* handle new ref */
-       if (message_type == MESSAGE_NEWREF)
-       {
-               if (param->direction)
-               {
+       if (message_type == MESSAGE_NEWREF) {
+               if (param->direction) {
                        /* new ref from lcr */
-                       CDEBUG(NULL, NULL, "Received new ref by LCR, of call from LCR. (ref=%ld)\n", ref);
-                       if (!ref || find_call_ref(ref))
-                       {
+                       CDEBUG(NULL, NULL, "Received new ref by LCR, due to incomming call. (ref=%ld)\n", ref);
+                       if (!ref || find_call_ref(ref)) {
                                CERROR(NULL, NULL, "Illegal new ref %ld received.\n", ref);
-                               return(-1);
+                               return -1;
                        }
                        /* allocate new call instance */
                        call = alloc_call();
@@ -925,65 +1357,57 @@ hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor de
                        call->state = CHAN_LCR_STATE_IN_PREPARE;
                        /* set ref */
                        call->ref = ref;
+                       call->ref_was_assigned = 1;
+                       /* set dtmf (default, use option 'n' to disable */
+                       call->dsp_dtmf = 1;
                        /* wait for setup (or release from asterisk) */
-               } else
-               {
+               } else {
                        /* new ref, as requested from this remote application */
                        CDEBUG(NULL, NULL, "Received new ref by LCR, as requested from chan_lcr. (ref=%ld)\n", ref);
                        call = find_call_ref(0);
-                       if (!call)
-                       {
+                       if (!call) {
                                /* send release, if ref does not exist */
                                CDEBUG(NULL, NULL, "No call found, that requests a ref.\n");
-                               newparam.disconnectinfo.cause = CAUSE_NORMAL;
-                               newparam.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
-                               send_message(MESSAGE_RELEASE, ref, &newparam);
-                               return(0);
+                               send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
+                               return 0;
                        }
                        /* store new ref */
                        call->ref = ref;
+                       call->ref_was_assigned = 1;
+                       /* set dtmf (default, use option 'n' to disable */
+                       call->dsp_dtmf = 1;
                        /* send pending setup info */
                        if (call->state == CHAN_LCR_STATE_OUT_PREPARE)
                                send_setup_to_lcr(call);
                        /* release if asterisk has signed off */
-                       else if (call->state == CHAN_LCR_STATE_RELEASE)
-                       {
+                       else if (call->state == CHAN_LCR_STATE_RELEASE) {
                                /* send release */
                                if (call->cause)
-                               {
-                                       newparam.disconnectinfo.cause = call->cause;
-                                       newparam.disconnectinfo.location = call->location;
-                               } else
-                               {
-                                       newparam.disconnectinfo.cause = 16;
-                                       newparam.disconnectinfo.location = 5;
-                               }
-                               send_message(MESSAGE_RELEASE, ref, &newparam);
+                                       send_release_and_import(call, call->cause, call->location);
+                               else
+                                       send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
                                /* free call */
                                free_call(call);
-                               return(0);
+                               return 0;
                        }
                }
-               return(0);
+               return 0;
        }
 
        /* check ref */
-       if (!ref)
-       {
+       if (!ref) {
                CERROR(NULL, NULL, "Received message %d without ref.\n", message_type);
-               return(-1);
+               return -1;
        }
        call = find_call_ref(ref);
-       if (!call)
-       {
+       if (!call) {
                /* ignore ref that is not used (anymore) */
                CDEBUG(NULL, NULL, "Message %d from LCR ignored, because no call instance found.\n", message_type);
-               return(0);
+               return 0;
        }
 
        /* handle messages */
-       switch(message_type)
-       {
+       switch(message_type) {
                case MESSAGE_SETUP:
                lcr_in_setup(call, message_type, param);
                break;
@@ -1025,6 +1449,8 @@ hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor de
                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
@@ -1038,7 +1464,7 @@ hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor de
                CDEBUG(call, call->ast, "Message %d from LCR unhandled.\n", message_type);
                break;
        }
-       return(0);
+       return 0;
 }
 
 /*
@@ -1050,8 +1476,7 @@ static void release_all_calls(void)
 
 again:
        call = call_first;
-       while(call)
-       {
+       while(call) {
                /* no ast, so we may directly free call */
                if (!call->ast) {
                        CDEBUG(call, NULL, "Freeing call, because no Asterisk channel is linked.\n");
@@ -1066,94 +1491,94 @@ again:
                /* release or queue release */
                call->ref = 0;
                call->state = CHAN_LCR_STATE_RELEASE;
-               if (!call->pbx_started)
-               {
+               if (!call->pbx_started) {
                        CDEBUG(call, call->ast, "Releasing call, because no Asterisk channel is not started.\n");
                        ast_hangup(call->ast); // call will be destroyed here
                        goto again;
                }
                CDEBUG(call, call->ast, "Queue call release, because Asterisk channel is running.\n");
-               ast_queue_hangup(call->ast);
+               if (!wake_global) {
+                       wake_global = 1;
+                       char byte = 0;
+                       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);
 
 /* asterisk handler
  * warning! not thread safe
  * returns -1 for socket error, 0 for no work, 1 for work
  */
-int handle_socket(void)
+static int handle_socket(struct lcr_fd *fd, unsigned int what, void *instance, int index)
 {
-       int work = 0;
        int len;
-       struct admin_message msg;
        struct admin_list *admin;
+       struct admin_message msg;
 
-       int sock;
-
-       /* read from socket */
-       len = read(sock, &msg, sizeof(msg));
-       if (len == 0)
-       {
-               CERROR(NULL, NULL, "Socket closed.\n");
-               return(-1); // socket closed
-       }
-       if (len > 0)
-       {
-               if (len != sizeof(msg))
-               {
-                       CERROR(NULL, NULL, "Socket short read. (len %d)\n", len);
-                       return(-1); // socket error
-               }
-               if (msg.message != ADMIN_MESSAGE)
-               {
-                       CERROR(NULL, NULL, "Socket received illegal message %d.\n", msg.message);
-                       return(-1); // socket error
+       if ((what & LCR_FD_READ)) {
+               /* read from socket */
+               len = read(lcr_sock, &msg, sizeof(msg));
+               if (len == 0) {
+                       CERROR(NULL, NULL, "Socket closed.\n");
+                       error:
+                       CERROR(NULL, NULL, "Handling of socket failed - closing for some seconds.\n");
+                       close_socket();
+                       release_all_calls();
+                       schedule_timer(&socket_retry, SOCKET_RETRY_TIMER, 0);
+                       return 0;
                }
-               receive_message(msg.u.msg.type, msg.u.msg.ref, &msg.u.msg.param);
-               work = 1;
-       } else
-       {
-               if (errno != EWOULDBLOCK)
-               {
+               if (len > 0) {
+                       if (len != sizeof(msg)) {
+                               CERROR(NULL, NULL, "Socket short read. (len %d)\n", len);
+                               goto error;
+                       }
+                       if (msg.message != ADMIN_MESSAGE) {
+                               CERROR(NULL, NULL, "Socket received illegal message %d.\n", msg.message);
+                               goto error;
+                       }
+                       receive_message(msg.u.msg.type, msg.u.msg.ref, &msg.u.msg.param);
+               } else {
                        CERROR(NULL, NULL, "Socket failed (errno %d).\n", errno);
-                       return(-1);
+                       goto error;
                }
        }
 
-       /* write to socket */
-       if (!admin_first)
-               return(work);
-       admin = admin_first;
-       len = write(sock, &admin->msg, sizeof(msg));
-       if (len == 0)
-       {
-               CERROR(NULL, NULL, "Socket closed.\n");
-               return(-1); // socket closed
-       }
-       if (len > 0)
-       {
-               if (len != sizeof(msg))
-               {
-                       CERROR(NULL, NULL, "Socket short write. (len %d)\n", len);
-                       return(-1); // socket error
+       if ((what & LCR_FD_WRITE)) {
+               /* write to socket */
+               if (!admin_first) {
+                       socket_fd.when &= ~LCR_FD_WRITE;
+                       return 0;
                }
-               /* free head */
-               admin_first = admin->next;
-               free(admin);
-
-               work = 1;
-       } else
-       {
-               if (errno != EWOULDBLOCK)
-               {
+               admin = admin_first;
+               len = write(lcr_sock, &admin->msg, sizeof(msg));
+               if (len == 0) {
+                       CERROR(NULL, NULL, "Socket closed.\n");
+                       goto error;
+               }
+               if (len > 0) {
+                       if (len != sizeof(msg)) {
+                               CERROR(NULL, NULL, "Socket short write. (len %d)\n", len);
+                               goto error;
+                       }
+                       /* free head */
+                       admin_first = admin->next;
+                       free(admin);
+                       global_change = 1;
+               } else {
                        CERROR(NULL, NULL, "Socket failed (errno %d).\n", errno);
-                       return(-1);
+                       goto error;
                }
        }
 
-       return(work);
+       return 0;
 }
 
 /*
@@ -1161,114 +1586,212 @@ int handle_socket(void)
  */
 int open_socket(void)
 {
-       int ret;
-       int sock;
-       char *socket_name = SOCKET_NAME;
        int conn;
        struct sockaddr_un sock_address;
-       unsigned long on = 1;
        union parameter param;
 
        /* open socket */
-       if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
-       {
+       if ((lcr_sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
                CERROR(NULL, NULL, "Failed to create socket.\n");
-               return(sock);
+               return lcr_sock;
        }
 
        /* set socket address and name */
        memset(&sock_address, 0, sizeof(sock_address));
        sock_address.sun_family = PF_UNIX;
-       strcpy(sock_address.sun_path, socket_name);
+       sprintf(sock_address.sun_path, SOCKET_NAME, options.lock);
 
        /* connect socket */
-       if ((conn = connect(sock, (struct sockaddr *)&sock_address, SUN_LEN(&sock_address))) < 0)
-       {
-               close(sock);
-               CERROR(NULL, NULL, "Failed to connect to socket '%s'. Is LCR running?\n", sock_address.sun_path);
-               return(conn);
+       if ((conn = connect(lcr_sock, (struct sockaddr *)&sock_address, SUN_LEN(&sock_address))) < 0) {
+               close(lcr_sock);
+               lcr_sock = -1;
+               CDEBUG(NULL, NULL, "Failed to connect to socket '%s'. Is LCR running?\n", sock_address.sun_path);
+               return conn;
        }
 
-       /* set non-blocking io */
-       if ((ret = ioctl(sock, FIONBIO, (unsigned char *)(&on))) < 0)
-       {
-               close(sock);
-               CERROR(NULL, NULL, "Failed to set socket into non-blocking IO.\n");
-               return(ret);
-       }
+       /* register socket fd */
+       memset(&socket_fd, 0, sizeof(socket_fd));
+       socket_fd.fd = lcr_sock;
+       register_fd(&socket_fd, LCR_FD_READ | LCR_FD_EXCEPT, handle_socket, NULL, 0);
 
        /* enque hello message */
        memset(&param, 0, sizeof(param));
        strcpy(param.hello.application, "asterisk");
        send_message(MESSAGE_HELLO, 0, &param);
 
-       return(sock);
+       return lcr_sock;
 }
 
-void close_socket(int sock)
+void close_socket(void)
 {
+       struct admin_list *admin, *temp;
+
+       unregister_fd(&socket_fd);
+
+       /* flush pending messages */
+       admin = admin_first;
+       while(admin) {
+               temp = admin;
+               admin = admin->next;
+               free(temp);
+       }
+       admin_first = NULL;
+
        /* close socket */
-       if (socket >= 0)        
-               close(sock);
+       if (lcr_sock >= 0)      
+               close(lcr_sock);
+       lcr_sock = -1;
+       global_change = 1;
 }
 
-static void *chan_thread(void *arg)
+
+/* sending queue to asterisk */
+static int wake_event(struct lcr_fd *fd, unsigned int what, void *instance, int index)
 {
-       int work;
-       int ret;
-       union parameter param;
-       time_t retry = 0, now;
+       char byte;
 
-       bchannel_pid = getpid();
-       
-       memset(&param, 0, sizeof(union parameter));
-       if (lcr_sock > 0)
-               time(&retry);
+       read(wake_pipe[0], &byte, 1);
 
-       ast_mutex_lock(&chan_lock);
+       wake_global = 0;
 
-       while(!quit) {
-               work = 0;
-
-               if (lcr_sock > 0) {
-                       /* handle socket */
-                       ret = handle_socket();
-                       if (ret < 0) {
-                               CERROR(NULL, NULL, "Handling of socket failed - closing for some seconds.\n");
-                               close_socket(lcr_sock);
-                               lcr_sock = -1;
-                               release_all_calls();
-                               time(&retry);
+       return 0;
+}
+
+static void handle_queue()
+{
+       struct chan_call *call;
+       struct ast_channel *ast;
+       struct ast_frame fr;
+       char *p;
+
+again:
+       call = call_first;
+       while(call) {
+               p = call->queue_string;
+               ast = call->ast;
+               if (*p && ast) {
+                       if (ast_channel_trylock(ast)) {
+                               ast_mutex_unlock(&chan_lock);
+                               usleep(1);
+                               ast_mutex_lock(&chan_lock);
+                               goto again;
                        }
-                       if (ret)
-                               work = 1;
-               } else {
-                       time(&now);
-                       if (retry && now-retry > 5) {
-                               CERROR(NULL, NULL, "Retry to open socket.\n");
-                               retry = 0;
-                               if (!(lcr_sock = open_socket())) {
-                                       time(&retry);
+                       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);
+                                       break;
+                               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 'N':
+                                       CDEBUG(call, ast, "Sending queued ANSWER to Asterisk.\n");
+                                       ast_queue_control(ast, AST_CONTROL_ANSWER);
+                                       break;
+                               case 'H':
+                                       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':
+                                       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%02x.\n", *p);
                                }
-                               work = 1;
+                               p++;
                        }
-                                       
+                       call->queue_string[0] = '\0';
+                       ast_channel_unlock(ast);
                }
+               call = call->next;
+       }
+}
 
-               /* handle mISDN */
-               ret = bchannel_handle();
-               if (ret)
-                       work = 1;
-               
-               if (!work) {
-                       ast_mutex_unlock(&chan_lock);
-                       usleep(30000);
-                       ast_mutex_lock(&chan_lock);
-               }
+static int handle_retry(struct lcr_timer *timer, void *instance, int index)
+{
+       CDEBUG(NULL, NULL, "Retry to open socket.\n");
+       if (open_socket() < 0)
+               schedule_timer(&socket_retry, SOCKET_RETRY_TIMER, 0);
+
+       return 0;
+}
+
+void lock_chan(void)
+{
+       ast_mutex_lock(&chan_lock);
+}
+
+void unlock_chan(void)
+{
+       ast_mutex_unlock(&chan_lock);
+}
+
+/* chan_lcr thread */
+static void *chan_thread(void *arg)
+{
+       if (pipe(wake_pipe) < 0) {
+               CERROR(NULL, NULL, "Failed to open pipe.\n");
+               return NULL;
+       }
+       memset(&wake_fd, 0, sizeof(wake_fd));
+       wake_fd.fd = wake_pipe[0];
+       register_fd(&wake_fd, LCR_FD_READ, wake_event, NULL, 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);
+
+       ast_mutex_lock(&chan_lock);
+
+       while(!quit) {
+               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;
@@ -1280,65 +1803,88 @@ static void *chan_thread(void *arg)
 static
 struct ast_channel *lcr_request(const char *type, int format, void *data, int *cause)
 {
-       union parameter newparam;
+       char exten[256], *dial, *interface, *opt;
        struct ast_channel *ast;
         struct chan_call *call;
 
        ast_mutex_lock(&chan_lock);
-
-       CDEBUG(NULL, NULL, "Received request from Asterisk.\n");
+       CDEBUG(NULL, NULL, "Received request from Asterisk. (data=%s)\n", (char *)data);
 
        /* if socket is closed */
-       if (lcr_sock < 0)
-       {
+       if (lcr_sock < 0) {
                CERROR(NULL, NULL, "Rejecting call from Asterisk, because LCR not running.\n");
+               ast_mutex_unlock(&chan_lock);
                return NULL;
        }
-       
+
        /* create call instance */
        call = alloc_call();
-       if (!call)
-       {
+       if (!call) {
                /* failed to create instance */
+               ast_mutex_unlock(&chan_lock);
                return NULL;
        }
+
        /* 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);
-       if (!ast)
-       {
+       #endif
+       
+       #ifdef LCR_FOR_CALLWEAVER
+       ast = ast_channel_alloc(1);
+       #endif
+               
+       if (!ast) {
                CERROR(NULL, NULL, "Failed to create Asterisk channel.\n");
                free_call(call);
                /* failed to create instance */
+               ast_mutex_unlock(&chan_lock);
                return NULL;
        }
-       /* link together */
-       ast->tech_pvt = call;
-       call->ast = ast;
        ast->tech = &lcr_tech;
+       ast->tech_pvt = (void *)1L; // set pointer or asterisk will not call
        /* configure channel */
-#ifdef TODO
-       snprintf(ast->name, sizeof(ast->name), "%s/%d", lcr_type, ++glob_channel);
-       ast->name[sizeof(ast->name)-1] = '\0';
-#endif
-#ifdef TODO
-       ast->nativeformats = configfile->lawformat;
-       ast->readformat = ast->rawreadformat = configfile->lawformat;
-       ast->writeformat = ast->rawwriteformat = configfile->lawformat;
-#else
-       ast->nativeformats = AST_FORMAT_ALAW;
-       ast->readformat = ast->rawreadformat = AST_FORMAT_ALAW;
-       ast->writeformat = ast->rawwriteformat = AST_FORMAT_ALAW;
-#endif
+       ast->nativeformats = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
+       ast->readformat = ast->rawreadformat = ast->nativeformats;
+       ast->writeformat = ast->rawwriteformat =  ast->nativeformats;
+       ast->priority = 1;
        ast->hangupcause = 0;
-       /* send MESSAGE_NEWREF */
-       memset(&newparam, 0, sizeof(union parameter));
-       newparam.direction = 0; /* request from app */
-       send_message(MESSAGE_NEWREF, 0, &newparam);
+
+       /* link together */
+       call->ast = ast;
+       ast->tech_pvt = call;
+       ast->fds[0] = call->pipe[0];
+       call->pbx_started = 0;
        /* set state */
        call->state = CHAN_LCR_STATE_OUT_PREPARE;
 
-       ast_mutex_unlock(&chan_lock);
+       /*
+        * Extract interface, dialstring, options from data.
+        * Formats can be:
+        *      <dialstring>
+        *      <interface>/<dialstring>
+        *      <interface>/<dialstring>/options
+        */
+       strncpy(exten, (char *)data, sizeof(exten)-1);
+       exten[sizeof(exten)-1] = '\0';
+       if ((dial = strchr(exten, '/'))) {
+               *dial++ = '\0';
+               interface = exten;
+               if ((opt = strchr(dial, '/')))
+                       *opt++ = '\0';
+               else
+                       opt = "";
+       } else {
+               dial = exten;
+               interface = "";
+               opt = "";
+       }
+       strncpy(call->interface, interface, sizeof(call->interface)-1);
+       strncpy(call->dialstring, dial, sizeof(call->dialstring)-1);
+       apply_opt(call, (char *)opt);
 
+       ast_mutex_unlock(&chan_lock);
        return ast;
 }
 
@@ -1347,68 +1893,185 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c
  */
 static int lcr_call(struct ast_channel *ast, char *dest, int timeout)
 {
+       union parameter newparam;
         struct chan_call *call;
 
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-        if (!call) {
-               CERROR(NULL, ast, "Received call from Asterisk, but no call instance exists.\n");
+        
+        #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 -1;
        }
 
-       CDEBUG(call, ast, "Received call from Asterisk.\n");
+       CDEBUG(NULL, ast, "Received call from Asterisk.\n");
 
+       /* pbx process is started */
        call->pbx_started = 1;
+       /* send MESSAGE_NEWREF */
+       memset(&newparam, 0, sizeof(union parameter));
+       newparam.direction = 0; /* request from app */
+       send_message(MESSAGE_NEWREF, 0, &newparam);
+
+       /* set hdlc if capability requires hdlc */
+       if (ast->transfercapability == INFO_BC_DATAUNRESTRICTED
+        || ast->transfercapability == INFO_BC_DATARESTRICTED
+        || ast->transfercapability == INFO_BC_VIDEO)
+               call->hdlc = 1;
+       /* if hdlc is forced by option, we change transcap to data */
+       if (call->hdlc
+        && ast->transfercapability != INFO_BC_DATAUNRESTRICTED
+        && ast->transfercapability != INFO_BC_DATARESTRICTED
+        && ast->transfercapability != INFO_BC_VIDEO)
+               ast->transfercapability = INFO_BC_DATAUNRESTRICTED;
+
+       call->cid_num[0] = 0;
+       call->cid_name[0] = 0;
+       call->cid_rdnis[0] = 0;
+
+       if (ast->cid.cid_num) if (ast->cid.cid_num[0])
+               strncpy(call->cid_num, ast->cid.cid_num,
+                       sizeof(call->cid_num)-1);
 
-       /* send setup message, if we already have a callref */
-       if (call->ref)
-               send_setup_to_lcr(call);
+       if (ast->cid.cid_name) if (ast->cid.cid_name[0])
+               strncpy(call->cid_name, ast->cid.cid_name, 
+                       sizeof(call->cid_name)-1);
+       if (ast->cid.cid_rdnis) if (ast->cid.cid_rdnis[0])
+               strncpy(call->cid_rdnis, ast->cid.cid_rdnis, 
+                       sizeof(call->cid_rdnis)-1);
 
        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 */
+               CDEBUG(NULL, ast, "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_lock(&chan_lock);
         call = ast->tech_pvt;
-        if (!call) {
+       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, "Received digit Asterisk.\n");
+       CDEBUG(call, ast, "Received digit '%c' from Asterisk.\n", digit);
 
        /* send information or queue them */
-       if (call->ref && call->state == CHAN_LCR_STATE_OUT_DIALING)
-       {
+       if (call->ref && call->state == CHAN_LCR_STATE_OUT_DIALING) {
                CDEBUG(call, ast, "Sending digit to LCR, because we are in dialing state.\n");
                memset(&newparam, 0, sizeof(union parameter));
-               newparam.information.id[0] = digit;
-               newparam.information.id[1] = '\0';
+               if (call->keypad) {
+                       newparam.information.keypad[0] = digit;
+                       newparam.information.keypad[1] = '\0';
+               } else {
+                       newparam.information.id[0] = digit;
+                       newparam.information.id[1] = '\0';
+               }
                send_message(MESSAGE_INFORMATION, call->ref, &newparam);
        } else
        if (!call->ref
-        && (call->state == CHAN_LCR_STATE_OUT_PREPARE || call->state == CHAN_LCR_STATE_OUT_SETUP));
-       {
+        && (call->state == CHAN_LCR_STATE_OUT_PREPARE || call->state == CHAN_LCR_STATE_OUT_SETUP)) {
                CDEBUG(call, ast, "Queue digits, because we are in setup/dialing state and have no ref yet.\n");
                *buf = digit;
                strncat(call->dialque, buf, strlen(call->dialque)-1);
        }
 
        ast_mutex_unlock(&chan_lock);
-       
-       return(0);
+
+#ifdef LCR_FOR_ASTERISK
+       return 0;
+}
+
+static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
+{
+       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;
 }
 
 static int lcr_answer(struct ast_channel *ast)
@@ -1418,23 +2081,35 @@ static int lcr_answer(struct ast_channel *ast)
 
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-        if (!call) {
+       if (!call) {
                CERROR(NULL, ast, "Received answer from Asterisk, but no call instance exists.\n");
                ast_mutex_unlock(&chan_lock);
                return -1;
        }
        
-       CDEBUG(call, ast, "Received answer from Asterisk.\n");
+       CDEBUG(call, ast, "Received answer from Asterisk (maybe during lcr_bridge).\n");
                
        /* copy connectinfo, if bridged */
        if (call->bridge_call)
                memcpy(&call->connectinfo, &call->bridge_call->connectinfo, sizeof(struct connect_info));
        /* send connect message to lcr */
-       memset(&newparam, 0, sizeof(union parameter));
-       memcpy(&newparam.connectinfo, &call->connectinfo, sizeof(struct connect_info));
-       send_message(MESSAGE_CONNECT, call->ref, &newparam);
+       if (call->state != CHAN_LCR_STATE_CONNECT) {
+               memset(&newparam, 0, sizeof(union parameter));
+               memcpy(&newparam.connectinfo, &call->connectinfo, sizeof(struct connect_info));
+               send_message(MESSAGE_CONNECT, call->ref, &newparam);
+               call->state = CHAN_LCR_STATE_CONNECT;
+       }
        /* change state */
-       call->state = CHAN_LCR_STATE_CONNECT;
+       /* 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);
        
        ast_mutex_unlock(&chan_lock);
         return 0;
@@ -1442,17 +2117,18 @@ static int lcr_answer(struct ast_channel *ast)
 
 static int lcr_hangup(struct ast_channel *ast)
 {
-       union parameter newparam;
         struct chan_call *call;
        pthread_t tid = pthread_self();
 
-       if (!pthread_equal(tid, chan_tid))
+       if (!pthread_equal(tid, chan_tid)) {
                ast_mutex_lock(&chan_lock);
+       }
         call = ast->tech_pvt;
-        if (!call) {
+       if (!call) {
                CERROR(NULL, ast, "Received hangup from Asterisk, but no call instance exists.\n");
-               if (!pthread_equal(tid, chan_tid))
+               if (!pthread_equal(tid, chan_tid)) {
                        ast_mutex_unlock(&chan_lock);
+               }
                return -1;
        }
 
@@ -1464,60 +2140,55 @@ static int lcr_hangup(struct ast_channel *ast)
        /* disconnect asterisk, maybe not required */
        ast->tech_pvt = NULL;
        ast->fds[0] = -1;
-       if (call->ref)
-       {
+       if (call->ref) {
                /* release */
                CDEBUG(call, ast, "Releasing ref and freeing call instance.\n");
-               memset(&newparam, 0, sizeof(union parameter));
-               newparam.disconnectinfo.cause = CAUSE_RESSOURCEUNAVAIL;
-               newparam.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
-               send_message(MESSAGE_RELEASE, call->ref, &newparam);
+               if (ast->hangupcause > 0)
+                       send_release_and_import(call, ast->hangupcause, LOCATION_PRIVATE_LOCAL);
+               else
+                       send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
                /* remove call */
                free_call(call);
-               if (!pthread_equal(tid, chan_tid))
+               if (!pthread_equal(tid, chan_tid)) {
                        ast_mutex_unlock(&chan_lock);
+               }
                return 0;
-       } else
-       {
+       } else {
                /* ref is not set, due to prepare setup or release */
-               if (call->state == CHAN_LCR_STATE_RELEASE)
-               {
+               if (call->state == CHAN_LCR_STATE_RELEASE) {
                        /* we get the response to our release */
                        CDEBUG(call, ast, "Freeing call instance, because we have no ref AND we are requesting no ref.\n");
                        free_call(call);
-               } else
-               {
+               } else {
                        /* 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))
+       if (!pthread_equal(tid, chan_tid)) {
                ast_mutex_unlock(&chan_lock);
+       }
        return 0;
 }
 
 static int lcr_write(struct ast_channel *ast, struct ast_frame *f)
 {
         struct chan_call *call;
-       unsigned char buffer[1024], *s, *d = buffer;
-       int i, ii;
 
+       if (!f->subclass)
+               CDEBUG(NULL, ast, "No subclass\n");
+       if (!(f->subclass & ast->nativeformats))
+               CDEBUG(NULL, ast, "Unexpected format.\n");
+       
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-        if (!call) {
+       if (!call) {
                ast_mutex_unlock(&chan_lock);
                return -1;
        }
-       if (call->bchannel && ((ii = f->samples)))
-       {
-               if (ii > sizeof(buffer))
-                       ii = sizeof(buffer);
-               s = f->data;
-               for (i = 0; i < ii; i++)
-                       *d++ = flip_bits[*s++];
-               bchannel_transmit(call->bchannel, buffer, ii);
-       }
+       if (call->bchannel && f->samples)
+               bchannel_transmit(call->bchannel, *((unsigned char **)&(f->data)), f->samples);
        ast_mutex_unlock(&chan_lock);
        return 0;
 }
@@ -1526,34 +2197,61 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *f)
 static struct ast_frame *lcr_read(struct ast_channel *ast)
 {
         struct chan_call *call;
-       int i, len;
-       unsigned char *p;
+       int len = 0;
 
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-        if (!call) {
+       if (!call) {
                ast_mutex_unlock(&chan_lock);
                return NULL;
        }
-       len = read(call->pipe[0], call->read_buff, sizeof(call->read_buff));
-       if (len <= 0)
-               return NULL;
+       if (call->pipe[0] > -1) {
+               if (call->rebuffer && !call->hdlc) {
+                       /* 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);
 
-       p = call->read_buff;
-       for (i = 0; i < len; i++) {
-               *p = flip_bits[*p];
-               p++;
+                       #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;
+                       global_change = 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;
-#ifdef TODO
-       format aus config
-#endif
-       call->read_fr.subclass = AST_FORMAT_ALAW;
-       call->read_fr.datalen = len;
-       call->read_fr.samples = len;
+       call->read_fr.subclass = ast->nativeformats;
+       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;
@@ -1562,12 +2260,13 @@ static struct ast_frame *lcr_read(struct ast_channel *ast)
 static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, size_t datalen)
 {
        union parameter newparam;
-        int res = -1;
+        int res = 0;
         struct chan_call *call;
+       const struct tone_zone_sound *ts = NULL;
 
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-        if (!call) {
+       if (!call) {
                CERROR(NULL, ast, "Received indicate from Asterisk, but no call instance exists.\n");
                ast_mutex_unlock(&chan_lock);
                return -1;
@@ -1576,37 +2275,80 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
         switch (cond) {
                 case AST_CONTROL_BUSY:
                        CDEBUG(call, ast, "Received indicate AST_CONTROL_BUSY from Asterisk.\n");
-                       /* send message to lcr */
-                       memset(&newparam, 0, sizeof(union parameter));
-                       newparam.disconnectinfo.cause = 17;
-                       newparam.disconnectinfo.location = 5;
-                       send_message(MESSAGE_DISCONNECT, call->ref, &newparam);
-                       /* change state */
-                       call->state = CHAN_LCR_STATE_OUT_DISCONNECT;
-                       /* return */
-                       ast_mutex_unlock(&chan_lock);
-                        return 0;
+                       ast_setstate(ast, AST_STATE_BUSY);
+                       if (call->state != CHAN_LCR_STATE_OUT_DISCONNECT) {
+                               /* send message to lcr */
+                               memset(&newparam, 0, sizeof(union parameter));
+                               newparam.disconnectinfo.cause = 17;
+                               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 'busy' indication\n");
+                               ts = ast_get_indication_tone(ast->zone, "busy");
+                       }
+                       break;
                 case AST_CONTROL_CONGESTION:
-                       CDEBUG(call, ast, "Received indicate AST_CONTROL_CONGESTION from Asterisk.\n");
-                       /* return */
-                       ast_mutex_unlock(&chan_lock);
-                        return -1;
+                       CDEBUG(call, ast, "Received indicate AST_CONTROL_CONGESTION from Asterisk. (cause %d)\n", ast->hangupcause);
+                       if (call->state != CHAN_LCR_STATE_OUT_DISCONNECT) {
+                               /* send message to lcr */
+                               memset(&newparam, 0, sizeof(union parameter));
+                               newparam.disconnectinfo.cause = ast->hangupcause;
+                               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");
+                               ts = ast_get_indication_tone(ast->zone, "congestion");
+                       }
+                       break;
+                case AST_CONTROL_PROCEEDING:
+                       CDEBUG(call, ast, "Received indicate AST_CONTROL_PROCEEDING from Asterisk.\n");
+                       if (call->state == CHAN_LCR_STATE_IN_SETUP
+                        || call->state == CHAN_LCR_STATE_IN_DIALING) {
+                               /* send message to lcr */
+                               memset(&newparam, 0, sizeof(union parameter));
+                               send_message(MESSAGE_PROCEEDING, call->ref, &newparam);
+                               /* change state */
+                               call->state = CHAN_LCR_STATE_IN_PROCEEDING;
+                       }
+                       break;
                 case AST_CONTROL_RINGING:
                        CDEBUG(call, ast, "Received indicate AST_CONTROL_RINGING from Asterisk.\n");
-                       /* send message to lcr */
-                       memset(&newparam, 0, sizeof(union parameter));
-                       send_message(MESSAGE_ALERTING, call->ref, &newparam);
-                       /* change state */
-                       call->state = CHAN_LCR_STATE_OUT_ALERTING;
-                       /* return */
-                       ast_mutex_unlock(&chan_lock);
-                        return 0;
+                       ast_setstate(ast, AST_STATE_RING);
+                       if (call->state == CHAN_LCR_STATE_IN_SETUP
+                        || call->state == CHAN_LCR_STATE_IN_DIALING
+                        || call->state == CHAN_LCR_STATE_IN_PROCEEDING) {
+                               /* send message to lcr */
+                               memset(&newparam, 0, sizeof(union parameter));
+                               send_message(MESSAGE_ALERTING, call->ref, &newparam);
+                               /* change state */
+                               call->state = CHAN_LCR_STATE_IN_ALERTING;
+                       } else {
+                               CDEBUG(call, ast, "Using Asterisk 'ring' indication\n");
+                               ts = ast_get_indication_tone(ast->zone, "ring");
+                       }
+                       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:
-                       /* return */
-                       ast_mutex_unlock(&chan_lock);
-                        return 0;
+                       CDEBUG(call, ast, "Received indicate -1.\n");
+                       ast_playtones_stop(ast);
+                        res = -1;
+                       break;
 
                 case AST_CONTROL_VIDUPDATE:
+                       CDEBUG(call, ast, "Received indicate AST_CONTROL_VIDUPDATE.\n");
                         res = -1;
                         break;
                 case AST_CONTROL_HOLD:
@@ -1615,6 +2357,17 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
                        memset(&newparam, 0, sizeof(union parameter));
                        newparam.notifyinfo.notify = INFO_NOTIFY_REMOTE_HOLD;
                        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:
                        CDEBUG(call, ast, "Received indicate AST_CONTROL_UNHOLD from Asterisk.\n");
@@ -1622,18 +2375,80 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
                        memset(&newparam, 0, sizeof(union parameter));
                        newparam.notifyinfo.notify = INFO_NOTIFY_REMOTE_RETRIEVAL;
                        send_message(MESSAGE_NOTIFY, call->ref, &newparam);
-                        break;
 
+                       /*stop moh*/
+                       ast_moh_stop(ast);
+                       call->on_hold = 0;
+                       break;
+#ifdef AST_CONTROL_SRCUPDATE
+               case AST_CONTROL_SRCUPDATE:
+#else
+               case 20:
+#endif
+                       CDEBUG(call, ast, "Received AST_CONTROL_SRCUPDATE from Asterisk.\n");
+                        break;
                 default:
                        CERROR(call, ast, "Received indicate from Asterisk with unknown condition %d.\n", cond);
-                       /* return */
-                       ast_mutex_unlock(&chan_lock);
-                        return -1;
+                        res = -1;
+                       break;
         }
 
+       if (ts && ts->data[0]) {
+               ast_playtones_start(ast, 0, ts->data, 1);
+       }
+
        /* return */
        ast_mutex_unlock(&chan_lock);
-        return 0;
+        return res;
+}
+
+/*
+ * fixup asterisk
+ */
+static int lcr_fixup(struct ast_channel *oldast, struct ast_channel *ast)
+{
+        struct chan_call *call;
+
+       if (!ast) {
+               return -1;
+       }
+
+       ast_mutex_lock(&chan_lock);
+       call = ast->tech_pvt;
+       if (!call) {
+               CERROR(NULL, ast, "Received fixup from Asterisk, but no call instance exists.\n");
+               ast_mutex_unlock(&chan_lock);
+               return -1;
+       }
+
+       CDEBUG(call, ast, "Received fixup from Asterisk.\n");
+       call->ast = ast;
+       ast_mutex_unlock(&chan_lock);
+       return 0;
+}
+
+/*
+ * send_text asterisk
+ */
+static int lcr_send_text(struct ast_channel *ast, const char *text)
+{
+        struct chan_call *call;
+       union parameter newparam;
+
+       ast_mutex_lock(&chan_lock);
+       call = ast->tech_pvt;
+       if (!call) {
+               CERROR(NULL, ast, "Received send_text from Asterisk, but no call instance exists.\n");
+               ast_mutex_unlock(&chan_lock);
+               return -1;
+       }
+
+       CDEBUG(call, ast, "Received send_text from Asterisk. (text=%s)\n", text);
+       memset(&newparam, 0, sizeof(union parameter));
+       strncpy(newparam.notifyinfo.display, text, sizeof(newparam.notifyinfo.display)-1);
+       send_message(MESSAGE_NOTIFY, call->ref, &newparam);
+       ast_mutex_unlock(&chan_lock);
+       return 0;
 }
 
 /*
@@ -1647,34 +2462,92 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
 {
        struct chan_call        *call1, *call2;
        struct ast_channel      *carr[2], *who;
-       int                     to = -1;
+       int                     to;
        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;
+
        /* join via dsp (if the channels are currently open) */
        ast_mutex_lock(&chan_lock);
-       bridge_id = new_bridge_id();
        call1 = ast1->tech_pvt;
        call2 = ast2->tech_pvt;
-       if (call1 && call2)
-       {
+       if (!call1 || !call2) {
+               CDEBUG(NULL, NULL, "Bridge, but we don't have two call instances, exitting.\n");
+               ast_mutex_unlock(&chan_lock);
+               return AST_BRIDGE_COMPLETE;
+       }
+
+       /* 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");
+
+               /* get bridge id and join */
+               bridge_id = new_bridge_id();
+               
                call1->bridge_id = bridge_id;
                if (call1->bchannel)
                        bchannel_join(call1->bchannel, bridge_id);
-               call1->bridge_call = call2;
-       }
-       if (call2)
-       {
+
                call2->bridge_id = bridge_id;
                if (call2->bchannel)
                        bchannel_join(call2->bchannel, bridge_id);
-               call2->bridge_call = call1;
+       } 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;
+
+       if (call1->state == CHAN_LCR_STATE_IN_SETUP
+        || call1->state == CHAN_LCR_STATE_IN_DIALING
+        || call1->state == CHAN_LCR_STATE_IN_PROCEEDING
+        || call1->state == CHAN_LCR_STATE_IN_ALERTING) {
+               CDEBUG(call1, ast1, "Bridge established before lcr_answer, so we call it ourself: Calling lcr_answer...\n");
+               lcr_answer(ast1);
+       }
+       if (call2->state == CHAN_LCR_STATE_IN_SETUP
+        || call2->state == CHAN_LCR_STATE_IN_DIALING
+        || call2->state == CHAN_LCR_STATE_IN_PROCEEDING
+        || call2->state == CHAN_LCR_STATE_IN_ALERTING) {
+               CDEBUG(call2, ast2, "Bridge established before lcr_answer, so we call it ourself: Calling lcr_answer...\n");
+               lcr_answer(ast2);
+       }
+
+       /* sometimes SIP phones forget to send RETRIEVE before TRANSFER
+          so let's do it for them. Hmpf.
+       */
+
+       if (call1->on_hold) {
+               union parameter newparam;
+
+               memset(&newparam, 0, sizeof(union parameter));
+               newparam.notifyinfo.notify = INFO_NOTIFY_REMOTE_RETRIEVAL;
+               send_message(MESSAGE_NOTIFY, call1->ref, &newparam);
+
+               call1->on_hold = 0;
+       }
+
+       if (call2->on_hold) {
+               union parameter newparam;
+
+               memset(&newparam, 0, sizeof(union parameter));
+               newparam.notifyinfo.notify = INFO_NOTIFY_REMOTE_RETRIEVAL;
+               send_message(MESSAGE_NOTIFY, call2->ref, &newparam);
+
+               call2->on_hold = 0;
        }
+       
        ast_mutex_unlock(&chan_lock);
        
        while(1) {
+               to = -1;
                who = ast_waitfor_n(carr, 2, &to);
 
                if (!who) {
@@ -1684,6 +2557,10 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
                f = ast_read(who);
     
                if (!f || f->frametype == AST_FRAME_CONTROL) {
+                       if (!f)
+                               CDEBUG(NULL, NULL, "Got hangup.\n");
+                       else
+                               CDEBUG(NULL, NULL, "Got CONTROL.\n");
                        /* got hangup .. */
                        *fo=f;
                        *rc=who;
@@ -1691,6 +2568,7 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
                }
                
                if ( f->frametype == AST_FRAME_DTMF ) {
+                       CDEBUG(NULL, NULL, "Got DTMF.\n");
                        *fo=f;
                        *rc=who;
                        break;
@@ -1706,61 +2584,64 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
     
        }
        
-       CDEBUG(NULL, NULL, "Releasing bride.\n");
+       CDEBUG(NULL, NULL, "Releasing bridge.\n");
 
        /* split channels */
        ast_mutex_lock(&chan_lock);
        call1 = ast1->tech_pvt;
        call2 = ast2->tech_pvt;
-       if (call1)
-       {
+       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;
-               call1->bridge_call = NULL;
        }
-       if (call2)
-       {
+       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;
-               call2->bridge_call = NULL;
        }
+       call1->bridge_call = NULL;
+       call2->bridge_call = NULL;
+
        ast_mutex_unlock(&chan_lock);
-       
-       
        return AST_BRIDGE_COMPLETE;
 }
 static struct ast_channel_tech lcr_tech = {
        .type="LCR",
-       .description="Channel driver for connecting to Linux-Call-Router",
-#ifdef TODO
-       law from config
-#else
-       .capabilities=AST_FORMAT_ALAW,
-#endif
-       .requester=lcr_request,
-       .send_digit_begin=lcr_digit,
-       .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
 };
 
 
 /*
  * cli
  */
+#if 0
 static int lcr_show_lcr (int fd, int argc, char *argv[])
 {
        return 0;
@@ -1844,81 +2725,175 @@ static struct ast_cli_entry cli_port_unload =
  "Unloads LCR port, port is closes by mISDN",
  "Usage: lcr port unload \"<port>\"\n",
 };
+#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) {
+               if (call->ast == ast)
+                       break;
+               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");
 
+       ast_mutex_unlock(&chan_lock);
+       return 0;
+}
 
 /*
  * module loading and destruction
  */
 int load_module(void)
 {
-       int i;
+       u_short i;
+       char options_error[256];
 
-       for (i = 0; i < 256; i++)
+       for (i = 0; i < 256; i++) {
                flip_bits[i] = (i>>7) | ((i>>5)&2) | ((i>>3)&4) | ((i>>1)&8)
-                           || (i<<7) | ((i&2)<<5) | ((i&4)<<3) | ((i&8)<<1);
+                            | (i<<7) | ((i&2)<<5) | ((i&4)<<3) | ((i&8)<<1);
+       }
+
+       if (read_options(options_error) == 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);
        ast_mutex_init(&log_lock);
-       
-       if (!(lcr_sock = open_socket())) {
-               /* continue with closed socket */
-       }
 
-       if (!bchannel_initialize()) {
+       if (bchannel_initialize()) {
                CERROR(NULL, NULL, "Unable to open mISDN device\n");
-               close_socket(lcr_sock);
-               return -1;
+               close_socket();
+               
+               #ifdef LCR_FOR_ASTERISK
+               return AST_MODULE_LOAD_DECLINE;
+               #endif          
+               
+               #ifdef LCR_FOR_CALLWEAVER
+               return 0;
+               #endif
        }
        mISDN_created = 1;
 
+       lcr_tech.capabilities = (options.law=='a')?AST_FORMAT_ALAW:AST_FORMAT_ULAW;
        if (ast_channel_register(&lcr_tech)) {
                CERROR(NULL, NULL, "Unable to register channel class\n");
                bchannel_deinitialize();
-               close_socket(lcr_sock);
-               return -1;
+               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"
+                                "    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"
+                                "    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"
+                                "    k - use keypad to dial this call.\n"
+                                "\n"
+                                "set LCR_TRANSFERCAPABILITY to the numerical bearer capabilty in order to alter caller's capability\n"
+                                " -> use 16 for fax (3.1k audio)\n"
+                                "\n"
+                                "To send a fax, you need to set LCR_TRANSFERCAPABILITY environment to 16, also you need to set\n"
+                                "options: \"n:t:q250\" for seamless audio transmission.\n"
+               );
+
  
 #if 0  
        ast_cli_register(&cli_show_lcr);
        ast_cli_register(&cli_show_calls);
-
        ast_cli_register(&cli_reload_routing);
        ast_cli_register(&cli_reload_interfaces);
        ast_cli_register(&cli_port_block);
        ast_cli_register(&cli_port_unblock);
        ast_cli_register(&cli_port_unload);
-  
-       ast_register_application("misdn_set_opt", misdn_set_opt_exec, "misdn_set_opt",
-                                "misdn_set_opt(:<opt><optarg>:<opt><optarg>..):\n"
-                                "Sets mISDN opts. and optargs\n"
-                                "\n"
-                                "The available options are:\n"
-                                "    d - Send display text on called phone, text is the optparam\n"
-                                "    n - don't detect dtmf tones on called channel\n"
-                                "    h - make digital outgoing call\n" 
-                                "    c - make crypted outgoing call, param is keyindex\n"
-                                "    e - perform echo cancelation on this channel,\n"
-                                "        takes taps as arguments (32,64,128,256)\n"
-                                "    s - send Non Inband DTMF as inband\n"
-                                "   vr - rxgain control\n"
-                                "   vt - txgain control\n"
-               );
-
-       
-       lcr_cfg_get( 0, LCR_GEN_TRACEFILE, global_tracefile, BUFFERSIZE);
-
-=======
-       //lcr_cfg_get( 0, LCR_GEN_TRACEFILE, global_tracefile, BUFFERSIZE);
 #endif
 
        quit = 0;       
-       if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0))
-       {
+       if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0)) {
                /* failed to create thread */
                bchannel_deinitialize();
-               close_socket(lcr_sock);
+               close_socket();
                ast_channel_unregister(&lcr_tech);
-               return -1;
+
+               #ifdef LCR_FOR_ASTERISK
+               return AST_MODULE_LOAD_DECLINE;
+               #endif          
+               
+               #ifdef LCR_FOR_CALLWEAVER
+               return 0;
+               #endif
+               
        }
        return 0;
 }
@@ -1933,6 +2908,9 @@ int unload_module(void)
        
        ast_channel_unregister(&lcr_tech);
 
+        ast_unregister_application("lcr_config");
+
+
        if (mISDN_created) {
                bchannel_deinitialize();
                mISDN_created = 0;
@@ -1952,12 +2930,13 @@ int reload_module(void)
        return 0;
 }
 
-#ifdef TODO
-mutex init fehlt noch
-ast_mutex_t usecnt_lock;
-int usecnt;
+#ifdef LCR_FOR_ASTERISK
+#define AST_MODULE "chan_lcr"
+#endif
 
+#ifdef LCR_FOR_CALLWEAVER
 int usecount(void)
+hae
 {
        int res;
        ast_mutex_lock(&usecnt_lock);
@@ -1967,17 +2946,17 @@ int usecount(void)
 }
 #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
 
-char *desc="Channel driver for lcr";
-
+#ifdef LCR_FOR_CALLWEAVER
 char *description(void)
 {
        return desc;
 }
-
-char *key(void)
-{
-       return ASTERISK_GPL_KEY;
-}
-
-
+#endif