work on chan_lcr
[lcr.git] / chan_lcr.c
index c5b2ec9..f33d917 100644 (file)
@@ -79,11 +79,12 @@ If the ref is 0 and the state is CHAN_LCR_STATE_RELEASE, see the proceedure
 
 */
 
-todo (before first compile)
-reconnect after socket closed, release all calls.
-debug of call handling
-ausloesen beim socket-verlust
+u_char flip_bits[256];
 
+#warning TODO: bchannel oeffnen und aktivieren (wer macht das?:)
+#warning reconnect after socket closed, release all calls.
+#warning debug of call handling
+#warning ausloesen beim socket-verlust
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -98,18 +99,8 @@ ausloesen beim socket-verlust
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <pthread.h>
 #include <semaphore.h>
 
-#include "extension.h"
-#include "message.h"
-#include "lcrsocket.h"
-#include "cause.h"
-#include "bchannel.h"
-#include "chan_lcr.h"
-
-
-
 #include <asterisk/module.h>
 #include <asterisk/channel.h>
 #include <asterisk/config.h>
@@ -130,17 +121,27 @@ ausloesen beim socket-verlust
 #include <asterisk/features.h>
 #include <asterisk/sched.h>
 
+#include "extension.h"
+#include "message.h"
+#include "lcrsocket.h"
+#include "cause.h"
+#include "bchannel.h"
+#include "chan_lcr.h"
+#include "callerid.h"
+
 CHAN_LCR_STATE // state description structure
 
 int lcr_debug=1;
 int mISDN_created=1;
 
-char lcr_type[]="LCR";
+char lcr_type[]="lcr";
 
 pthread_t chan_tid;
-pthread_mutex_t chan_lock;
+ast_mutex_t chan_lock;
 int quit;
 
+int glob_channel = 0;
+
 int lcr_sock = -1;
 
 struct admin_list {
@@ -148,6 +149,8 @@ struct admin_list {
        struct admin_msg msg;
 } *admin_first = NULL;
 
+static struct ast_channel_tech lcr_tech;
+
 /*
  * channel and call instances
  */
@@ -166,6 +169,20 @@ struct chan_call *find_call_ref(unsigned long ref)
        return(call);
 }
 
+#if 0
+struct chan_call *find_call_ast(struct ast_channel *ast)
+{
+       struct chan_call *call = call_first;
+
+       while(call)
+       {
+               if (call->ast == ast)
+                       break;
+               call = call->next;
+       }
+       return(call);
+}
+
 struct chan_call *find_call_handle(unsigned long handle)
 {
        struct chan_call *call = call_first;
@@ -178,6 +195,7 @@ struct chan_call *find_call_handle(unsigned long handle)
        }
        return(call);
 }
+#endif
 
 struct chan_call *alloc_call(void)
 {
@@ -189,9 +207,14 @@ struct chan_call *alloc_call(void)
        *callp = (struct chan_call *)malloc(sizeof(struct chan_call));
        if (*callp)
                memset(*callp, 0, sizeof(struct chan_call));
+       if (pipe((*callp)->pipe) < 0) {
+               free_call(*callp);
+               return;
+       }
        return(*callp);
 }
 
+
 void free_call(struct chan_call *call)
 {
        struct chan_call **temp = &call_first;
@@ -201,10 +224,23 @@ void free_call(struct chan_call *call)
                if (*temp == call)
                {
                        *temp = (*temp)->next;
-                       if (call->bch)
+                       if (call->pipe[0])
+                               close(call->pipe[0]);
+                       if (call->pipe[1])
+                               close(call->pipe[1]);
+                       if (call->bchannel)
                        {
-                               if (call->bch->call)
-                                       call->bch->call = NULL;
+                               if (call->bchannel->call)
+                                       call->bchannel->call = NULL;
+                               else
+                                       warnung
+                       }
+                       if (call->bridge_call)
+                       {
+                               if (call->bridge_call->bridge_call)
+                                       call->bridge_call->bridge_call = NULL;
+                               else
+                                       warnung
                        }
                        free(call);
                        return;
@@ -213,7 +249,7 @@ void free_call(struct chan_call *call)
        }
 }
 
