LCR now runs as a user.
[lcr.git] / chan_lcr.c
index 6081887..52c2a31 100644 (file)
@@ -31,10 +31,11 @@ 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 MESSASGE_NEWREF is sent to LCR requesting
+a new call reference (ref).
 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. 
@@ -77,6 +78,27 @@ 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.
+
 */
 
 #include <stdio.h>
@@ -121,6 +143,7 @@ If the ref is 0 and the state is CHAN_LCR_STATE_RELEASE, see the proceedure
 #include "lcrsocket.h"
 #include "cause.h"
 #include "bchannel.h"
+#include "options.h"
 #include "chan_lcr.h"
 
 CHAN_LCR_STATE // state description structure
@@ -166,8 +189,8 @@ void chan_lcr_log(int type, const char *file, int line, const char *function, st
        buffer[sizeof(buffer)-1]=0;
        va_end(args);
 
-       if ((unsigned long)call > 1)
-               sprintf(call_text, "%ld", call->ref);
+       if (call)
+               sprintf(call_text, "%d", call->ref);
        if (ast)
                strncpy(ast_text, ast->name, sizeof(ast_text)-1);
        ast_text[sizeof(ast_text)-1] = '\0';
@@ -182,7 +205,7 @@ void chan_lcr_log(int type, const char *file, int line, const char *function, st
  */
 struct chan_call *call_first;
 
-struct chan_call *find_call_ref(unsigned long ref)
+struct chan_call *find_call_ref(unsigned int ref)
 {
        struct chan_call *call = call_first;
 
@@ -209,7 +232,7 @@ struct chan_call *find_call_ast(struct ast_channel *ast)
        return(call);
 }
 
-struct chan_call *find_call_handle(unsigned long handle)
+struct chan_call *find_call_handle(unsigned int handle)
 {
        struct chan_call *call = call_first;
 
@@ -272,6 +295,7 @@ struct chan_call *alloc_call(void)
                free_call(*callp);
                return(NULL);
        }
+       fcntl((*callp)->pipe[0], F_SETFL, O_NONBLOCK);
        CDEBUG(*callp, NULL, "Call instance allocated.\n");
        return(*callp);
 }
@@ -300,11 +324,10 @@ unsigned short new_bridge_id(void)
        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;
 
@@ -333,6 +356,180 @@ int send_message(int message_type, unsigned long ref, union parameter *param)
 }
 
 /*
+ * 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, newmode = 0;
+
+       if (!data[0])
+               return; // no opts
+
+       strncpy(string, data, sizeof(string)-1);
+       string[sizeof(string)-1] = '\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");
+                       call->no_dtmf = 1;
+                       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;
+                               newmode = 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;
+                               newmode = 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 '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;
+                       break;
+#if 0
+               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;
+todo
+                       break;
+#endif
+               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;
+               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)?1:0) + ((call->hdlc)?2:0)))
+                       bchannel_activate(call->bchannel, 1);
+       }
+}
+
+/*
  * send setup info to LCR
  * this function is called, when asterisk call is received and ref is received
  */
@@ -344,20 +541,25 @@ static void send_setup_to_lcr(struct chan_call *call)
        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));
-       strncpy(newparam.setup.dialinginfo.id, ast->exten, sizeof(newparam.setup.dialinginfo.id)-1);
+               newparam.setup.dialinginfo.itype = INFO_ITYPE_ISDN;     
+               newparam.setup.dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
+       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.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, ast->cid.cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1);
+               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;    
        }
@@ -390,11 +592,13 @@ static void send_setup_to_lcr(struct chan_call *call)
                newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
        }
        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);
@@ -445,7 +649,7 @@ static void send_release_and_import(struct chan_call *call, int cause, int locat
        union parameter newparam;
 
        /* importing channel */
-       if (call->bchannel && call->bchannel->handle) {
+       if (call->bchannel) {
                memset(&newparam, 0, sizeof(union parameter));
                newparam.bchannel.type = BCHANNEL_RELEASE;
                newparam.bchannel.handle = call->bchannel->handle;
@@ -542,7 +746,11 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
                goto release;
        }
        call->pbx_started = 1;
-       return;
+//     if (call->state == CHAN_LCR_STATE_IN_DIALING)
+               ast_setstate(ast, AST_STATE_RINGING);
+//     else
+//             ast_setstate(ast, AST_STATE_RINGING);
+//     return;
 }
 
 /*
@@ -582,10 +790,8 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
                ast->cid.cid_num = strdup(param->setup.callerinfo.id);
        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
+               ast->cid.cid_name = strdup(numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, options.national, options.international));
        switch (param->setup.callerinfo.present)
        {
                case INFO_PRESENT_ALLOWED:
@@ -612,29 +818,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);
 }
 
 /*
@@ -662,9 +862,9 @@ 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 */
+       /* queue event for asterisk */
        if (call->ast && call->pbx_started)
-               ast_queue_control(call->ast, AST_CONTROL_PROCEEDING);
+               strncat(call->queue_string, "P", sizeof(call->queue_string)-1);
 }
 
 /*
@@ -676,9 +876,9 @@ 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 */
+       /* queue event to asterisk */
        if (call->ast && call->pbx_started)
