X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=7eabe0e6cdf84f86417526983d78ad3cb208bdd1;hp=16bb96afa789aef3118515a99b62382858fd4109;hb=ab4a1270e9c99ab7a21a957759de2a885100afb1;hpb=87a53c2ea1ad901eaba227cdbc2752273fda73ef

diff --git a/chan_lcr.c b/chan_lcr.c
index 16bb96a..7eabe0e 100644
--- a/chan_lcr.c
+++ b/chan_lcr.c
@@ -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>
@@ -86,6 +108,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>
@@ -116,15 +139,17 @@ 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 "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];
+unsigned char flip_bits[256];
 
 int lcr_debug=1;
 int mISDN_created=1;
@@ -142,7 +167,7 @@ int lcr_sock = -1;
 
 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 +175,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 +190,12 @@ 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);
 
 	ast_mutex_unlock(&log_lock);
 }
@@ -180,7 +205,7 @@ 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 *find_call_ref(unsigned int ref)
 {
 	struct chan_call *call = call_first;
 
@@ -207,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;
 
@@ -230,9 +255,9 @@ void free_call(struct chan_call *call)
 		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)
 			{
@@ -262,7 +287,7 @@ 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) {
@@ -298,11 +323,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;
 
@@ -310,22 +334,201 @@ 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));
 
 	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, 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' (transparent) expects no parameter.\n", opt);
+				break;
+			}
+			CDEBUG(call, call->ast, "Option 't' (transparent).\n");
+			if (!call->transparent) {
+				call->transparent = 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->transparent)?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
  */
@@ -337,19 +540,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));
+       	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])
+       	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, 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;	
 	}
@@ -382,10 +591,7 @@ 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_info1 = (options.law=='a')?3:2;
 	newparam.setup.capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
 	newparam.setup.capainfo.hlc = INFO_HLC_NONE;
 	newparam.setup.capainfo.exthlc = INFO_HLC_NONE;
@@ -404,10 +610,10 @@ 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));
@@ -430,6 +636,27 @@ static void bridge_message_if_bridged(struct chan_call *call, int message_type,
 }
 
 /*
+ * 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
@@ -439,6 +666,8 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
 	int cause, ret;
 	union parameter newparam;
 
+	CDEBUG(call, ast, "Try to start pbx. (exten=%s context=%s complete=%s)\n", ast->exten, ast->context, complete?"yes":"no");
+	
 	if (complete)
 	{
 		/* if not match */
@@ -447,6 +676,7 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
 			CDEBUG(call, ast, "Got 'sending complete', but extension '%s' will not match at context '%s' - releasing.\n", ast->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);
@@ -460,6 +690,7 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
 
 		/* change state */
 		call->state = CHAN_LCR_STATE_IN_PROCEEDING;
+		ast_setstate(ast, AST_STATE_OFFHOOK);
 
 		goto start;
 	}
@@ -467,11 +698,14 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
 	if (ast_canmatch_extension(ast, ast->context, ast->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;
+		ast_setstate(ast, AST_STATE_OFFHOOK);
 
 		/* if match, start pbx */
 		if (ast_exists_extension(ast, ast->context, ast->exten, 1, call->oad)) {
@@ -489,10 +723,7 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c
 	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;
@@ -520,9 +751,8 @@ 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 */
 	ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel);
@@ -530,15 +760,12 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
 	{
 		/* 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;
@@ -549,14 +776,14 @@ 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);
 	if (param->setup.callerinfo.id[0])
 		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:
@@ -583,28 +810,25 @@ 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 (ast->transfercapability == INFO_BC_DATAUNRESTRICTED
+	 || ast->transfercapability == INFO_BC_DATARESTRICTED
+	 || ast->transfercapability == INFO_BC_VIDEO)
+		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);
 }
 
 /*
@@ -617,7 +841,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;
@@ -632,9 +856,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);
 }
 
 /*
@@ -646,9 +870,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);
 }
 
 /*
@@ -656,15 +880,24 @@ 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 */
+	/* 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);
 }
 
 /*
@@ -692,16 +925,16 @@ static void lcr_in_disconnect(struct chan_call *call, int message_type, union pa
 	}
 #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 */
+	/* 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
 		}
@@ -715,7 +948,7 @@ static void lcr_in_release(struct chan_call *call, int message_type, union 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;
@@ -727,12 +960,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
 		}
@@ -748,12 +981,11 @@ 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_frame fr;
-	char *p;
+	struct ast_channel *ast = call->ast;
 
-	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 (!call->ast) return;
+	if (!ast) return;
 
 	/* pbx not started */
 	if (!call->pbx_started)
@@ -764,22 +996,10 @@ 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++;
-		}
-	}
+	/* 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");
@@ -792,8 +1012,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 */
@@ -814,13 +1044,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));
 