-unsigned short new_brige_id(void)
+unsigned short new_bridge_id(void)
 {
        struct chan_call *call;
        unsigned short id = 1;
@@ -268,6 +304,91 @@ int send_message(int message_type, unsigned long ref, union parameter *param)
 }
 
 /*
+ * send setup info to LCR
+ * this function is called, when asterisk call is received and ref is received
+ */
+static void send_setup_to_lcr(struct chan_call *call)
+{
+       union parameter newparam;
+       struct ast_channel *ast = call->ast;
+
+       if (!call->ast || !call->ref)
+               return;
+
+       /* send setup message to LCR */
+       memset(&newparam, 0, sizeof(union parameter));
+               newparam.setup.callerinfo.itype = INFO_ITYPE_CHAN;      
+               newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;   
+       if (ast->cid.cid_num) if (ast->cid.cid_num[0])
+               strncpy(newparam.setup.callerinfo.id, ast->cid.cid_num, sizeof(newparam.setup.callerinfo.id)-1);
+       if (ast->cid.cid_name) if (ast->cid.cid_name[0])
+               strncpy(newparam.setup.callerinfo.name, ast->cid.cid_name, sizeof(newparam.setup.callerinfo.name)-1);
+       if (ast->cid.cid_rdnis) if (ast->cid.cid_rdnis[0])
+       {
+               strncpy(newparam.setup.redirinfo.id, ast->cid.cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1);
+                       newparam.setup.redirinfo.itype = INFO_ITYPE_CHAN;       
+               newparam.setup.redirinfo.ntype = INFO_NTYPE_UNKNOWN;    
+       }
+       switch(ast->cid.cid_pres & AST_PRES_RESTRICTION)
+       {
+               case AST_PRES_ALLOWED:
+               newparam.setup.callerinfo.present = INFO_PRESENT_ALLOWED;
+               break;
+               case AST_PRES_RESTRICTED:
+               newparam.setup.callerinfo.present = INFO_PRESENT_RESTRICTED;
+               break;
+               case AST_PRES_UNAVAILABLE:
+               newparam.setup.callerinfo.present = INFO_PRESENT_NOTAVAIL;
+               break;
+               default:
+               newparam.setup.callerinfo.present = INFO_PRESENT_NULL;
+       }
+       switch(ast->cid.cid_ton)
+       {
+               case 4:
+               newparam.setup.callerinfo.ntype = INFO_NTYPE_SUBSCRIBER;
+               break;
+               case 2:
+               newparam.setup.callerinfo.ntype = INFO_NTYPE_NATIONAL;
+               break;
+               case 1:
+               newparam.setup.callerinfo.ntype = INFO_NTYPE_INTERNATIONAL;
+               break;
+               default:
+               newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
+       }
+       newparam.setup.capainfo.bearer_capa = ast->transfercapability;
+#warning todo
+//     newparam.setup.capainfo.bearer_user = alaw 3, ulaw 2;
+       newparam.setup.capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
+       newparam.setup.capainfo.hlc = INFO_HLC_NONE;
+       newparam.setup.capainfo.exthlc = INFO_HLC_NONE;
+       send_message(MESSAGE_SETUP, call->ref, &newparam);
+
+       /* change to outgoing setup state */
+       call->state = CHAN_LCR_STATE_OUT_SETUP;
+}
+
+/*
+ * send dialing info to LCR
+ * this function is called, when setup acknowledge is received and dialing
+ * info is available.
+ */
+static void send_dialque_to_lcr(struct chan_call *call)
+{
+       union parameter newparam;
+
+       if (!call->ast || !call->ref || !call->dialque)
+               return;
+       
+       /* send setup message to LCR */
+       memset(&newparam, 0, sizeof(union parameter));
+       strncpy(newparam.information.id, call->dialque, sizeof(newparam.information.id)-1);
+       call->dialque[0] = '\0';
+       send_message(MESSAGE_INFORMATION, call->ref, &newparam);
+}
+
+/*
  * in case of a bridge, the unsupported message can be forwarded directly
  * to the remote call.
  */
@@ -275,11 +396,84 @@ static void bridge_message_if_bridged(struct chan_call *call, int message_type,
 {
        /* check bridge */
        if (!call) return;
-       if (!call->channel) return;
-       if (!call->channel->bridge_channel) return;
-       if (!call->channel->bridge_channel->call) return;
-       if (!call->channel->bridge_channel->call->ref) return;
-       send_message(MESSAGE_RELEASE, call->channel->bridge_channel->call->ref, param);
+       if (!call->bridge_call) return;
+       send_message(message_type, call->bridge_call->ref, param);
+}
+
+/*
+ * check if extension matches and start asterisk
+ * if it can match, proceed
+ * if not, release
+ */
+static void lcr_setup_pbx(struct chan_call *call, struct ast_channel *ast, int complete)
+{
+       int cause;
+
+       if (complete)
+       {
+               /* if not match */
+               if (!ast_canmatch_extension(ast, ast->context, call->dad, 1, call->oad))
+               {
+                       cause = 1;
+                       goto release;
+               if (!ast_exists_extension(ast, ast->context, call->dad, 1, call->oad))
+               {
+                       cause = 28;
+                       goto release;
+               }
+               /* send setup acknowledge to lcr */
+               memset(&newparam, 0, sizeof(union parameter));
+               send_message(MESSAGE_PROCEEDING, call->ref, &newparam);
+
+               /* change state */
+               call->state = CHAN_LCR_STATE_IN_PROCEEDING;
+
+               goto start;
+       }
+
+       if (ast_canmatch_extension(ast, ast->context, dad, 1, oad))
+       {
+               /* send setup acknowledge to lcr */
+               memset(&newparam, 0, sizeof(union parameter));
+               send_message(MESSAGE_OVERLAP, call->ref, &newparam);
+
+               /* change state */
+               call->state = CHAN_LCR_STATE_IN_DIALING;
+
+               /* if match, start pbx */
+               if (ast_exists_extension(ast, ast->context, dad, 1, oad))
+                       goto start;
+
+               /* if can match */
+               return;
+       }
+
+       /* if not match */
+       cause = 1;
+       release:
+       /* release lcr */
+       memset(&newparam, 0, sizeof(union parameter));
+       newparam.disconnectinfo.cause = cause;
+       newparam.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+       send_message(MESSAGE_RELEASE, call->ref, &newparam);
+       call->ref = 0;
+       /* release asterisk */
+       ast->hangupcause = call->cause;
+       ast_queue_hangup(ast);
+       /* change to release state */
+       call->state = CHAN_LCR_STATE_RELEASE;
+       return;
+       
+       start:
+       /* send setup to asterisk */
+       ret = ast_pbx_start(ast);
+       if (ret < 0)
+       {
+               cause = (ret==-2)?34:27;
+               goto release;
+       }
+       call->pbx_started = 1;
+       return;
 }
 
 /*
@@ -291,7 +485,7 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
        union parameter newparam;
 
        /* create asterisk channel instrance */
-       ast = ast_channel_alloc(1);
+       ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel);
        if (!ast)
        {
                /* release */
@@ -307,65 +501,64 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
        call->ast = ast;
        ast->tech_pvt = call;
        ast->tech = &lcr_tech;
+       ast->fds[0] = call->pipe[0];
        
        /* fill setup information */
-       if (param->setup.exten[0])
-               strdup(ast->exten, param->setup.exten);
+       if (param->setup.dialinginfo.id)
+               strncpy(ast->exten, param->setup.dialinginfo.id, AST_MAX_EXTENSION-1);
+       if (param->setup.context[0])
+               strncpy(ast->context, param->setup.exten, AST_MAX_CONTEXT-1);
        if (param->setup.callerinfo.id[0])
-               strdup(ast->cid->cid_num, param->setup.callerinfo.id);
+               ast->cid.cid_num = strdup(param->setup.callerinfo.id);
        if (param->setup.callerinfo.name[0])
-               strdup(ast->cid->cid_name, param->setup.callerinfo.name);
+               ast->cid.cid_name = strdup(param->setup.callerinfo.name);
+#warning todo
+#if 0
        if (param->setup.redirinfo.id[0])
-               strdup(ast->cid->cid_name, numberrize_callerinfo(param->setup.callerinfo.name, param->setup.callerinfo.ntype, configfile->prefix_nat, configfile->prefix_inter));
+               ast->cid.cid_name = strdup(numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, configfile->prefix_nat, configfile->prefix_inter));
+#endif
        switch (param->setup.callerinfo.present)
        {
                case INFO_PRESENT_ALLOWED:
-                       ast->cid->cid_pres = AST_PRESENT_ALLOWED;
+                       ast->cid.cid_pres = AST_PRES_ALLOWED;
                break;
                case INFO_PRESENT_RESTRICTED:
-                       ast->cid->cid_pres = AST_PRESENT_RESTRICTED;
+                       ast->cid.cid_pres = AST_PRES_RESTRICTED;
                break;
                default:
-                       ast->cid->cid_pres = AST_PRESENT_UNAVAILABLE;
+                       ast->cid.cid_pres = AST_PRES_UNAVAILABLE;
        }
        switch (param->setup.callerinfo.ntype)
        {
                case INFO_NTYPE_SUBSCRIBER:
-                       ast->cid->cid_ton = AST_wasnu;
+                       ast->cid.cid_ton = 4;
                break;
                case INFO_NTYPE_NATIONAL:
-                       ast->cid->cid_ton = AST_wasnu;
+                       ast->cid.cid_ton = 2;
                break;
                case INFO_NTYPE_INTERNATIONAL:
-                       ast->cid->cid_ton = AST_wasnu;
+                       ast->cid.cid_ton = 1;
                break;
                default:
-                       ast->cid->cid_ton = AST_wasnu;
+                       ast->cid.cid_ton = 0;
        }
-       ast->transfercapability = param->setup.bearerinfo.capability;
+       ast->transfercapability = param->setup.capainfo.bearer_capa;
+       strcpy(call->dad, param->setup.dialinginfo.id);
+       strcpy(call->oad, numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, configfile->prefix_nat, configfile->prefix_inter));
 
        /* configure channel */