-               ast_queue_control(call->ast, AST_CONTROL_RINGING);
+               strncat(call->queue_string, "R", sizeof(call->queue_string)-1);
 }
 
 /*
@@ -701,9 +901,9 @@ static void lcr_in_connect(struct chan_call *call, int message_type, union param
        }
        /* copy connectinfo */
        memcpy(&call->connectinfo, &param->connectinfo, sizeof(struct connect_info));
-       /* send event to asterisk */
+       /* queue event to asterisk */
        if (call->ast && call->pbx_started)
-               ast_queue_control(call->ast, AST_CONTROL_ANSWER);
+               strncat(call->queue_string, "A", sizeof(call->queue_string)-1);
 }
 
 /*
@@ -735,12 +935,12 @@ static void lcr_in_disconnect(struct chan_call *call, int message_type, union pa
        call->ref = 0;
        /* change to release state */
        call->state = CHAN_LCR_STATE_RELEASE;
-       /* release asterisk */
+       /* queue release asterisk */
        if (ast)
        {
                ast->hangupcause = call->cause;
                if (call->pbx_started)
-                       ast_queue_hangup(ast);
+                       strcpy(call->queue_string, "H"); // overwrite other indications
                else {
                        ast_hangup(ast); // call will be destroyed here
                }
@@ -766,12 +966,12 @@ static void lcr_in_release(struct chan_call *call, int message_type, union param
               call->cause = param->disconnectinfo.cause;
               call->location = param->disconnectinfo.location;
        }
-       /* if we have an asterisk instance, send hangup, else we are done */
+       /* 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);
+                       strcpy(call->queue_string, "H");
                else {
                        ast_hangup(ast); // call will be destroyed here
                }
@@ -788,8 +988,6 @@ 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, "Incoming information from LCR. (dialing=%s)\n", param->information.id);
        
@@ -804,22 +1002,17 @@ static void lcr_in_information(struct chan_call *call, int message_type, union p
                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])
+               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");
@@ -832,8 +1025,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 */
@@ -854,13 +1057,32 @@ static void lcr_in_facility(struct chan_call *call, int message_type, union para
 }
 
 /*
+ * 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;
+
+       CDEBUG(call, call->ast, "Recognised DTMF digit '%c'.\n", val);
+       digit[0] = val;
+       digit[1] = '\0';
+       strncat(call->queue_string, digit, sizeof(call->queue_string)-1);
+}
+
+/*
  * message received from LCR
  */
-int receive_message(int message_type, unsigned long ref, union parameter *param)
+int receive_message(int message_type, unsigned int ref, union parameter *param)
 {
-       union parameter newparam;
        struct bchannel *bchannel;
        struct chan_call *call;
+       union parameter newparam;
 
        memset(&newparam, 0, sizeof(union parameter));
 
@@ -870,7 +1092,7 @@ int receive_message(int message_type, unsigned long ref, union parameter *param)
                switch(param->bchannel.type)
                {
                        case BCHANNEL_ASSIGN:
-                       CDEBUG(NULL, NULL, "Received BCHANNEL_ASSIGN message. (handle=%08lx)\n", 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);
@@ -888,11 +1110,10 @@ int receive_message(int message_type, unsigned long ref, union parameter *param)
                        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)
+                       if (param->bchannel.crypt_len && param->bchannel.crypt_len <= sizeof(bchannel->b_bf_key))
                        {
-                               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);
+                               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;
@@ -901,25 +1122,40 @@ int receive_message(int message_type, unsigned long ref, union parameter *param)
                        /* 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->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)?1:0) + ((call->hdlc)?2:0)))
+                                       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:
@@ -1101,7 +1337,7 @@ again:
                        goto again;
                }
                CDEBUG(call, call->ast, "Queue call release, because Asterisk channel is running.\n");
-               ast_queue_hangup(call->ast);
+               strcpy(call->queue_string, "H");
                call = call->next;
        }
 
@@ -1192,10 +1428,9 @@ int handle_socket(void)
 int open_socket(void)
 {
        int ret;
-       char *socket_name = SOCKET_NAME;
        int conn;
        struct sockaddr_un sock_address;
-       unsigned long on = 1;
+       unsigned int on = 1;
        union parameter param;
 
        /* open socket */
@@ -1208,7 +1443,7 @@ int open_socket(void)
        /* 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(lcr_sock, (struct sockaddr *)&sock_address, SUN_LEN(&sock_address))) < 0)
@@ -1255,10 +1490,77 @@ void close_socket(void)
        lcr_sock = -1;
 }
 
+
+/* sending queue to asterisk */
+static int queue_send(void)
+{
+       int work = 0;
+       struct chan_call *call;
+       struct ast_channel *ast;
+       struct ast_frame fr;
+       char *p;
+
+       call = call_first;
+       while(call) {
+               p = call->queue_string;
+               ast = call->ast;
+               if (*p && ast) {
+                       /* there is something to queue */
+                       if (!ast_channel_trylock(ast)) { /* succeed */
+                               while(*p) {
+                                       switch (*p) {
+                                       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);
+                                               break;
+                                       case 'A':
+                                               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));
+                                               fr.frametype = AST_FRAME_DTMF_BEGIN;
+                                               fr.subclass = *p;
+                                               fr.delivery = ast_tv(0, 0);
+                                               ast_queue_frame(ast, &fr);
+                                               fr.frametype = AST_FRAME_DTMF_END;
+                                               ast_queue_frame(ast, &fr);
+                                               break;
+                                       default:
+                                               CDEBUG(call, ast, "Ignoring queued digit 0x%02d.\n", *p);
+                                       }
+                                       p++;
+                               }
+                               call->queue_string[0] = '\0';
+                               ast_channel_unlock(ast);
+                               work = 1;
+                       }
+               }
+               call = call->next;
+       }
+
+       return work;
+}
+
+/* signal handler */
 void sighandler(int sigset)
 {
 }
 