@@ -830,7 +1079,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);
@@ -848,11 +1097,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;
@@ -861,25 +1109,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->transparent)?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:
@@ -911,7 +1174,7 @@ hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor de
 		if (param->direction)
 		{
 			/* new ref from lcr */
-			CDEBUG(NULL, NULL, "Received new ref by LCR, of call from LCR. (ref=%ld)\n", 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);
@@ -933,9 +1196,7 @@ hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor de
 			{
 				/* 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);
+				send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
 				return(0);
 			}
 			/* store new ref */
@@ -948,15 +1209,9 @@ hier muesen alle bchannel-features gesetzt werden (pipeline...) falls sie vor de
 			{
 				/* 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);
@@ -1048,8 +1303,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");
@@ -1064,16 +1318,19 @@ 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);
+		strcpy(call->queue_string, "H");
 		call = call->next;
 	}
+
+	/* release all bchannels */
+	while(bchannel_first)
+		free_bchannel(bchannel_first);
 }
 
 
@@ -1085,13 +1342,11 @@ int handle_socket(void)
 {
 	int work = 0;
 	int len;
-	struct admin_message msg;
 	struct admin_list *admin;
-
-	int sock;
+	struct admin_message msg;
 
 	/* read from socket */
-	len = read(sock, &msg, sizeof(msg));
+	len = read(lcr_sock, &msg, sizeof(msg));
 	if (len == 0)
 	{
 		CERROR(NULL, NULL, "Socket closed.\n");
@@ -1107,7 +1362,7 @@ int handle_socket(void)
 		if (msg.message != ADMIN_MESSAGE)
 		{
 			CERROR(NULL, NULL, "Socket received illegal message %d.\n", msg.message);
-			return(-1); // socket error
+			return(-1);
 		}
 		receive_message(msg.u.msg.type, msg.u.msg.ref, &msg.u.msg.param);
 		work = 1;
@@ -1124,7 +1379,7 @@ int handle_socket(void)
 	if (!admin_first)
 		return(work);
 	admin = admin_first;
-	len = write(sock, &admin->msg, sizeof(msg));
+	len = write(lcr_sock, &admin->msg, sizeof(msg));
 	if (len == 0)
 	{
 		CERROR(NULL, NULL, "Socket closed.\n");
@@ -1160,18 +1415,17 @@ 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;
+	unsigned int 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 */
@@ -1180,17 +1434,19 @@ int open_socket(void)
 	strcpy(sock_address.sun_path, socket_name);
 
 	/* connect socket */
-	if ((conn = connect(sock, (struct sockaddr *)&sock_address, SUN_LEN(&sock_address))) < 0)
+	if ((conn = connect(lcr_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);
+		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)
+	if ((ret = ioctl(lcr_sock, FIONBIO, (unsigned char *)(&on))) < 0)
 	{
-		close(sock);
+		close(lcr_sock);
+		lcr_sock = -1;
 		CERROR(NULL, NULL, "Failed to set socket into non-blocking IO.\n");
 		return(ret);
 	}
@@ -1200,16 +1456,98 @@ int open_socket(void)
 	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;
+	
+	/* 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;
+}
+
+
+/* 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;
+						fr.subclass = *p;
+						fr.delivery = ast_tv(0, 0);
+						fr.len = 100;
+						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;
@@ -1218,9 +1556,11 @@ static void *chan_thread(void *arg)
 	time_t retry = 0, now;
 
 	bchannel_pid = getpid();
+
+//	signal(SIGPIPE, sighandler);
 	
 	memset(&param, 0, sizeof(union parameter));
-	if (lcr_sock > 0)
+	if (lcr_sock < 0)
 		time(&retry);
 
 	ast_mutex_lock(&chan_lock);
@@ -1233,8 +1573,7 @@ static void *chan_thread(void *arg)
 			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;
+				close_socket();
 				release_all_calls();
 				time(&retry);
 			}
@@ -1243,9 +1582,9 @@ static void *chan_thread(void *arg)
 		} else {
 			time(&now);
 			if (retry && now-retry > 5) {
-				CERROR(NULL, NULL, "Retry to open socket.\n");
+				CDEBUG(NULL, NULL, "Retry to open socket.\n");
 				retry = 0;
-				if (!(lcr_sock = open_socket())) {
+				if (open_socket() < 0) {
 					time(&retry);
 				}
 				work = 1;
@@ -1257,7 +1596,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);
@@ -1265,10 +1610,14 @@ static void *chan_thread(void *arg)
 		}
 	}
 
+	close_socket();
+
 	CERROR(NULL, NULL, "Thread exit.\n");
 	
 	ast_mutex_unlock(&chan_lock);
 
+//	signal(SIGPIPE, SIG_DFL);
+
 	return NULL;
 }
 
@@ -1278,28 +1627,30 @@ 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)
 	{
 		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;
 	}
+
 	/* create asterisk channel instrance */
 	ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel);
 	if (!ast)
@@ -1307,36 +1658,52 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c
 		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;
 }
 
@@ -1345,29 +1712,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)
 {
+	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");
+	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);
 
-	/* send setup message, if we already have a callref */
-	if (call->ref)
-		send_setup_to_lcr(call);
+	/* 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;
@@ -1379,13 +1775,13 @@ static int lcr_digit(struct ast_channel *ast, char digit)
 
 	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)
@@ -1397,7 +1793,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;
@@ -1405,10 +1801,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;
@@ -1416,7 +1817,7 @@ 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;
@@ -1433,6 +1834,21 @@ static int lcr_answer(struct ast_channel *ast)
 	send_message(MESSAGE_CONNECT, call->ref, &newparam);
 	/* 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);
+	/* 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;
@@ -1440,14 +1856,13 @@ 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))
 		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))
 			ast_mutex_unlock(&chan_lock);
@@ -1466,10 +1881,10 @@ static int lcr_hangup(struct ast_channel *ast)
 	{
 		/* 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_RESSOURCEUNAVAIL, LOCATION_PRIVATE_LOCAL);
 		/* remove call */
 		free_call(call);
 		if (!pthread_equal(tid, chan_tid))
@@ -1498,24 +1913,20 @@ static int lcr_hangup(struct ast_channel *ast)
 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, f->data, f->samples);
 	ast_mutex_unlock(&chan_lock);
 	return 0;
 }
@@ -1529,13 +1940,22 @@ static struct ast_frame *lcr_read(struct ast_channel *ast)
 
 	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) {
+			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) {
+			close(call->pipe[0]);
+			call->pipe[0] = -1;
+			return NULL;
+		}
+	}
 
 	p = call->read_buff;
 	for (i = 0; i < len; i++) {
@@ -1544,10 +1964,7 @@ static struct ast_frame *lcr_read(struct ast_channel *ast)
 	}
 
 	call->read_fr.frametype = AST_FRAME_VOICE;