-       ast->state = AST_STATE_RESERVED;
-       snprintf(ast->name, sizeof(ast->name), "%s/%d", lcr_type, ++glob_channel);
-       ast->name[sizeof(ast->name)-1] = '\0';
-       ast->type = lcr_type;
+#warning todo
+#if 0
        ast->nativeformat = configfile->lawformat;
        ast->readformat = ast->rawreadformat = configfile->lawformat;
        ast->writeformat = ast->rawwriteformat = configfile->lawformat;
+#endif
        ast->hangupcause = 0;
 
        /* change state */
        call->state = CHAN_LCR_STATE_IN_SETUP;
 
-       /* send setup to asterisk */
-       ast_pbx_start(ast);
-
-       /* send setup acknowledge to lcr */
-       memset(&newparam, 0, sizeof(union parameter));
-       send_message(MESSAGE_OVERLAP, call->ref, &newparam);
-
-       /* change state */
-       call->state = CHAN_LCR_STATE_IN_DIALING;
+       lcr_start_pbx(call, ast, param->setup.dialinginfo.complete);
 }
 
 /*
@@ -391,7 +584,7 @@ static void lcr_in_proceeding(struct chan_call *call, int message_type, union pa
        call->state = CHAN_LCR_STATE_OUT_PROCEEDING;
        /* send event to asterisk */
        if (call->ast)
-               ast_queue_control(ast, AST_CONTROL_PROCEEDING);
+               ast_queue_control(call->ast, AST_CONTROL_PROCEEDING);
 }
 
 /*
@@ -403,7 +596,7 @@ static void lcr_in_alerting(struct chan_call *call, int message_type, union para
        call->state = CHAN_LCR_STATE_OUT_ALERTING;
        /* send event to asterisk */
        if (call->ast)
-               ast_queue_control(ast, AST_CONTROL_RINGING);
+               ast_queue_control(call->ast, AST_CONTROL_RINGING);
 }
 
 /*
@@ -414,10 +607,10 @@ static void lcr_in_connect(struct chan_call *call, int message_type, union param
        /* change state */
        call->state = CHAN_LCR_STATE_CONNECT;
        /* copy connectinfo */
-       memcpy(call->connectinfo, param->connectinfo, sizeof(struct connect_info));
+       memcpy(&call->connectinfo, &param->connectinfo, sizeof(struct connect_info));
        /* send event to asterisk */
        if (call->ast)