+/* chan_lcr thread */
 static void *chan_thread(void *arg)
 {
        int work;
@@ -1307,7 +1609,13 @@ static void *chan_thread(void *arg)
                ret = bchannel_handle();
                if (ret)
                        work = 1;
-               
+
+               /* handle messages to asterisk */
+               ret = queue_send();
+               if (ret)
+                       work = 1;
+
+               /* delay if no work done */
                if (!work) {
                        ast_mutex_unlock(&chan_lock);
                        usleep(30000);
@@ -1332,16 +1640,27 @@ static void *chan_thread(void *arg)
 static
 struct ast_channel *lcr_request(const char *type, int format, void *data, int *cause)
 {
+       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)
        {
                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)
+       {
+               /* failed to create instance */
+               ast_mutex_unlock(&chan_lock);
                return NULL;
        }
 
@@ -1350,30 +1669,54 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c
        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;
        }
        ast->tech = &lcr_tech;
-       ast->tech_pvt = (void *)1L; // or asterisk will not call
+       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;
 
-       ast_mutex_unlock(&chan_lock);
+       /* 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;
 
+       /*
+        * 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;
 }
 
@@ -1382,44 +1725,58 @@ 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)
 {
-        struct chan_call *call;
        union parameter newparam;
+        struct chan_call *call;
 
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-       if ((unsigned long)call > 1) {
-               CERROR(NULL, ast, "Received call from Asterisk, but call instance already exists.\n");
+       if (!call) {
+               CERROR(NULL, ast, "Received call from Asterisk, but call instance does not exist.\n");
                ast_mutex_unlock(&chan_lock);
                return -1;
        }
 
        CDEBUG(NULL, ast, "Received call from Asterisk.\n");
 
-       /* create call instance */
-       call = alloc_call();
-       if (!call)
-       {
-               /* failed to create instance */
-               return -1;
-       }
-       /* link together */
-       call->ast = ast;
-       ast->tech_pvt = call;
-       ast->fds[0] = call->pipe[0];
        /* 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 state */
-       call->state = CHAN_LCR_STATE_OUT_PREPARE;
+
+       /* 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);
+
+       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 int lcr_digit(struct ast_channel *ast, char digit)
+static int lcr_digit_begin(struct ast_channel *ast, char digit)
 {
         struct chan_call *call;
        union parameter newparam;
@@ -1431,13 +1788,13 @@ static int lcr_digit(struct ast_channel *ast, char digit)
 
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-       if ((unsigned long)call <= 1) {
+       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)
@@ -1449,7 +1806,7 @@ static int lcr_digit(struct ast_channel *ast, char digit)
                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;
@@ -1457,10 +1814,15 @@ static int lcr_digit(struct ast_channel *ast, char digit)
        }
 
        ast_mutex_unlock(&chan_lock);
-       
        return(0);
 }
 
+static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
+{
+       printf("DIGIT END %c\n", digit);
+       return (0);
+}
+
 static int lcr_answer(struct ast_channel *ast)
 {
        union parameter newparam;
@@ -1468,23 +1830,25 @@ static int lcr_answer(struct ast_channel *ast)
 
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-       if ((unsigned long)call <= 1) {
+       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");
@@ -1492,6 +1856,14 @@ static int lcr_answer(struct ast_channel *ast)
                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);
+       /* enable dtmf */
+       if (call->no_dtmf)
+               CDEBUG(call, ast, "DTMF is disabled by option.\n");
+       else
+               call->dtmf = 1;
        
        ast_mutex_unlock(&chan_lock);
         return 0;
@@ -1505,7 +1877,7 @@ static int lcr_hangup(struct ast_channel *ast)
        if (!pthread_equal(tid, chan_tid))
                ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-       if ((unsigned long)call <= 1) {
+       if (!call) {
                CERROR(NULL, ast, "Received hangup from Asterisk, but no call instance exists.\n");
                if (!pthread_equal(tid, chan_tid))
                        ast_mutex_unlock(&chan_lock);
@@ -1527,7 +1899,7 @@ static int lcr_hangup(struct ast_channel *ast)
                if (ast->hangupcause > 0)
                        send_release_and_import(call, ast->hangupcause, LOCATION_PRIVATE_LOCAL);
                else
-                       send_release_and_import(call, CAUSE_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL);
+                       send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
                /* remove call */
                free_call(call);
                if (!pthread_equal(tid, chan_tid))
@@ -1559,16 +1931,12 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *f)
 
        if (!f->subclass)
                CDEBUG(NULL, ast, "No subclass\n");
-#ifdef TODO
-       config
-#else
-       if (!(f->subclass & AST_FORMAT_ALAW))
-#endif
+       if (!(f->subclass & ast->nativeformats))
                CDEBUG(NULL, ast, "Unexpected format.\n");
        
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-       if ((unsigned long)call <= 1) {
+       if (!call) {
                ast_mutex_unlock(&chan_lock);
                return -1;
        }
@@ -1582,36 +1950,34 @@ 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;
 
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-       if ((unsigned long)call <= 1) {
+       if (!call) {
                ast_mutex_unlock(&chan_lock);
                return NULL;
        }
        if (call->pipe[0] > -1) {
-               len = read(call->pipe[0], call->read_buff, sizeof(call->read_buff));
+               if (call->rebuffer && !call->hdlc) {
+                       len = read(call->pipe[0], call->read_buff, 160);
+               } else {
+                       len = read(call->pipe[0], call->read_buff, sizeof(call->read_buff));
+               }
+               if (len < 0 && errno == EAGAIN) {
+                       ast_mutex_unlock(&chan_lock);
+                       return &ast_null_frame;
+               }
                if (len <= 0) {
                        close(call->pipe[0]);
                        call->pipe[0] = -1;
+                       ast_mutex_unlock(&chan_lock);
                        return NULL;
                }
        }
 
-       p = call->read_buff;
-       for (i = 0; i < len; i++) {
-               *p = flip_bits[*p];
-               p++;
-       }
-
        call->read_fr.frametype = AST_FRAME_VOICE;
-#ifdef TODO
-       format aus config
-#else
-       call->read_fr.subclass = AST_FORMAT_ALAW;
-#endif
+       call->read_fr.subclass = ast->nativeformats;
        call->read_fr.datalen = len;
        call->read_fr.samples = len;
        call->read_fr.delivery = ast_tv(0,0);
@@ -1629,7 +1995,7 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
 
        ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
-       if ((unsigned long)call <= 1) {
+       if (!call) {
                CERROR(NULL, ast, "Received indicate from Asterisk, but no call instance exists.\n");
                ast_mutex_unlock(&chan_lock);
                return -1;
@@ -1700,6 +2066,9 @@ 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*/
+                       ast_moh_start(ast,data,ast->musicclass);
                         break;
                 case AST_CONTROL_UNHOLD:
                        CDEBUG(call, ast, "Received indicate AST_CONTROL_UNHOLD from Asterisk.\n");
@@ -1707,7 +2076,10 @@ 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);
+                       break;
 
                 default:
                        CERROR(call, ast, "Received indicate from Asterisk with unknown condition %d.\n", cond);
@@ -1723,21 +2095,25 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
 /*
  * fixup asterisk
  */
-static int lcr_fixup(struct ast_channel *oldast, struct ast_channel *newast)
+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 = oldast->tech_pvt;
-       if ((unsigned long)call <= 1) {
-               CERROR(NULL, oldast, "Received fixup from Asterisk, but no call instance exists.\n");
+       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, oldast, "Received fixup from Asterisk.\n");
-       call->ast = newast;
-       ast_mutex_lock(&chan_lock);
+       CDEBUG(call, ast, "Received fixup from Asterisk.\n");
+       call->ast = ast;
+       ast_mutex_unlock(&chan_lock);
        return 0;
 }
 
@@ -1751,7 +2127,7 @@ static int lcr_send_text(struct ast_channel *ast, const char *text)
 
        ast_mutex_lock(&chan_lock);
        call = ast->tech_pvt;
-       if ((unsigned long)call <= 1) {
+       if (!call) {
                CERROR(NULL, ast, "Received send_text from Asterisk, but no call instance exists.\n");
                ast_mutex_unlock(&chan_lock);
                return -1;
@@ -1776,34 +2152,66 @@ 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");
-       
+
+       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 */
+       if (!call1->nodsp && !call2->nodsp) {
+               CDEBUG(NULL, NULL, "Both calls use DSP, briding 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, briding in channel driver.\n");
+       else
+               CDEBUG(NULL, NULL, "One call uses no DSP, briding 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);
        }
+       
        ast_mutex_unlock(&chan_lock);
        
        while(1) {
+               to = -1;
                who = ast_waitfor_n(carr, 2, &to);
 
                if (!who) {
@@ -1813,6 +2221,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;
@@ -1820,6 +2232,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;
@@ -1841,39 +2254,34 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
        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,
+       .send_digit_begin=lcr_digit_begin,
+       .send_digit_end=lcr_digit_end,
        .call=lcr_call,
        .bridge=lcr_bridge, 
        .hangup=lcr_hangup,
@@ -1890,6 +2298,7 @@ static struct ast_channel_tech lcr_tech = {
 /*
  * cli
  */
+#if 0
 static int lcr_show_lcr (int fd, int argc, char *argv[])
 {
        return 0;
@@ -1973,7 +2382,31 @@ static struct ast_cli_entry cli_port_unload =
  "Unloads LCR port, port is closes by mISDN",
  "Usage: lcr port unload \"<port>\"\n",
 };
+#endif
+
+
+
+static int lcr_config_exec(struct ast_channel *ast, void *data)
+{
+       struct chan_call *call;
+
+       ast_mutex_lock(&chan_lock);
+       CDEBUG(NULL, ast, "Received lcr_config (data=%s)\n", (char *)data);
+       /* find channel */
+       call = call_first;
+       while(call) {
+               if (call->ast == ast)
+                       break;
+               call = call->next;
+       }
+       if (call)
+               apply_opt(call, (char *)data);
+       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
@@ -1987,6 +2420,11 @@ int load_module(void)
                             | (i<<7) | ((i&2)<<5) | ((i&4)<<3) | ((i&8)<<1);
        }
 
+       if (read_options() == 0) {
+               CERROR(NULL, NULL, "%s", options_error);
+               return AST_MODULE_LOAD_DECLINE;
+       }
+
        ast_mutex_init(&chan_lock);
        ast_mutex_init(&log_lock);
 
@@ -2001,44 +2439,41 @@ int load_module(void)
        }
        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();
                return AST_MODULE_LOAD_DECLINE;
        }
+
+       ast_register_application("lcr_config", lcr_config_exec, "lcr_config",
+                                "lcr_config(<opt><optarg>:<opt>:...)\n"
+                                "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"
+                                "    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"
+                                "   vr - rxgain control\n"
+                                "   vt - txgain control\n"
+                                "        Volume changes at factor 2 ^ optarg.\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;       
@@ -2063,6 +2498,9 @@ int unload_module(void)
        
        ast_channel_unregister(&lcr_tech);
 
+        ast_unregister_application("lcr_config");
+
+
        if (mISDN_created) {
                bchannel_deinitialize();
                mISDN_created = 0;
@@ -2082,34 +2520,6 @@ int reload_module(void)
        return 0;
 }
 
-#ifdef TODO
-wech damit
-
-int usecnt;
-ast_mutex_t usecnt_lock;
-
-int usecount(void)
-{
-       int res;
-       ast_mutex_lock(&usecnt_lock);
-       res = usecnt;
-       ast_mutex_unlock(&usecnt_lock);
-       return res;
-}
-
-
-char *desc="Channel driver for lcr";
-
-char *description(void)
-{
-       return desc;
-}
-
-char *key(void)
-{
-       return ASTERISK_GPL_KEY;
-}
-#endif
 
 #define AST_MODULE "chan_lcr"