-#ifdef TODO
-	format aus config
-#endif
-	call->read_fr.subclass = AST_FORMAT_ALAW;
+	call->read_fr.subclass = ast->nativeformats;
 	call->read_fr.datalen = len;
 	call->read_fr.samples = len;
 	call->read_fr.delivery = ast_tv(0,0);
@@ -1560,12 +1977,12 @@ 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;
 
 	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;
@@ -1574,37 +1991,60 @@ 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;
+			}
+			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;
+			}
+			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_RINGING);
+			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;
+			}
+			break;
                 case -1:
-			/* return */
-			ast_mutex_unlock(&chan_lock);
-                        return 0;
+			CDEBUG(call, ast, "Received indicate -1.\n");
+                        res = -1;
+			break;
 
                 case AST_CONTROL_VIDUPDATE:
+			CDEBUG(call, ast, "Received indicate AST_CONTROL_VIDUPDATE.\n");
                         res = -1;
                         break;
                 case AST_CONTROL_HOLD:
@@ -1613,6 +2053,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");
@@ -1620,18 +2063,65 @@ 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);
-			/* return */
-			ast_mutex_unlock(&chan_lock);
-                        return -1;
+                        res = -1;
+			break;
         }
 
 	/* return */
 	ast_mutex_unlock(&chan_lock);