-               ast_queue_control(ast, AST_CONTROL_ANSWER);
+               ast_queue_control(call->ast, AST_CONTROL_ANSWER);
 }
 
 /*
@@ -425,29 +618,31 @@ static void lcr_in_connect(struct chan_call *call, int message_type, union param
  */
 static void lcr_in_disconnect(struct chan_call *call, int message_type, union parameter *param)
 {
+       struct ast_channel *ast = call->ast;
        union parameter newparam;
 
        /* change state */
        call->state = CHAN_LCR_STATE_IN_DISCONNECT;
        /* save cause */
-       call->cause = param.disconnectinfo.cause;
-       call->location = param.disconnectinfo.location;
+       call->cause = param->disconnectinfo.cause;
+       call->location = param->disconnectinfo.location;
+per option
+
+wenn setup raus geht, pointer 
        /* if bridge, forward disconnect and return */
-       if (call->channel)
-               if (call->channel->bridge_channel)
-                       if (call->channel->bridge_channel->call)
-                       {
-                               bridge_message_if_bridged(call, message_type, param);
-                               return;
-                       }
+       if (call->bridge_call)
+       {
+               bridge_message_if_bridged(call, message_type, param);
+               return;
+       }
        /* release lcr */
        newparam.disconnectinfo.cause = CAUSE_NORMAL;
        newparam.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
-       send_message(MESSAGE_RELEASE, ref, &newparam);
-       ref = 0;
+       send_message(MESSAGE_RELEASE, call->ref, &newparam);
+       call->ref = 0;
        /* release asterisk */
-       call->ast->hangupcause = call->cause;
-       ast_queue_hangup(call->ast);
+       ast->hangupcause = call->cause;
+       ast_queue_hangup(ast);
        /* change to release state */
        call->state = CHAN_LCR_STATE_RELEASE;
 }
@@ -457,18 +652,23 @@ static void lcr_in_disconnect(struct chan_call *call, int message_type, union pa
  */
 static void lcr_in_release(struct chan_call *call, int message_type, union parameter *param)
 {
+       struct ast_channel *ast = call->ast;
+
        /* release ref */
-       call->ref = NULL;
+       call->ref = 0;
        /* change to release state */
        call->state = CHAN_LCR_STATE_RELEASE;
        /* copy release info */
        if (!call->cause)
-              call->cause = param.disconnectinfo.cause;
+       {
+              call->cause = param->disconnectinfo.cause;
+              call->location = param->disconnectinfo.location;
+       }
        /* if we have an asterisk instance, send hangup, else we are done */
-       if (call->ast)
+       if (ast)
        {
-               call->ast->hangupcause = call->cause;
-               ast_queue_hangup(call->ast);
+               ast->hangupcause = call->cause;
+               ast_queue_hangup(ast);
        } else
        {
                free_call(call);
@@ -485,9 +685,17 @@ static void lcr_in_information(struct chan_call *call, int message_type, union p
        char *p;
 
        if (!call->ast) return;
+
+       /* pbx not started */
+       if (!call->pbx_started)
+       {
+               strncat(ast->exten, param->information.id, AST_MAX_EXTENSION-1);
+               lcr_start_pbx(call, ast, param->information.complete);
+               return;
+       }
        
        /* copy digits */
-       p = param->dialinginfo.id;
+       p = param->information.id;
        if (call->state == CHAN_LCR_STATE_IN_DIALING && *p)
        {
                while (*p)
@@ -577,10 +785,11 @@ int receive_message(int message_type, unsigned long ref, union parameter *param)
                        /* link to call */
                        if ((call = find_call_ref(ref)))
                        {
-                               bchannel->ref = ref;
-                               call->bchannel_handle = param->bchannel.handle;
+                               bchannel->call = call;
+                               call->bchannel = bchannel;
 #warning hier muesen alle stati gesetzt werden falls sie vor dem b-kanal verfügbar waren
-                               bchannel_join(bchannel, call->bridge_id);
+                               if (call->bridge_id)
+                                       bchannel_join(bchannel, call->bridge_id);
                        }
                        if (bchannel_create(bchannel))
                                bchannel_activate(bchannel, 1);
@@ -598,12 +807,7 @@ int receive_message(int message_type, unsigned long ref, union parameter *param)
                                fprintf(stderr, "error: bchannel handle %x not assigned.\n", (int)param->bchannel.handle);
                                return(-1);
                        }
-                       /* unlink from call */
-                       if ((call = find_call_ref(bchannel->ref)))
-                       {
-                               call->bchannel_handle = 0;
-                       }
-                       /* destroy and remove bchannel */
+                       /* unklink from call and destroy bchannel */
                        free_bchannel(bchannel);
 
                        /* acknowledge */
@@ -627,7 +831,7 @@ int receive_message(int message_type, unsigned long ref, union parameter *param)
                        /* new ref from lcr */
                        if (!ref || find_call_ref(ref))
                        {
-                               fprintf(stderr, "illegal new ref %d received\n", ref);
+                               fprintf(stderr, "illegal new ref %ld received\n", ref);
                                return(-1);
                        }
                        /* allocate new call instance */
@@ -658,8 +862,15 @@ int receive_message(int message_type, unsigned long ref, union parameter *param)
                        else if (call->state == CHAN_LCR_STATE_RELEASE)
                        {
                                /* send release */
-                               newparam.disconnectinfo.cause = todo
-                               newparam.disconnectinfo.location = todo
+                               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);
                                /* free call */
                                free_call(call);
@@ -714,7 +925,7 @@ int receive_message(int message_type, unsigned long ref, union parameter *param)
                break;
 
                case MESSAGE_INFORMATION:
-               lcr_in_disconnect(call, message_type, param);
+               lcr_in_information(call, message_type, param);
                break;
 
                case MESSAGE_NOTIFY:
@@ -739,6 +950,7 @@ int receive_message(int message_type, unsigned long ref, union parameter *param)
 
                default:
 #warning unhandled
+               break;
        }
        return(0);
 }
@@ -824,7 +1036,7 @@ int handle_socket(void)
 }
 
 /*
- * open and close socket
+ * open and close socket and thread
  */
 int open_socket(void)
 {
@@ -879,20 +1091,19 @@ void close_socket(int sock)
                close(sock);
 }
 
-
-socket muss per timer fuer das öffnen checken
 static void *chan_thread(void *arg)
 {
        int work;
+       int ret;
 
-       pthread_mutex_lock(&chan_lock);
+       ast_mutex_lock(&chan_lock);
 
        while(!quit)
        {
                work = 0;
 
                /* handle socket */
-               int ret = handle_socket();
+               ret = handle_socket();
                if (ret < 0)
                        break;
                if (ret)
@@ -905,147 +1116,27 @@ static void *chan_thread(void *arg)
                
                if (!work)
                {
-                       pthread_mutex_unlock(&chan_lock);
+                       ast_mutex_unlock(&chan_lock);
                        usleep(30000);
-                       pthread_mutex_lock(&chan_lock);
+                       ast_mutex_lock(&chan_lock);
                }
        }
        
-       pthread_mutex_unlock(&chan_lock);
+       ast_mutex_unlock(&chan_lock);
 
        return NULL;
 }
 
 /*
- * send setup info to LCR
- * this function is called, when asterisk call is received and ref is received
- */
-static void send_setup_to_lcr(struct chan_call *call)
-{
-       union parameter newparam;
-
-       if (!ast || !call->ref)
-               return;
-
-       /* send setup message to LCR */
-       memset(&newparam, 0, sizeof(union parameter));
-               newparam.setup.callerinfo.itype = INFO_ITYPE_CHAN;      
-               newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;   
-       if (ast->cid->cid_num) if (ast->cid->cid_num[0])
-               strncpy(newparam.setup.callerinfo.id, ast->cid->cid_num, sizeof(newparam.setup.callerinfo.id)-1);
-       if (ast->cid->cid_name) if (ast->cid->cid_name[0])
-               strncpy(newparam.setup.callerinfo.name, ast->cid->cid_name, sizeof(newparam.setup.callerinfo.name)-1);
-       if (ast->cid->cid_rdnis) if (ast->cid->cid_rdnis[0])
-       {
-               strncpy(newparam.setup.redirinfo.id, ast->cid->cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1);
-                       newparam.setup.redirinfo.itype = INFO_ITYPE_CHAN;       
-               newparam.setup.redirinfo.ntype = INFO_NTYPE_UNKNOWN;    
-       }
-       switch(ast->cid->cid_pres & AST_PRES_RESTRICTION)
-       {
-               case AST_PRES_ALLOWED:
-               newparam.setup.callerinfo.present = INFO_PRESENT_ALLOWED;
-               break;
-               case AST_PRES_RESTRICTED:
-               newparam.setup.callerinfo.present = INFO_PRESENT_RESTRICTED;
-               break;
-               case AST_PRES_UNAVAILABLE:
-               newparam.setup.callerinfo.present = INFO_PRESENT_NOTAVAIL;
-               break;
-               default:
-               newparam.setup.callerinfo.present = INFO_PRESENT_NULL;
-       }
-       switch(ast->cid->cid_ton)
-       {
-               case AST_wasist:
-               newparam.setup.callerinfo.ntype = INFO_NTYPE_SUBSCRIBER;
-               break;
-               case AST_wasist:
-               newparam.setup.callerinfo.ntype = INFO_NTYPE_NATIONAL;
-               break;
-               case AST_wasist:
-               newparam.setup.callerinfo.ntype = INFO_NTYPE_INTERNATIONAL;
-               break;
-       }
-       newparam.setup.capainfo.bearer_capa = ast->transfercapability;
-       newparam.setup.capainfo.bearer_user = alaw 3, ulaw 2;
-       newparam.setup.capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
-       newparam.setup.capainfo.hlc = INFO_HLC_NONE;
-       newparam.setup.capainfo.exthlc = INFO_HLC_NONE;
-       send_message(MESSAGE_SETUP, call->ref, &newparam);
-
-       /* change to outgoing setup state */
-       call->state = CHAN_LCR_STATE_OUT_SETUP;
-}
-
-#if 0
-CHRISTIAN: das war ein konflikt beim pullen
-siehe anderes lcr_request();
-bedenke: das ast_log muss noch üeberall eingepflegt werden
-
-static struct ast_channel *lcr_request(const char *type, int format, void *data, int *cause)
-{
-       struct chan_call *call=alloc_call();
-
-       if (call) {
-#warning hier muss jetzt wohl eine Ref angefordert werden!
-               ast=lcr_ast_new(call, ext, NULL, 0 );
-
-               if (ast) {
-                       call->ast=ast;
-               } else {
-                       ast_log(LOG_WARNING, "Could not create new Asterisk Channel\n");
-                       free_call(call);
-               }
-       } else {
-               ast_log(LOG_WARNING, "Could not create new Lcr Call Handle\n");
-       }
-
-       return ast;
-}
-
-       struct ast_channel *ast=NULL;
-
-       char buf[128];
-        char *port_str, *ext, *p;
-        int port;
-
-        ast_copy_string(buf, data, sizeof(buf)-1);
-        p=buf;
-        port_str=strsep(&p, "/");
-        ext=strsep(&p, "/");
-        ast_verbose("portstr:%s ext:%s\n",port_str, ext);
-
-       sprintf(buf,"%s/%s",lcr_type,(char*)data);
-#endif
-
-/*
- * send dialing info to LCR
- * this function is called, when setup acknowledge is received and dialing
- * info is available.
- */
-static void send_dialque_to_lcr(struct chan_call *call)
-{
-       union parameter newparam;
-
-       if (!ast || !call->ref || !call->dialque)
-               return;
-       
-       /* send setup message to LCR */
-       memset(&newparam, 0, sizeof(union parameter));
-       strncpy(newparam.dialinginfo.id, call->dialque, sizeof(newparam.dialinginfo.id)-1);
-       call->dialque[0] = '\0';
-       send_message(MESSAGE_INFORMATION, call->ref, &newparam);
-}
-
-/*
  * new asterisk instance
  */
 static struct ast_channel *lcr_request(const char *type, int format, void *data, int *cause)
 {
        union parameter newparam;
+       struct ast_channel *ast;
+        struct chan_call *call;
 
-       pthread_mutex_lock(&chan_lock);
+       ast_mutex_lock(&chan_lock);
 
        /* create call instance */
        call = alloc_call();
@@ -1055,7 +1146,7 @@ static struct ast_channel *lcr_request(const char *type, int format, void *data,
                return NULL;
        }
        /* create asterisk channel instrance */
-       ast = ast_channel_alloc(1);
+       ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel);
        if (!ast)
        {
                free_call(call);
@@ -1067,13 +1158,14 @@ static struct ast_channel *lcr_request(const char *type, int format, void *data,
        call->ast = ast;
        ast->tech = &lcr_tech;
        /* configure channel */
-       ast->state = AST_STATE_RESERVED;
        snprintf(ast->name, sizeof(ast->name), "%s/%d", lcr_type, ++glob_channel);
        ast->name[sizeof(ast->name)-1] = '\0';
-       ast->type = lcr_type;
+#warning todo
+#if 0
        ast->nativeformat = configfile->lawformat;
        ast->readformat = ast->rawreadformat = configfile->lawformat;
        ast->writeformat = ast->rawwriteformat = configfile->lawformat;
+#endif
        ast->hangupcause = 0;
        /* send MESSAGE_NEWREF */
        memset(&newparam, 0, sizeof(union parameter));
@@ -1082,7 +1174,9 @@ static struct ast_channel *lcr_request(const char *type, int format, void *data,
        /* set state */
        call->state = CHAN_LCR_STATE_OUT_PREPARE;
 
-       pthread_mutex_unlock(&chan_lock);
+       ast_mutex_unlock(&chan_lock);
+
+       return ast;
 }
 
 /*
@@ -1090,105 +1184,113 @@ static struct ast_channel *lcr_request(const char *type, int format, void *data,
  */
 static int lcr_call(struct ast_channel *ast, char *dest, int timeout)
 {
-       union parameter newparam;
-        struct chan_call *call=ast->tech_pvt;
-        char buf[128];
-        char *port_str, *dad, *p;
+        struct chan_call *call;
 
-        if (!call) return -1;
+       ast_mutex_lock(&chan_lock);
+        call = ast->tech_pvt;
+        if (!call) {
+               ast_mutex_unlock(&chan_lock);
+               return -1;
+       }
 
-       pthread_mutex_lock(&chan_lock);
 
-       hier muss noch
+#warning       hier muss noch
+#if 0
         ast_copy_string(buf, dest, sizeof(buf)-1);
         p=buf;
         port_str=strsep(&p, "/");
         dad=strsep(&p, "/");
+#endif
 
        /* send setup message, if we already have a callref */
        if (call->ref)
                send_setup_to_lcr(call);
 
-        if (lcr_debug)
-                ast_verbose("Call: ext:%s dest:(%s) -> dad(%s) \n", ast->exten,dest, dad);
+//        if (lcr_debug)
+  //              ast_verbose("Call: ext:%s dest:(%s) -> dad(%s) \n", ast->exten,dest, dad);
 
-#warning hier müssen wi eine der geholten REFs nehmen und ein SETUP schicken, die INFOS zum SETUP stehen im Ast pointer drin, bzw. werden hier übergeben.
-       
-       pthread_mutex_unlock(&chan_lock);
+       ast_mutex_unlock(&chan_lock);
        return 0; 
 }
 
 static int lcr_digit(struct ast_channel *ast, char digit)
 {
+        struct chan_call *call;
        union parameter newparam;
        char buf[]="x";
 
-       if (!call) return -1;
-
        /* only pass IA5 number space */
        if (digit > 126 || digit < 32)
                return 0;
 
-       pthread_mutex_lock(&chan_lock);
+       ast_mutex_lock(&chan_lock);
+        call = ast->tech_pvt;
+        if (!call) {
+               ast_mutex_unlock(&chan_lock);
+               return -1;
+       }
 
        /* send information or queue them */
        if (call->ref && call->state == CHAN_LCR_STATE_OUT_DIALING)
        {
                memset(&newparam, 0, sizeof(union parameter));
-               newparam.dialinginfo.id[0] = digit;
-               newparam.dialinginfo.id[1] = '\0';
+               newparam.information.id[0] = digit;
+               newparam.information.id[1] = '\0';
                send_message(MESSAGE_INFORMATION, call->ref, &newparam);
        } else
        if (!call->ref
         && (call->state == CHAN_LCR_STATE_OUT_PREPARE || call->state == CHAN_LCR_STATE_OUT_SETUP));
        {
                *buf = digit;
-               strncat(call->dialque, buf, strlen(char->dialque)-1);
+               strncat(call->dialque, buf, strlen(call->dialque)-1);
        }
 
-       pthread_mutex_unlock(&chan_lock);
+       ast_mutex_unlock(&chan_lock);
        
        return(0);
 }
 
-static int lcr_answer(struct ast_channel *c)
+static int lcr_answer(struct ast_channel *ast)
 {
        union parameter newparam;
-        struct chan_call *call=c->tech_pvt;
-       
-       if (!call) return -1;
+        struct chan_call *call;
 
-       pthread_mutex_lock(&chan_lock);
-
-       /* check bridged connectinfo */
-       if (call->bchannel)
-               if (call->bchannel->bridge_channel)
-                       if (call->bchannel->bridge_channel->call)
-                       {
-                               memcpy(call->connectinfo, call->bchannel->bridge_channel->call->connectinfo, sizeof(struct connect_info));
-                       }
+       ast_mutex_lock(&chan_lock);
+        call = ast->tech_pvt;
+        if (!call) {
+               ast_mutex_unlock(&chan_lock);
+               return -1;
+       }
+       
+       /* 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(param->connectinfo, call->connectinfo, sizeof(struct connect_info));
+       memcpy(&newparam.connectinfo, &call->connectinfo, sizeof(struct connect_info));
        send_message(MESSAGE_CONNECT, call->ref, &newparam);
        /* change state */
        call->state = CHAN_LCR_STATE_CONNECT;
        
-       pthread_mutex_unlock(&chan_lock);
+       ast_mutex_unlock(&chan_lock);
         return 0;
 }
 
 static int lcr_hangup(struct ast_channel *ast)
 {
        union parameter newparam;
-        struct chan_call *call = ast->tech_pvt;
+        struct chan_call *call;
 
-       if (!call)
-               return 0;
+       ast_mutex_lock(&chan_lock);
+        call = ast->tech_pvt;
+        if (!call) {
+               ast_mutex_unlock(&chan_lock);
+               return -1;
+       }
 
-       pthread_mutex_lock(&chan_lock);
        /* disconnect asterisk, maybe not required */
        ast->tech_pvt = NULL;
+       ast->fds[0] = -1;
        if (call->ref)
        {
                /* release */
@@ -1198,7 +1300,7 @@ static int lcr_hangup(struct ast_channel *ast)
                send_message(MESSAGE_RELEASE, call->ref, &newparam);
                /* remove call */
                free_call(call);
-               pthread_mutex_unlock(&chan_lock);
+               ast_mutex_unlock(&chan_lock);
                return 0;
        } else
        {
@@ -1213,35 +1315,81 @@ static int lcr_hangup(struct ast_channel *ast)
                        call->state = CHAN_LCR_STATE_RELEASE;
                }
        } 
-       pthread_mutex_unlock(&chan_lock);
+       ast_mutex_unlock(&chan_lock);
        return 0;
 }
 
 static int lcr_write(struct ast_channel *ast, struct ast_frame *f)
 {
-        struct chan_call *call= ast->tech_pvt;
-       if (!call) return 0;
-       pthread_mutex_lock(&chan_lock);
-       pthread_mutex_unlock(&chan_lock);
+        struct chan_call *call;
+       unsigned char *buffer[1024], *s, *d = buffer;
+
+       ast_mutex_lock(&chan_lock);
+        call = ast->tech_pvt;
+        if (!call) {
+               ast_mutex_unlock(&chan_lock);
+               return -1;
+       }
+       if (call->bchannel && ((ii = f->samples)))
+       {
+               if (ii > sizeof(buffer))
+                       ii = buffer;
+               s = f->data;
+               for (i = 0, i < ii, i++)
+                       *d++ = flip_bits[*s++];
+               bchannel_transmit(call->bchannel, buffer, ii);
+       }
+       ast_mutex_unlock(&chan_lock);
+       return 0;
 }
 
 
 static struct ast_frame *lcr_read(struct ast_channel *ast)
 {
-        struct chan_call *call = ast->tech_pvt;
-       if (!call) return 0;
-       pthread_mutex_lock(&chan_lock);
-       pthread_mutex_unlock(&chan_lock);
+        struct chan_call *call;
+       int i, len;
+       unsigned char *p;
+
+       ast_mutex_lock(&chan_lock);
+        call = ast->tech_pvt;
+        if (!call) {
+               ast_mutex_unlock(&chan_lock);
+               return -1;
+       }
+       len = read(call->pipe[0], call->read_buf, sizeof(call->read_buf));
+       if (len <= 0)
+               return NULL;
+
+       p = call->read_buf;
+       for (i = 0, i < len, i++) {
+               *d = flip_bits[*d];
+               d++;
+       }
+
+       call->read_fr.frametype = AST_FRAME_SPEECH;
+#warning todo
+       call->read_fr.subtype = AST_FORMAT_ALAW;
+       call->read_fr.datalen = len;
+       call->read_fr.samples = len;
+       call->read_fr.delivery = ast_tv(0,0);
+       call->read_fr.data = call->read_buf;
+       ast_mutex_unlock(&chan_lock);
+
+       return &call->read_fr;
 }
 
 static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, size_t datalen)
 {
        union parameter newparam;
         int res = -1;
+        struct chan_call *call;
 
-       if (!call) return -1;
-
-       pthread_mutex_lock(&chan_lock);
+       ast_mutex_lock(&chan_lock);
+        call = ast->tech_pvt;
+        if (!call) {
+               ast_mutex_unlock(&chan_lock);
+               return -1;
+       }
 
         switch (cond) {
                 case AST_CONTROL_BUSY:
@@ -1253,11 +1401,11 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
                        /* change state */
                        call->state = CHAN_LCR_STATE_OUT_DISCONNECT;
                        /* return */
-                       pthread_mutex_unlock(&chan_lock);
+                       ast_mutex_unlock(&chan_lock);
                         return 0;
                 case AST_CONTROL_CONGESTION:
                        /* return */
-                       pthread_mutex_unlock(&chan_lock);
+                       ast_mutex_unlock(&chan_lock);
                         return -1;
                 case AST_CONTROL_RINGING:
                        /* send message to lcr */
@@ -1266,11 +1414,11 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
                        /* change state */
                        call->state = CHAN_LCR_STATE_OUT_ALERTING;
                        /* return */
-                       pthread_mutex_unlock(&chan_lock);
+                       ast_mutex_unlock(&chan_lock);
                         return 0;
                 case -1:
                        /* return */
-                       pthread_mutex_unlock(&chan_lock);
+                       ast_mutex_unlock(&chan_lock);
                         return 0;
 
                 case AST_CONTROL_VIDUPDATE:
@@ -1290,23 +1438,126 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
                         break;
 
                 default:
-                        ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, c->name);
+                        ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, ast->name);
                        /* return */
-                       pthread_mutex_unlock(&chan_lock);
+                       ast_mutex_unlock(&chan_lock);
                         return -1;
         }
 
        /* return */