-        return 0;
+        return res;
+}
+
+/*
+ * fixup asterisk
+ */
+static int lcr_fixup(struct ast_channel *oldast, struct ast_channel *newast)
+{
+        struct chan_call *call;
+
+	ast_mutex_lock(&chan_lock);
+	call = oldast->tech_pvt;
+	if (!call) {
+		CERROR(NULL, oldast, "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);
+	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_lock(&chan_lock);
+	return 0;
 }
 
 /*
@@ -1645,11 +2135,14 @@ 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, ast, "Received briding request from Asterisk.\n");
+	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);
@@ -1673,15 +2166,20 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
 	ast_mutex_unlock(&chan_lock);
 	
 	while(1) {
+		to = -1;
 		who = ast_waitfor_n(carr, 2, &to);
 
 		if (!who) {
-			CDEBUG(NULL, ast, "Empty read on bridge, breaking out.\n");
+			CDEBUG(NULL, NULL, "Empty read on bridge, breaking out.\n");
 			break;
 		}
 		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;
@@ -1689,6 +2187,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;
@@ -1704,7 +2203,7 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
     
 	}
 	
-	CDEBUG(NULL, ast, "Releasing bride.\n");
+	CDEBUG(NULL, NULL, "Releasing bride.\n");
 
 	/* split channels */
 	ast_mutex_lock(&chan_lock);
@@ -1728,21 +2227,16 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
 			call2->bridge_call->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,
@@ -1750,8 +2244,8 @@ static struct ast_channel_tech lcr_tech = {
 	.read=lcr_read,
 	.write=lcr_write,
 	.indicate=lcr_indicate,
-//	.fixup=lcr_fixup,
-//	.send_text=lcr_send_text,
+	.fixup=lcr_fixup,
+	.send_text=lcr_send_text,
 	.properties=0
 };
 
@@ -1759,6 +2253,7 @@ static struct ast_channel_tech lcr_tech = {
 /*
  * cli
  */
+#if 0
 static int lcr_show_lcr (int fd, int argc, char *argv[])
 {
 	return 0;
@@ -1842,71 +2337,98 @@ 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
  */
 int load_module(void)
 {
-	int i;
+	u_short i;
 
-	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() == 0) {
+		CERROR(NULL, NULL, "%s", options_error);
+		return AST_MODULE_LOAD_DECLINE;
+	}
 
 	ast_mutex_init(&chan_lock);
 	ast_mutex_init(&log_lock);
-	
-	if (!(lcr_sock = open_socket())) {
+
+	if (open_socket() < 0) {
 		/* 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();
+		return AST_MODULE_LOAD_DECLINE;
 	}
 	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();
+		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 all audio 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;	
@@ -1914,9 +2436,9 @@ int load_module(void)
 	{
 		/* failed to create thread */
 		bchannel_deinitialize();
-		close_socket(lcr_sock);
+		close_socket();
 		ast_channel_unregister(&lcr_tech);
-		return -1;
+		return AST_MODULE_LOAD_DECLINE;
 	}
 	return 0;
 }
@@ -1931,6 +2453,9 @@ int unload_module(void)
 	
 	ast_channel_unregister(&lcr_tech);
 
+        ast_unregister_application("lcr_config");
+
+
 	if (mISDN_created) {
 		bchannel_deinitialize();
 		mISDN_created = 0;
@@ -1944,46 +2469,18 @@ int unload_module(void)
 	return 0;
 }
 
-static int reload_module(void)
+int reload_module(void)
 {
 //	reload_config();
 	return 0;
 }
 
-#ifdef TODO
-mutex init fehlt noch
-ast_mutex_t usecnt_lock;
-int usecnt;
-
-int usecount(void)
-{
-	int res;
-	ast_mutex_lock(&usecnt_lock);
-	res = usecnt;
-	ast_mutex_unlock(&usecnt_lock);
-	return res;
-}
-#endif
-
-
-char *desc="Channel driver for lcr";
-
-char *description(void)
-{
-	return desc;
-}
-
-char *key(void)
-{
-	return ASTERISK_GPL_KEY;
-}
 
 #define AST_MODULE "chan_lcr"
-AST_MODULE_INFO(ASTERISK_GPL_KEY,
-                                AST_MODFLAG_DEFAULT,
-                                "Channel driver for LCR",
-                                .load = load_module,
-                                .unload = unload_module,
-                                .reload = reload_module,
-                           );
+
+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,
+	       );