-       pthread_mutex_unlock(&chan_lock);
+       ast_mutex_unlock(&chan_lock);
         return 0;
 }
 
+/*
+ * bridge process
+ */
+enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
+                                 struct ast_channel *ast2, int flags,
+                                 struct ast_frame **fo,
+                                 struct ast_channel **rc, int timeoutms)
+
+{
+       struct chan_call        *call1, *call2;
+       struct ast_channel      *carr[2], *who;
+       int                     to = -1;
+       struct ast_frame        *f;
+       int                     bridge_id;
+       /* 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)
+       {
+               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;
+       }
+       ast_mutex_unlock(&chan_lock);
+       
+       while(1) {
+               who = ast_waitfor_n(carr, 2, &to);
+
+               if (!who) {
+                       ast_log(LOG_NOTICE,"misdn_bridge: empty read, breaking out\n");
+                       break;
+               }
+               f = ast_read(who);
+    
+               if (!f || f->frametype == AST_FRAME_CONTROL) {
+                       /* got hangup .. */
+                       *fo=f;
+                       *rc=who;
+                       break;
+               }
+               
+               if ( f->frametype == AST_FRAME_DTMF ) {
+                       *fo=f;
+                       *rc=who;
+                       break;
+               }
+       
+#warning kann einfach gesendet werden. dsp slittet automatisch, wenn frames kommen, bis der fifo leer ist.
+#if 0
+               if (f->frametype == AST_FRAME_VOICE) {
+       
+                       continue;
+               }
+#endif
+
+               if (who == ast1) {
+                       ast_write(ast2,f);
+               }
+               else {
+                       ast_write(ast1,f);
+               }
+    
+       }
+       
+       /* split channels */
+       ast_mutex_lock(&chan_lock);
+       call1 = ast1->tech_pvt;
+       call2 = ast2->tech_pvt;
+       if (call1)
+       {
+               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)
+       {
+               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;
+       }
+       ast_mutex_unlock(&chan_lock);
+       
+       
+       return AST_BRIDGE_COMPLETE;
+}
 static struct ast_channel_tech lcr_tech = {
        .type=lcr_type,
        .description="Channel driver for connecting to Linux-Call-Router",
+#warning todo
        .capabilities=AST_FORMAT_ALAW,
        .requester=lcr_request,
-       .send_digit=lcr_digit,
+       .send_digit_begin=lcr_digit,
        .call=lcr_call,
        .bridge=lcr_bridge, 
        .hangup=lcr_hangup,
@@ -1319,65 +1570,43 @@ static struct ast_channel_tech lcr_tech = {
        .properties=0
 };
 
-#warning das muss mal aus der config datei gelesen werden:
-char lcr_context[]="from-lcr";
-
-
-TODO: muss oben ins lcr_in setup und ins lcr_request
-static struct ast_channel *lcr_ast_new(struct chan_call *call, char *exten, char *callerid, int ref)
-{
-       struct ast_channel *tmp;
-       char *cid_name = 0, *cid_num = 0;
-
-
-       if (callerid)
-                ast_callerid_parse(callerid, &cid_name, &cid_num);
-
-       tmp = ast_channel_alloc(1, AST_STATE_RESERVED, cid_num, cid_name, "", exten, "", 0, "%s/%d", lcr_type,  ref);
-
-       if (tmp) {
-               tmp->tech = &lcr_tech;
-               tmp->writeformat = AST_FORMAT_ALAW;
-               tmp->readformat = AST_FORMAT_ALAW;
-
-               ast_copy_string(tmp->context, lcr_context, AST_MAX_CONTEXT);
-
-       }
-
-       return tmp;
-}
-
-
 
 /*
  * cli
  */
 static int lcr_show_lcr (int fd, int argc, char *argv[])
 {
+       return 0;
 }
 
 static int lcr_show_calls (int fd, int argc, char *argv[])
 {
+       return 0;
 }
 
 static int lcr_reload_routing (int fd, int argc, char *argv[])
 {
+       return 0;
 }
 
 static int lcr_reload_interfaces (int fd, int argc, char *argv[])
 {
+       return 0;
 }
 
 static int lcr_port_block (int fd, int argc, char *argv[])
 {
+       return 0;
 }
 
 static int lcr_port_unblock (int fd, int argc, char *argv[])
 {
+       return 0;
 }
 
 static int lcr_port_unload (int fd, int argc, char *argv[])
 {
+       return 0;
 }
 
 static struct ast_cli_entry cli_show_lcr =
@@ -1435,11 +1664,13 @@ static struct ast_cli_entry cli_port_unload =
  */
 int load_module(void)
 {
-//     ast_mutex_init(&release_lock);
+       int i;
 
-//     lcr_cfg_update_ptp();
+       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);
 
-       pthread_mutex_init(&chan_lock, NULL);
+       ast_mutex_init(&chan_lock);
        
        if (!(lcr_sock = open_socket())) {
                ast_log(LOG_ERROR, "Unable to connect\n");
@@ -1496,9 +1727,9 @@ int load_module(void)
 #endif
 
        quit = 1;       
-       if ((pthread_create(&chan_tid, NULL, chan_thread, arg)<0))
+       if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0))
        {
-               failed to create thread
+               /* failed to create thread */
                bchannel_deinitialize();
                close_socket(lcr_sock);
                ast_channel_unregister(&lcr_tech);