fixed crash when receiving notify messages
[lcr.git] / mISDN.cpp
index dfb8a6d..f10a1a4 100644 (file)
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -1,6 +1,6 @@
 /*****************************************************************************\
 **                                                                           **
-** PBX4Linux                                                                 **
+** Linux Call Router                                                         **
 **                                                                           **
 **---------------------------------------------------------------------------**
 ** Copyright: Andreas Eversberg                                              **
 \*****************************************************************************/ 
 
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include "main.h"
-#include <unistd.h>
 #include <poll.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef SOCKET_MISDN
+#include <netinet/udp.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <pthread.h>
+#include <linux/mISDNif.h>
+#include <q931.h>
+#include <mlayer3.h>
+#else
 extern "C" {
 #include <net_l2.h>
 }
+#endif
 
-#define ISDN_PID_L2_B_USER 0x420000ff
-#define ISDN_PID_L3_B_USER 0x430000ff
+#ifndef ISDN_PID_L4_B_USER
 #define ISDN_PID_L4_B_USER 0x440000ff
+#endif
 
-/* used for udevice */
-int entity = 0;
+/* list of mISDN ports */
+struct mISDNport *mISDNport_first;
 
 /* noise randomizer */
 unsigned char mISDN_rand[256];
 int mISDN_rand_count = 0;
 
-/* the device handler and port list */
-int mISDNdevice = -1;
+#ifdef MISDN_SOCKET
+int mISDN_initialize(void)
+{
+       /* try to open raw socket to check kernel */
+       ret = socket(AF_ISDN, SOCK_RAW, ISDN_P_BASE);
+       if (ret < 0)
+       {
+               fprintf(stderr, "Cannot open mISDN due to %s. (Does your Kernel support socket based mISDN?)\n", strerror(errno));
+               return(-1);
+       }
+       close(ret);
+
+       init_layer3(4); // buffer of 4
 
-/* list of mISDN ports */
-struct mISDNport *mISDNport_first;
+       return(0);
+}
+
+void mISDN_deinitialize(void)
+{
+       cleanup_layer3();
+}
+#else
+int entity = 0; /* used for udevice */
+int mISDNdevice = -1; /* the device handler and port list */
+
+int mISDN_initialize(void)
+{
+       char debug_log[128];
+       unsigned char buff[1025];
+       iframe_t *frm = (iframe_t *)buff;
+       int ret;
+
+       /* initialize stuff of the NT lib */
+       if (options.deb & DEBUG_STACK)
+       {
+               global_debug = 0xffffffff & ~DBGM_MSG;
+//             global_debug = DBGM_L3DATA;
+       } else
+               global_debug = DBGM_MAN;
+       SPRINT(debug_log, "%s/debug.log", INSTALL_DATA);
+       if (options.deb & DEBUG_LOG)
+               debug_init(global_debug, debug_log, debug_log, debug_log);
+       else
+               debug_init(global_debug, NULL, NULL, NULL);
+       msg_init();
+
+       /* open mISDNdevice if not already open */
+       if (mISDNdevice < 0)
+       {
+               ret = mISDN_open();
+               if (ret < 0)
+               {
+                       fprintf(stderr, "cannot open mISDN device ret=%d errno=%d (%s) Check for mISDN modules!\nAlso did you create \"/dev/mISDN\"? Do: \"mknod /dev/mISDN c 46 0\"\n", ret, errno, strerror(errno));
+                       return(-1);
+               }
+               mISDNdevice = ret;
+               PDEBUG(DEBUG_ISDN, "mISDN device opened.\n");
+
+               /* create entity for layer 3 TE-mode */
+               mISDN_write_frame(mISDNdevice, buff, 0, MGR_NEWENTITY | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+               ret = mISDN_read_frame(mISDNdevice, frm, sizeof(iframe_t), 0, MGR_NEWENTITY | CONFIRM, TIMEOUT_1SEC);
+               if (ret < (int)mISDN_HEADER_LEN)
+               {
+                       noentity:
+                       FATAL("Cannot request MGR_NEWENTITY from mISDN. Exitting due to software bug.");
+               }
+               entity = frm->dinfo & 0xffff;
+               if (!entity)
+                       goto noentity;
+               PDEBUG(DEBUG_ISDN, "our entity for l3-processes is %d.\n", entity);
+       }
+       return(0);
+}
+
+void mISDN_deinitialize(void)
+{
+       unsigned char buff[1025];
+
+       debug_close();
+
+       if (mISDNdevice >= 0)
+       {
+               /* free entity */
+               mISDN_write_frame(mISDNdevice, buff, 0, MGR_DELENTITY | REQUEST, entity, 0, NULL, TIMEOUT_1SEC);
+               /* close device */
+               mISDN_close(mISDNdevice);
+               mISDNdevice = -1;
+               PDEBUG(DEBUG_ISDN, "mISDN device closed.\n");
+       }
+}
+#endif
 
 /*
  * constructor
@@ -53,26 +146,25 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti
        p_m_b_channel = 0;
        p_m_b_exclusive = 0;
        p_m_b_reserve = 0;
-       p_m_b_addr = 0;
-       p_m_b_stid = 0;
-       p_m_jittercheck = 0;
        p_m_delete = 0;
        p_m_hold = 0;
        p_m_txvol = p_m_rxvol = 0;
        p_m_conf = 0;
        p_m_txdata = 0;
-#warning set delay by routing parameter or interface config
        p_m_delay = 0;
        p_m_echo = 0;
        p_m_tone = 0;
        p_m_rxoff = 0;
-       p_m_calldata = 0;
-       p_m_dtmf = !options.nodtmf;
-       sollen wir daraus eine interface-option machen?:
+       p_m_joindata = 0;
+       p_m_dtmf = !mISDNport->ifport->nodtmf;
        p_m_timeout = 0;
        p_m_timer = 0;
-#warning denke auch an die andere seite. also das setup sollte dies weitertragen
 
+       /* audio */
+       p_m_load = 0;
+       p_m_last_tv_sec = 0;
+
+       /* crypt */
        p_m_crypt = 0;
        p_m_crypt_listen = 0;
        p_m_crypt_msg_loops = 0;
@@ -96,9 +188,8 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti
                mISDNport->b_reserved++;
        }
 
-       } else
        /* reserve channel */
-       if (channel) // only if constructor was called with a channel resevation
+       if (channel > 0) // only if constructor was called with a channel resevation
                seize_bchannel(channel, exclusive);
 
        /* we increase the number of objects: */
@@ -115,7 +206,7 @@ PmISDN::~PmISDN()
        struct message *message;
 
        /* remove bchannel relation */
-       free_bchannel();
+       drop_bchannel();
 
        /* release epoint */
        while (p_epointlist)
@@ -136,9 +227,128 @@ PmISDN::~PmISDN()
 
 
 /*
+ * trace
+ */
+void chan_trace_header(struct mISDNport *mISDNport, class PmISDN *port, char *msgtext, int direction)
+{
+       /* init trace with given values */
+       start_trace(mISDNport?mISDNport->portnum:0,
+                   (mISDNport)?((mISDNport->ifport)?mISDNport->ifport->interface:NULL):NULL,
+                   port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype):NULL,
+                   port?port->p_dialinginfo.id:NULL,
+                   direction,
+                   CATEGORY_CH,
+                   port?port->p_serial:0,
+                   msgtext);
+}
+
+
+/*
+ * layer trace header
+ */
+static struct isdn_message {
+       char *name;
+       unsigned long value;
+} isdn_message[] = {
+       {"TIMEOUT", CC_TIMEOUT},
+       {"SETUP", CC_SETUP},
+       {"SETUP_ACK", CC_SETUP_ACKNOWLEDGE},
+       {"PROCEEDING", CC_PROCEEDING},
+       {"ALERTING", CC_ALERTING},
+       {"CONNECT", CC_CONNECT},
+       {"CONNECT RES", CC_CONNECT},
+       {"CONNECT_ACK", CC_CONNECT_ACKNOWLEDGE},
+       {"DISCONNECT", CC_DISCONNECT},
+       {"RELEASE", CC_RELEASE},
+       {"RELEASE_COMP", CC_RELEASE_COMPLETE},
+       {"INFORMATION", CC_INFORMATION},
+       {"PROGRESS", CC_PROGRESS},
+       {"NOTIFY", CC_NOTIFY},
+       {"SUSPEND", CC_SUSPEND},
+       {"SUSPEND_ACK", CC_SUSPEND_ACKNOWLEDGE},
+       {"SUSPEND_REJ", CC_SUSPEND_REJECT},
+       {"RESUME", CC_RESUME},
+       {"RESUME_ACK", CC_RESUME_ACKNOWLEDGE},
+       {"RESUME_REJ", CC_RESUME_REJECT},
+       {"HOLD", CC_HOLD},
+       {"HOLD_ACK", CC_HOLD_ACKNOWLEDGE},
+       {"HOLD_REJ", CC_HOLD_REJECT},
+       {"RETRIEVE", CC_RETRIEVE},
+       {"RETRIEVE_ACK", CC_RETRIEVE_ACKNOWLEDGE},
+       {"RETRIEVE_REJ", CC_RETRIEVE_REJECT},
+       {"FACILITY", CC_FACILITY},
+       {"STATUS", CC_STATUS},
+       {"RESTART", CC_RESTART},
+       {"RELEASE_CR", CC_RELEASE_CR},
+       {"NEW_CR", CC_NEW_CR},
+       {"DL_ESTABLISH", DL_ESTABLISH},
+       {"DL_RELEASE", DL_RELEASE},
+       {"PH_ACTIVATE", PH_ACTIVATE},
+       {"PH_DEACTIVATE", PH_DEACTIVATE},
+
+       {NULL, 0},
+};
+static char *isdn_prim[4] = {
+       " REQUEST",
+       " CONFIRM",
+       " INDICATION",
+       " RESPONSE",
+};
+void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long prim, int direction)
+{
+       int i;
+       char msgtext[64] = "<<UNKNOWN MESSAGE>>";
+
+       /* select message and primitive text */
+       i = 0;
+       while(isdn_message[i].name)
+       {
+               if (isdn_message[i].value == (prim&0xffffff00))
+               {
+                       SCPY(msgtext, isdn_message[i].name);
+                       break;
+               }
+               i++;
+       }
+       SCAT(msgtext, isdn_prim[prim&0x00000003]);
+
+       /* add direction */
+       if (direction && (prim&0xffffff00)!=CC_NEW_CR && (prim&0xffffff00)!=CC_RELEASE_CR)
+       {
+               if (mISDNport)
+               {
+                       if (mISDNport->ntmode)
+                       {
+                               if (direction == DIRECTION_OUT)
+                                       SCAT(msgtext, " N->U");
+                               else
+                                       SCAT(msgtext, " N<-U");
+                       } else
+                       {
+                               if (direction == DIRECTION_OUT)
+                                       SCAT(msgtext, " U->N");
+                               else
+                                       SCAT(msgtext, " U<-N");
+                       }
+               }
+       }
+
+       /* init trace with given values */
+       start_trace(mISDNport?mISDNport->portnum:0,
+                   mISDNport?mISDNport->ifport->interface:NULL,
+                   port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype):NULL,
+                   port?port->p_dialinginfo.id:NULL,
+                   direction,
+                   CATEGORY_CH,
+                   port?port->p_serial:0,
+                   msgtext);
+}
+
+
+/*
  * send control information to the channel (dsp-module)
  */
-void ph_control(unsigned long b_addr, int c1, int c2)
+void ph_control(struct mISDNport *mISDNport, class PmISDN *isdnport, unsigned long b_addr, int c1, int c2, char *trace_name, int trace_value)
 {
        unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+sizeof(int)];
        iframe_t *ctrl = (iframe_t *)buffer; 
@@ -151,9 +361,15 @@ void ph_control(unsigned long b_addr, int c1, int c2)
        *d++ = c1;
        *d++ = c2;
        mISDN_write(mISDNdevice, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC);
+       chan_trace_header(mISDNport, isdnport, "BCHANNEL control", DIRECTION_OUT);
+       if (c1 == CMX_CONF_JOIN)
+               add_trace(trace_name, NULL, "0x%08x", trace_value);
+       else
+               add_trace(trace_name, NULL, "%d", trace_value);
+       end_trace();
 }
 
-void ph_control_block(unsigned long b_addr, int c1, void *c2, int c2_len)
+void ph_control_block(struct mISDNport *mISDNport, class PmISDN *isdnport, unsigned long b_addr, int c1, void *c2, int c2_len, char *trace_name, int trace_value)
 {
        unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+c2_len];
        iframe_t *ctrl = (iframe_t *)buffer;
@@ -166,194 +382,359 @@ void ph_control_block(unsigned long b_addr, int c1, void *c2, int c2_len)
        *d++ = c1;
        memcpy(d, c2, c2_len);
        mISDN_write(mISDNdevice, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC);
+       chan_trace_header(mISDNport, isdnport, "BCHANNEL control", DIRECTION_OUT);
+       add_trace(trace_name, NULL, "%d", trace_value);
+       end_trace();
 }
 
 
 /*
- * activate / deactivate bchannel
+ * subfunction for bchannel_event
+ * create stack
  */
-static void bchannel_activate(struct mISDNport *mISDNport, int i)
+static int _bchannel_create(struct mISDNport *mISDNport, int i)
 {
-       iframe_t act;
+       unsigned char buff[1024];
+       layer_info_t li;
+       mISDN_pid_t pid;
+       int ret;
 
-       /* we must activate if we are deactivated */
-       if (mISDNport->b_state[i] == B_STATE_IDLE)
+       if (!mISDNport->b_stid[i])
        {
-               /* activate bchannel */
-               PDEBUG(DEBUG_BCHANNEL, "activating bchannel (index %d), because currently idle (address 0x%x).\n", i, mISDNport->b_addr[i]);
-               act.prim = DL_ESTABLISH | REQUEST; 
-               act.addr = mISDNport->b_addr[i] | FLG_MSG_DOWN;
-               act.dinfo = 0;
-               act.len = 0;
-               mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
-               mISDNport->b_state[i] = B_STATE_ACTIVATING;
-               return;
+               PERROR("Error: no stack for index %d\n", i);
+               return(0);
+       }
+       if (mISDNport->b_addr[i])
+       {
+               PERROR("Error: stack already created for index %d\n", i);
+               return(0);
        }
 
-       /* if we are active, we configure our channel */
-       if (mISDNport->b_state[i] == B_STATE_ACTIVE)
+       /* create new layer */
+       PDEBUG(DEBUG_BCHANNEL, "creating new layer for bchannel %d (index %d).\n" , i+1+(i>=15), i);
+       memset(&li, 0, sizeof(li));
+       memset(&pid, 0, sizeof(pid));
+       li.object_id = -1;
+       li.extentions = 0;
+       li.st = mISDNport->b_stid[i];
+       UCPY(li.name, "B L4");
+       li.pid.layermask = ISDN_LAYER((4));
+       li.pid.protocol[4] = ISDN_PID_L4_B_USER;
+       ret = mISDN_new_layer(mISDNdevice, &li);
+       if (ret)
        {
-               unsigned char buffer[mISDN_HEADER_LEN+ISDN_PRELOAD];
-               iframe_t *pre = (iframe_t *)buffer; /* preload data */
-               unsigned char *p = (unsigned char *)&pre->data.p;
+               failed_new_layer:
+               PERROR("mISDN_new_layer() failed to add bchannel %d (index %d)\n", i+1+(i>=15), i);
+               goto failed;
+       }
+       mISDNport->b_addr[i] = li.id;
+       if (!li.id)
+       {
+               goto failed_new_layer;
+       }
+       PDEBUG(DEBUG_BCHANNEL, "new layer (b_addr=0x%x)\n", mISDNport->b_addr[i]);
+
+       /* create new stack */
+       pid.protocol[1] = ISDN_PID_L1_B_64TRANS;
+       pid.protocol[2] = ISDN_PID_L2_B_TRANS;
+       pid.protocol[3] = ISDN_PID_L3_B_DSP;
+       pid.protocol[4] = ISDN_PID_L4_B_USER;
+       pid.layermask = ISDN_LAYER((1)) | ISDN_LAYER((2)) | ISDN_LAYER((3)) | ISDN_LAYER((4));
+       ret = mISDN_set_stack(mISDNdevice, mISDNport->b_stid[i], &pid);
+       if (ret)
+       {
+               stack_error:
+               PERROR("mISDN_set_stack() failed (ret=%d) to add bchannel (index %d) stid=0x%x\n", ret, i, mISDNport->b_stid[i]);
+               mISDN_write_frame(mISDNdevice, buff, mISDNport->b_addr[i], MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+               goto failed;
+       }
+       ret = mISDN_get_setstack_ind(mISDNdevice, mISDNport->b_addr[i]);
+       if (ret)
+               goto stack_error;
+
+       /* get layer id */
+       mISDNport->b_addr[i] = mISDN_get_layerid(mISDNdevice, mISDNport->b_stid[i], 4);
+       if (!mISDNport->b_addr[i])
+               goto stack_error;
+       chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL create stack", DIRECTION_OUT);
+       add_trace("channel", NULL, "%d", i+1+(i>=15));
+       add_trace("stack", "id", "0x%08x", mISDNport->b_stid[i]);
+       add_trace("stack", "address", "0x%08x", mISDNport->b_addr[i]);
+       end_trace();
 
-               /* it is an error if this channel is not associated with a port object */
-               if (!mISDNport->b_port[i])
-               {
-                       PERROR("bchannel index i=%d not associated with a port object\n", i);
-                       return;
-               }
+       return(1);
 
-               /* configure dsp features */
-               if (mISDNport->b_port[i]->p_m_txdata)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we set txdata to txdata=%d.\n", mISDNport->b_port[i]->p_m_txdata);
-                       ph_control(mISDNport->b_addr[i], (mISDNport->b_port[i]->p_m_txdata)?CMX_TXDATA_ON:CMX_TXDATA_OFF);
-               }
-               if (mISDNport->b_port[i]->p_m_delay)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we set delay to delay=%d.\n", mISDNport->b_port[i]->p_m_delay);
-                       ph_control(mISDNport->b_addr[i], CMX_DELAY, mISDNport->b_port[i]->p_m_delay);
-               }
-               if (mISDNport->b_port[i]->p_m_txvol)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we change tx-volume to shift=%d.\n", mISDNport->b_port[i]->p_m_txvol);
-                       ph_control(mISDNport->b_addr[i], VOL_CHANGE_TX, mISDNport->b_port[i]->p_m_txvol);
-               }
-               if (mISDNport->b_port[i]->p_m_rxvol)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we change rx-volume to shift=%d.\n", mISDNport->b_port[i]->p_m_rxvol);
-                       ph_control(mISDNport->b_addr[i], VOL_CHANGE_RX, mISDNport->b_port[i]->p_m_rxvol);
-               }
-//tone         if (mISDNport->b_port[i]->p_m_conf && !mISDNport->b_port[i]->p_m_tone)
-               if (mISDNport->b_port[i]->p_m_conf)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we change conference to conf=%d.\n", mISDNport->b_port[i]->p_m_conf);
-                       ph_control(mISDNport->b_addr[i], CMX_CONF_JOIN, mISDNport->b_port[i]->p_m_conf);
-               }
-               if (mISDNport->b_port[i]->p_m_echo)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we set echo to echo=%d.\n", mISDNport->b_port[i]->p_m_echo);
-                       ph_control(mISDNport->b_addr[i], CMX_ECHO_ON, 0);
-               }
-               if (mISDNport->b_port[i]->p_m_tone)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we set tone to tone=%d.\n", mISDNport->b_port[i]->p_m_tone);
-                       ph_control(mISDNport->b_addr[i], TONE_PATT_ON, mISDNport->b_port[i]->p_m_tone);
-               }
-               if (mISDNport->b_port[i]->p_m_rxoff)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we set rxoff to rxoff=%d.\n", mISDNport->b_port[i]->p_m_rxoff);
-                       ph_control(mISDNport->b_addr[i], CMX_RECEIVE_OFF, 0);
-               }
-#if 0
-               if (mISDNport->b_port[i]->p_m_txmix)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we set txmix to txmix=%d.\n", mISDNport->b_port[i]->p_m_txmix);
-                       ph_control(mISDNport->b_addr[i], CMX_MIX_ON, 0);
-               }
-#endif
-               if (mISDNport->b_port[i]->p_m_dtmf)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we set dtmf to dtmf=%d.\n", mISDNport->b_port[i]->p_m_dtmf);
-                       ph_control(mISDNport->b_addr[i], DTMF_TONE_START, 0);
-               }
-               if (mISDNport->b_port[i]->p_m_crypt)
-               {
-                       PDEBUG(DEBUG_BCHANNEL, "during activation, we set crypt to crypt=%d.\n", mISDNport->b_port[i]->p_m_crypt);
-                       ph_control_block(mISDNport->b_addr[i], BF_ENABLE_KEY, mISDNport->b_port[i]->p_m_crypt_key, mISDNport->b_port[i]->p_m_crypt_key_len);
-               }
-               todo: wer startet/stoppt eigentlich den audio-transmit
+failed:
+       mISDNport->b_addr[i] = 0;
+       return(0);
+}
+
+
+/*
+ * subfunction for bchannel_event
+ * activate request
+ */
+static void _bchannel_activate(struct mISDNport *mISDNport, int i, int activate)
+{
+       iframe_t act;
+
+       /* activate bchannel */
+       chan_trace_header(mISDNport, mISDNport->b_port[i], activate?(char*)"BCHANNEL activate":(char*)"BCHANNEL deactivate", DIRECTION_OUT);
+       add_trace("channel", NULL, "%d", i+1+(i>=15));
+       end_trace();
+       act.prim = (activate?DL_ESTABLISH:DL_RELEASE) | REQUEST; 
+       act.addr = mISDNport->b_addr[i] | FLG_MSG_DOWN;
+       act.dinfo = 0;
+       act.len = 0;
+       mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
+}
+
+
+/*
+ * subfunction for bchannel_event
+ * set features
+ */
+static void _bchannel_configure(struct mISDNport *mISDNport, int i)
+{
+       struct PmISDN *port;
+       int addr;
+
+       port = mISDNport->b_port[i];
+       addr = mISDNport->b_addr[i];
+       if (!port)
+       {
+               PERROR("bchannel index i=%d not associated with a port object\n", i);
+               return;
        }
+
+       /* set dsp features */
+       if (port->p_m_txdata)
+               ph_control(mISDNport, port, addr, (port->p_m_txdata)?CMX_TXDATA_ON:CMX_TXDATA_OFF, 0, "DSP-TXDATA", port->p_m_txdata);
+       if (port->p_m_delay)
+               ph_control(mISDNport, port, addr, CMX_DELAY, port->p_m_delay, "DSP-DELAY", port->p_m_delay);
+       if (port->p_m_txvol)
+               ph_control(mISDNport, port, addr, VOL_CHANGE_TX, port->p_m_txvol, "DSP-TXVOL", port->p_m_txvol);
+       if (port->p_m_rxvol)
+               ph_control(mISDNport, port, addr, VOL_CHANGE_RX, port->p_m_rxvol, "DSP-RXVOL", port->p_m_rxvol);
+       if (port->p_m_conf)
+               ph_control(mISDNport, port, addr, CMX_CONF_JOIN, port->p_m_conf, "DSP-CONF", port->p_m_conf);
+       if (port->p_m_echo)
+               ph_control(mISDNport, port, addr, CMX_ECHO_ON, 0, "DSP-ECHO", 1);
+       if (port->p_m_tone)
+               ph_control(mISDNport, port, addr, TONE_PATT_ON, port->p_m_tone, "DSP-TONE", port->p_m_tone);
+       if (port->p_m_rxoff)
+               ph_control(mISDNport, port, addr, CMX_RECEIVE_OFF, 0, "DSP-RXOFF", 1);
+//     if (port->p_m_txmix)
+//             ph_control(mISDNport, port, addr, CMX_MIX_ON, 0, "DSP-MIX", 1);
+       if (port->p_m_dtmf)
+               ph_control(mISDNport, port, addr, DTMF_TONE_START, 0, "DSP-DTMF", 1);
+       if (port->p_m_crypt)
+               ph_control_block(mISDNport, port, addr, BF_ENABLE_KEY, port->p_m_crypt_key, port->p_m_crypt_key_len, "DSP-CRYPT", port->p_m_crypt_key_len);
 }
 
-static void bchannel_deactivate(struct mISDNport *mISDNport, int i)
+/*
+ * subfunction for bchannel_event
+ * destroy stack
+ */
+static void _bchannel_destroy(struct mISDNport *mISDNport, int i)
 {
-       iframe_t dact;
+       unsigned char buff[1024];
+
+       chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL remove stack", DIRECTION_OUT);
+       add_trace("channel", NULL, "%d", i+1+(i>=15));
+       add_trace("stack", "id", "0x%08x", mISDNport->b_stid[i]);
+       add_trace("stack", "address", "0x%08x", mISDNport->b_addr[i]);
+       end_trace();
+       /* remove our stack only if set */
+       if (mISDNport->b_addr[i])
+       {
+               PDEBUG(DEBUG_BCHANNEL, "free stack (b_addr=0x%x)\n", mISDNport->b_addr[i]);
+               mISDN_clear_stack(mISDNdevice, mISDNport->b_stid[i]);
+               mISDN_write_frame(mISDNdevice, buff, mISDNport->b_addr[i] | FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+               mISDNport->b_addr[i] = 0;
+       }
+}
+
+
+/*
+bchannel procedure
+------------------
+
+A bchannel goes through the following states in this order:
+
+- B_STATE_IDLE
+No one is using the bchannel.
+It is available and not linked to Port class, nor reserved.
+
+- B_STATE_ACTIVATING
+The bchannel stack is created and an activation request is sent.
+It MAY be linked to Port class, but already unlinked due to Port class removal.
+
+- B_STATE_ACTIVE
+The bchannel is active and cofigured to the Port class needs.
+Also it is linked to a Port class, otherwhise it would be deactivated.
 
-       if (mISDNport->b_state[i] == B_STATE_ACTIVE)
+- B_STATE_DEACTIVATING
+The bchannel is in deactivating state, due to deactivation request.
+It may be linked to a Port class, that likes to reactivate it.
+
+- B_STATE_IDLE
+See above.
+After deactivating bchannel, and if not used, the bchannel becomes idle again.
+
+
+A bchannel can have the following events:
+
+- B_EVENT_ACTIVATE
+A bchannel is required by a Port class.
+
+- B_EVENT_ACTIVATED
+The bchannel beomes active.
+
+- B_EVENT_DEACTIVATE
+The bchannel is not required by Port class anymore
+
+- B_EVENT_DEACTIVATED
+The bchannel becomes inactive.
+
+All actions taken on these events depend on the current bchannel's state and if it is linked to a Port class.
+
+*/
+
+/*
+ * process bchannel events
+ * - mISDNport is a pointer to the port's structure
+ * - i is the index of the bchannel
+ * - event is the B_EVENT_* value
+ * - port is the PmISDN class pointer
+ */
+void bchannel_event(struct mISDNport *mISDNport, int i, int event)
+{
+       int state = mISDNport->b_state[i];
+
+       switch(event)
        {
-               /* reset dsp features */
-               if (mISDNport->b_port[i])
+               case B_EVENT_ACTIVATE:
+               /* port must be linked in order to allow activation */
+               if (!mISDNport->b_port[i])
+                       FATAL("bchannel must be linked to a Port class\n");
+               switch(state)
                {
-                       if (mISDNport->b_port[i]->p_m_delay)
-                       {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset txdata from txdata=%d.\n", mISDNport->b_port[i]->p_m_txdata);
-                               ph_control(mISDNport->b_addr[i], CMX_TXDATA_OFF, 0);
-                       }
-                       if (mISDNport->b_port[i]->p_m_delay)
+                       case B_STATE_IDLE:
+                       /* create stack and send activation request */
+                       if (_bchannel_create(mISDNport, i))
                        {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset delay from delay=%d.\n", mISDNport->b_port[i]->p_m_delay);
-                               ph_control(mISDNport->b_addr[i], CMX_JITTER, 0);
+                               _bchannel_activate(mISDNport, i, 1);
+                               state = B_STATE_ACTIVATING;
                        }
-                       if (mISDNport->b_port[i]->p_m_txvol)
-                       {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset tx-volume from shift=%d.\n", mISDNport->b_port[i]->p_m_txvol);
-                               ph_control(mISDNport->b_addr[i], VOL_CHANGE_TX, 0);
-                       }
-                       if (mISDNport->b_port[i]->p_m_rxvol)
-                       {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset rx-volume from shift=%d.\n", mISDNport->b_port[i]->p_m_rxvol);
-                               ph_control(mISDNport->b_addr[i], VOL_CHANGE_RX, 0);
-                       }
-                       if (mISDNport->b_port[i]->p_m_conf)
-                       {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we release conference from conf=%d.\n", mISDNport->b_port[i]->p_m_conf);
-                               ph_control(mISDNport->b_addr[i], CMX_CONF_SPLIT, 0);
-                       }
-                       if (mISDNport->b_port[i]->p_m_echo)
-                       {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset echo from echo=%d.\n", mISDNport->b_port[i]->p_m_echo);
-                               ph_control(mISDNport->b_addr[i], CMX_ECHO_OFF, 0);
-                       }
-                       if (mISDNport->b_port[i]->p_m_tone)
-                       {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset tone from tone=%d.\n", mISDNport->b_port[i]->p_m_tone);
-                               ph_control(mISDNport->b_addr[i], TONE_PATT_OFF, 0);
-                       }
-                       if (mISDNport->b_port[i]->p_m_rxoff)
-                       {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset rxoff from rxoff=%d.\n", mISDNport->b_port[i]->p_m_rxoff);
-                               ph_control(mISDNport->b_addr[i], CMX_RECEIVE_ON, 0);
-                       }
-#if 0
-                       if (mISDNport->b_port[i]->p_m_txmix)
+                       break;
+
+                       case B_STATE_ACTIVATING:
+                       /* do nothing, because it is already activating */
+                       break;
+
+                       case B_STATE_DEACTIVATING:
+                       /* do nothing, because we must wait until we can reactivate */
+                       break;
+
+                       default:
+                       PERROR("Illegal event %d at state %d, please correct.\n", event, state);
+               }
+               break;
+
+               case B_EVENT_ACTIVATED:
+               switch(state)
+               {
+                       case B_STATE_ACTIVATING:
+                       if (mISDNport->b_port[i])
                        {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset txmix from txmix=%d.\n", mISDNport->b_port[i]->p_m_txmix);
-                               ph_control(mISDNport->b_addr[i], CMX_MIX_OFF, 0);
-                       }
-#endif
-                       if (mISDNport->b_port[i]->p_m_dtmf)
+                               /* bchannel is active and used by Port class, so we configure bchannel */
+                               _bchannel_configure(mISDNport, i);
+                               state = B_STATE_ACTIVE;
+                       } else
                        {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset dtmf from dtmf=%d.\n", mISDNport->b_port[i]->p_m_dtmf);
-                               ph_control(mISDNport->b_addr[i], DTMF_TONE_STOP, 0);
+                               /* bchannel is active, but not used anymore (or has wrong stack config), so we deactivate */
+                               _bchannel_activate(mISDNport, i, 0);
+                               state = B_STATE_DEACTIVATING;
                        }
-                       if (mISDNport->b_port[i]->p_m_crypt)
+                       break;
+
+                       default:
+                       PERROR("Illegal event %d at state %d, please correct.\n", event, state);
+               }
+               break;
+
+               case B_EVENT_DEACTIVATE:
+               if (!mISDNport->b_port[i])
+                       FATAL("bchannel must be linked to a Port class\n");
+               switch(state)
+               {
+                       case B_STATE_IDLE:
+                       /* bchannel is idle due to an error, so we do nothing */
+                       break;
+
+                       case B_STATE_ACTIVATING:
+                       /* do nothing because we must wait until bchanenl is active before deactivating */
+                       break;
+
+                       case B_STATE_ACTIVE:
+                       /* bchannel is active, so we deactivate */
+                       _bchannel_activate(mISDNport, i, 0);
+                       state = B_STATE_DEACTIVATING;
+                       break;
+
+                       case B_STATE_DEACTIVATING:
+                       /* we may have taken an already deactivating bchannel, but do not require it anymore, so we do nothing */
+                       break;
+
+                       default:
+                       PERROR("Illegal event %d at state %d, please correct.\n", event, state);
+               }
+               break;
+
+               case B_EVENT_DEACTIVATED:
+               switch(state)
+               {
+                       case B_STATE_IDLE:
+                       /* ignore due to deactivation confirm after unloading */
+                       break;
+
+                       case B_STATE_DEACTIVATING:
+                       _bchannel_destroy(mISDNport, i);
+                       state = B_STATE_IDLE;
+                       if (mISDNport->b_port[i])
                        {
-                               PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset crypt from crypt=%d.\n", mISDNport->b_port[i]->p_m_dtmf);
-                               ph_control(mISDNport->b_addr[i], BF_DISABLE, 0);
+                               /* bchannel is now deactivate, but is requied by Port class, so we reactivate */
+                               if (_bchannel_create(mISDNport, i))
+                               {
+                                       _bchannel_activate(mISDNport, i, 1);
+                                       state = B_STATE_ACTIVATING;
+                               }
                        }
+                       break;
+
+                       default:
+                       PERROR("Illegal event %d at state %d, please correct.\n", event, state);
                }
-               /* deactivate bchannel */
-               PDEBUG(DEBUG_BCHANNEL, "deactivating bchannel (index %d), because currently active.\n", i);
-               dact.prim = DL_RELEASE | REQUEST; 
-               dact.addr = mISDNport->b_addr[i] | FLG_MSG_DOWN;
-               dact.dinfo = 0;
-               dact.len = 0;
-               mISDN_write(mISDNdevice, &dact, mISDN_HEADER_LEN+dact.len, TIMEOUT_1SEC);
-               mISDNport->b_state[i] = B_STATE_DEACTIVATING;
-               return;
+               break;
+
+               default:
+               PERROR("Illegal event %d, please correct.\n", event);
        }
+
+       mISDNport->b_state[i] = state;
 }
 
 
+
+
 /*
  * check for available channel and reserve+set it.
  * give channel number or SEL_CHANNEL_ANY or SEL_CHANNEL_NO
  * give exclusiv flag
  * returns -(cause value) or x = channel x or 0 = no channel
+ * NOTE: no activation is done here
  */
-denke ans aktivieren und deaktivieren
 int PmISDN::seize_bchannel(int channel, int exclusive)
 {
        int i;
@@ -407,32 +788,33 @@ int PmISDN::seize_bchannel(int channel, int exclusive)
        return(-34); /* no free channel */
 
 seize:
+       PDEBUG(DEBUG_BCHANNEL, "PmISDN(%s) seizing bchannel %d (index %d)\n", p_name, channel, i);
+
        /* link Port */
        p_m_mISDNport->b_port[i] = this;
        p_m_b_index = i;
        p_m_b_channel = channel;
        p_m_b_exclusive = exclusive;
-       p_m_b_stid = p_m_mISDNport->b_stid[i];
-       p_m_b_addr = p_m_mISDNport->b_addr[i];
-       p_m_jittercheck = 0;
 
        /* reserve channel */
-       if (p_m_b_reserve == 0) // already reserved
+       if (!p_m_b_reserve)
        {
                p_m_b_reserve = 1;
-               mISDNport->b_reserved++;
+               p_m_mISDNport->b_reserved++;
        }
 
-       PDEBUG(DEBUG_BCHANNEL, "PmISDN(%s) seizing bchannel %d (index %d)\n", p_name, channel, i);
-
        return(channel);
 }
 
 /*
  * drop reserved channel and unset it.
+ * deactivation is also done
  */
 void PmISDN::drop_bchannel(void)
 {
+       if (p_m_b_index < 0)
+               return;
+
        /* unreserve channel */
        if (p_m_b_reserve)
                p_m_mISDNport->b_reserved--;
@@ -444,140 +826,152 @@ void PmISDN::drop_bchannel(void)
 
        PDEBUG(DEBUG_BCHANNEL, "PmISDN(%s) dropping bchannel\n", p_name);
 
+       if (p_m_mISDNport->b_state[p_m_b_index] != B_STATE_IDLE)
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_DEACTIVATE);
        p_m_mISDNport->b_port[p_m_b_index] = NULL;
        p_m_b_index = -1;
        p_m_b_channel = 0;
        p_m_b_exclusive = 0;
-       p_m_b_addr = 0;
-       p_m_b_stid = 0;
 }
 
 
 /*
- * data is to be transmitted to the remote
- */
-wech void Port::transmit(unsigned char *buffer, int length, int tonelength)
-{
-       /* send tone data to isdn device only if we have data, otherwhise we send nothing */
-       if (tonelength>0 && (p_tone_fh>=0 || p_tone_fetched || p_m_crypt_msg_loops))
-       {
-               unsigned char buf[mISDN_HEADER_LEN+tonelength];
-               iframe_t *frm = (iframe_t *)buf;
-
-               if (p_m_crypt_msg_loops)
-               {
-                       /* send pending message */
-                       int tosend;
-
-                       tosend = p_m_crypt_msg_len - p_m_crypt_msg_current;
-                       if (tosend > newlen)
-                               tosend = newlen;
-                       memcpy(p, p_m_crypt_msg+p_m_crypt_msg_current, tosend);
-                       p_m_crypt_msg_current += tosend;
-                       if (p_m_crypt_msg_current == p_m_crypt_msg_len)
-                       {
-                               p_m_crypt_msg_current = 0;
-                               p_m_crypt_msg_loops--;
-                       }
-               }
-               frm->prim = DL_DATA | REQUEST; 
-               frm->addr = p_m_b_addr | FLG_MSG_DOWN;
-               frm->dinfo = 0;
-               frm->len = tonelength;
-               memcpy(&frm->data.p, buffer, tonelength);
-               mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC);
-
-               if (p_debug_nothingtosend)
-               {
-                       p_debug_nothingtosend = 0;
-                       PDEBUG((DEBUG_PORT | DEBUG_BCHANNEL), "PmISDN(%s) start sending, because we have tones and/or remote audio.\n", p_name);
-               } 
-       } else
-       {
-               if (!p_debug_nothingtosend)
-               {
-                       p_debug_nothingtosend = 1;
-                       PDEBUG((DEBUG_PORT | DEBUG_BCHANNEL), "PmISDN(%s) stop sending, because we have only silence.\n", p_name);
-               } 
-       }
-}
+ * handler
 
+audio transmission procedure:
+-----------------------------
+
+* priority
+three sources of audio transmission:
+- crypto-data high priority
+- tones high priority (also high)
+- remote-data low priority
+
+* elapsed
+a variable that temporarily shows the number of samples elapsed since last transmission process.
+p_m_last_tv_* is used to store that last timestamp. this is used to calculate the time elapsed.
+
+* load
+a variable that is increased whenever data is transmitted.
+it is decreased while time elapses. it stores the number of samples that
+are currently loaded to dsp module.
+since clock in dsp module is the same clock for user space process, these 
+times have no skew.
+
+* levels
+there are two levels:
+ISDN_LOAD will give the load that have to be kept in dsp.
+ISDN_MAXLOAD will give the maximum load before dropping.
+
+* procedure for low priority data
+see txfromup() for procedure
+in short: remote data is ignored during high priority tones
+
+* procedure for high priority data
+whenever load is below ISDN_LOAD, load is filled up to ISDN_LOAD
+if no more data is available, load becomes empty again.
+
+'load' variable:
+0                    ISDN_LOAD           ISDN_MAXLOAD
++--------------------+----------------------+
+|                    |                      |
++--------------------+----------------------+
+
+on empty load or on load below ISDN_LOAD, the load is inceased to ISDN_LOAD:
+0                    ISDN_LOAD           ISDN_MAXLOAD
++--------------------+----------------------+
+|TTTTTTTTTTTTTTTTTTTT|                      |
++--------------------+----------------------+
+
+on empty load, remote-audio causes the load with the remote audio to be increased to ISDN_LOAD.
+0                    ISDN_LOAD           ISDN_MAXLOAD
++--------------------+----------------------+
+|TTTTTTTTTTTTTTTTTTTTRRRRR                  |
++--------------------+----------------------+
 
-/*
- * handler
  */
 int PmISDN::handler(void)
 {
        struct message *message;
-       int elapsed, length;
+       int elapsed = 0;
+       int ret;
 
        if ((ret = Port::handler()))
                return(ret);
 
-       /* send tone data to isdn device only if we have data */
-       if (p_tone_fh>=0 || p_tone_fetched || p_m_crypt_msg_loops)
+       /* get elapsed */
+       if (p_m_last_tv_sec)
        {
-               /* calculate how much to transmit */
-               if (!p_last_tv.sec)
-               {
-                       elapsed = ISDN_PRELOAD << 3; /* preload for the first time */
-               } else
-               {
-                       elapsed = 1000 * (now_tv.sec - p_last_tv_sec)
-                               + (now_tv.usec/1000) - p_last_tv_msec;
-                       /* gap was greater preload, so only fill up to preload level */
-                       if (elapsed > ISDN_PRELOAD)
-                       {
-                               elapsed = ISDN_PRELOAD << 3
-                       }
-               }
-               if (elapsed >= ISDN_TRANSMIT)
+               elapsed = 8000 * (now_tv.tv_sec - p_m_last_tv_sec)
+                       + 8 * (now_tv.tv_usec/1000 - p_m_last_tv_msec);
+       } else
+       {
+               /* set clock of first process ever in this instance */
+               p_m_last_tv_sec = now_tv.tv_sec;
+               p_m_last_tv_msec = now_tv.tv_usec/1000;
+       }
+       /* process only if we have a minimum of samples, to make packets not too small */
+       if (elapsed >= ISDN_TRANSMIT)
+       {
+               /* set clock of last process! */
+               p_m_last_tv_sec = now_tv.tv_sec;
+               p_m_last_tv_msec = now_tv.tv_usec/1000;
+
+               /* update load */
+               if (elapsed < p_m_load)
+                       p_m_load -= elapsed;
+               else
+                       p_m_load = 0;
+
+               /* to send data, tone must be active OR crypt messages must be on */
+               if ((p_tone_name[0] || p_m_crypt_msg_loops) && p_m_load < ISDN_LOAD)
                {
-                       unsigned char buf[mISDN_HEADER_LEN+(ISDN_PRELOAD<<3)];
+                       int tosend = ISDN_LOAD - p_m_load, length; 
+                       unsigned char buf[mISDN_HEADER_LEN+tosend];
                        iframe_t *frm = (iframe_t *)buf;
+                       unsigned char *p = buf+mISDN_HEADER_LEN;
 
-                       length = read_audio(buffer, elapsed);
-                       p_last_tv_sec = now_tv.sec;
-                       p_last_tv_msec = now_tv.usec/1000;
-
-                       if (p_m_crypt_msg_loops)
+                       /* copy crypto loops */
+                       while (p_m_crypt_msg_loops && tosend)
                        {
-                               /* send pending message */
-                               int tosend;
-       check!!
-                               tosend = p_m_crypt_msg_len - p_m_crypt_msg_current;
-                               if (tosend > length)
-                                       tosend = length;
-                               memcpy(p, p_m_crypt_msg+p_m_crypt_msg_current, tosend);
-                               p_m_crypt_msg_current += tosend;
+                               /* how much do we have to send */
+                               length = p_m_crypt_msg_len - p_m_crypt_msg_current;
+
+                               /* clip tosend */
+                               if (length > tosend)
+                                       length = tosend;
+
+                               /* copy message (part) to buffer */
+                               memcpy(p, p_m_crypt_msg+p_m_crypt_msg_current, length);
+
+                               /* new position */
+                               p_m_crypt_msg_current += length;
                                if (p_m_crypt_msg_current == p_m_crypt_msg_len)
                                {
+                                       /* next loop */
                                        p_m_crypt_msg_current = 0;
                                        p_m_crypt_msg_loops--;
                                }
+
+                               /* new length */
+                               tosend -= length;
                        }
-                       frm->prim = DL_DATA | REQUEST; 
-                       frm->addr = p_m_b_addr | FLG_MSG_DOWN;
-                       frm->dinfo = 0;
-                       frm->len = length;
-                       memcpy(&frm->data.p, buffer, length);
-                       mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC);
 
-                       if (p_debug_nothingtosend)
+                       /* copy tones */
+                       if (p_tone_name[0] && tosend)
                        {
-                               p_debug_nothingtosend = 0;
-                               PDEBUG((DEBUG_PORT | DEBUG_BCHANNEL), "PmISDN(%s) start sending, because we have tones and/or remote audio.\n", p_name);
-                       } 
-                       return(1);
+                               tosend -= read_audio(p, tosend);
+                       }
+
+                       /* send data */
+                       frm->prim = DL_DATA | REQUEST; 
+                       frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN;
+                       frm->dinfo = 0;
+                       frm->len = ISDN_LOAD - p_m_load - tosend;
+                       if (frm->len)
+                               mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC);
+                       p_m_load += frm->len;
                }
-       } else
-       {
-               p_last_tv.sec = p_last_tv.msec = 0; /* flag that we don't transmit data */
-               if (!cwp_debug_nothingtosend)
-               {
-                       p_debug_nothingtosend = 1;
-                       PDEBUG((DEBUG_PORT | DEBUG_BCHANNEL), "PmISDN(%s) stop sending, because we have only silence.\n", p_name);
-               } 
        }
 
        // NOTE: deletion is done by the child class
@@ -593,8 +987,8 @@ int PmISDN::handler(void)
                        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_TIMEOUT);
                        message->param.state = p_state;
                        message_put(message);
+                       return(1);
                }
-               return(1);
        }
        
        return(0); /* nothing done */
@@ -609,78 +1003,82 @@ void PmISDN::bchannel_receive(iframe_t *frm)
        unsigned char *data_temp;
        unsigned long length_temp;
        struct message *message;
-       struct timeval tv;
-       struct timezone tz;
-       long long jitter_now;
-       int newlen;
        unsigned char *p;
        int l;
        unsigned long cont;
-//     iframe_t rsp; /* response to possible indication */
-#if 0
-#warning BCHANNEL-DEBUG
-{
-       // check if we are part of all ports */
-       class Port *port = port_first;
-       while(port)
-       {
-               if (port==this)
-                       break;
-               port=port->next;
-       }
-       if (!port)
-       {
-               PERROR_RUNTIME("**************************************************\n");
-               PERROR_RUNTIME("*** BCHANNEL-DEBUG: !this! is not in list of ports\n");
-               PERROR_RUNTIME("**************************************************\n");
-               return;
-       }
-}
-#endif
-
 
        if (frm->prim == (PH_CONTROL | INDICATION))
        {
+               if (frm->len < 4)
+               {
+                       PERROR("SHORT READ OF PH_CONTROL INDICATION\n");
+                       return;
+               }
                cont = *((unsigned long *)&frm->data.p);
-               // PDEBUG(DEBUG_PORT, "PmISDN(%s) received a PH_CONTROL INDICATION 0x%x\n", p_name, cont);
                if ((cont&(~DTMF_TONE_MASK)) == DTMF_TONE_VAL)
                {
+                       chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN);
+                       add_trace("DTMF", NULL, "%c", cont & DTMF_TONE_MASK);
+                       end_trace();
                        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DTMF);
                        message->param.dtmf = cont & DTMF_TONE_MASK;
-                       PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL  DTMF digit '%c'\n", p_name, message->param.dtmf);
+                       PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION  DTMF digit '%c'\n", p_name, message->param.dtmf);
                        message_put(message);
+                       return;
                }
                switch(cont)
                {
                        case BF_REJECT:
+                       chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN);
+                       add_trace("DSP-CRYPT", NULL, "error");
+                       end_trace();
                        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CRYPT);
                        message->param.crypt.type = CC_ERROR_IND;
-                       PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL  reject of blowfish.\n", p_name);
+                       PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION  reject of blowfish.\n", p_name);
                        message_put(message);
                        break;
 
                        case BF_ACCEPT:
+                       chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN);
+                       add_trace("DSP-CRYPT", NULL, "ok");
+                       end_trace();
                        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CRYPT);
                        message->param.crypt.type = CC_ACTBF_CONF;
-                       PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL  accept of blowfish.\n", p_name);
+                       PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION  accept of blowfish.\n", p_name);
                        message_put(message);
                        break;
+
+                       case CMX_TX_DATA:
+                       if (!p_m_txdata)
+                       {
+                               /* if tx is off, it may happen that fifos send us pending informations, we just ignore them */
+                               PDEBUG(DEBUG_BCHANNEL, "PmISDN(%s) ignoring tx data, because 'txdata' is turned off\n", p_name);
+                               return;
+                       }
+                       if (p_record)
+                               record((unsigned char *)(cont+1), frm->len - 4, 1); // from up
+                       break;
+
+                       default:
+                       chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN);
+                       add_trace("unknown", NULL, "0x%x", cont);
+                       end_trace();
                }
                return;
        }
+       if (frm->prim != (PH_DATA | INDICATION) && frm->prim != (DL_DATA | INDICATION))
+       {
+               PERROR("Bchannel received unknown primitve: 0x%x\n", frm->prim);
+               return;
+       }
 
        /* calls will not process any audio data unless
-        * the call is connected OR tones feature is enabled.
+        * the call is connected OR interface features audio during call setup.
         */
+//printf("%d -> %d prim=%x joindata=%d tones=%d\n", p_serial, ACTIVE_EPOINT(p_epointlist), frm->prim, p_m_joindata, p_m_mISDNport->earlyb);    
+#ifndef DEBUG_COREBRIDGE
        if (p_state!=PORT_STATE_CONNECT
-        && !p_m_mISDNport->is_tones)
-               return;
-
-#if 0
-       /* the bearer capability must be audio in order to send and receive
-        * audio prior or after connect.
-        */
-       if (!(p_bearerinfo.capability&CLASS_CAPABILITY_AUDIO) && p_state!=PORT_STATE_CONNECT)
+        && !p_m_mISDNport->earlyb)
                return;
 #endif
 
@@ -691,6 +1089,10 @@ void PmISDN::bchannel_receive(iframe_t *frm)
                return;
        }
 
+       /* record data */
+       if (p_record)
+               record((unsigned char *)&frm->data.p, frm->len, 0); // from down
+
        /* randomize and listen to crypt message if enabled */
        if (p_m_crypt_listen)
        {
@@ -706,9 +1108,8 @@ void PmISDN::bchannel_receive(iframe_t *frm)
        p = (unsigned char *)&frm->data.p;
 
        /* send data to epoint */
-       if (p_m_calldata && ACTIVE_EPOINT(p_epointlist)) /* only if we have an epoint object */
+       if (p_m_joindata && ACTIVE_EPOINT(p_epointlist)) /* only if we have an epoint object */
        {
-//printf("we are port %s and sending to epoint %d\n", p_m_cardname, p_epoint->serial);
                length_temp = frm->len;
                data_temp = p;
                while(length_temp)
@@ -716,9 +1117,6 @@ void PmISDN::bchannel_receive(iframe_t *frm)
                        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DATA);
                        message->param.data.len = (length_temp>sizeof(message->param.data.data))?sizeof(message->param.data.data):length_temp;
                        memcpy(message->param.data.data, data_temp, message->param.data.len);
-                       message->param.data.compressed = 1;
-                       message->param.data.port_id = p_serial;
-                       message->param.data.port_type = p_type;
                        message_put(message);
                        if (length_temp <= sizeof(message->param.data.data))
                                break;
@@ -726,15 +1124,6 @@ void PmISDN::bchannel_receive(iframe_t *frm)
                        length_temp -= sizeof(message->param.data.data);
                }
        }
-#if 0
-       /* response to the data indication */
-       rsp.prim = frm->prim & 0xfffffffc | RESPONSE; 
-       rsp.addr = frm->addr & INST_ID_MASK | FLG_MSG_DOWN;
-       rsp.dinfo = frm->dinfo;
-       rsp.len = 0;
-       mISDN_write(mISDNdevice, &rsp, mISDN_HEADER_LEN+rsp.len, TIMEOUT_1SEC);
-//PDEBUG(DEBUG_ISDN, "written %d bytes.\n", length);
-#endif
 }
 
 
@@ -749,7 +1138,7 @@ void PmISDN::set_echotest(int echo)
                PDEBUG(DEBUG_ISDN, "we set echo to echo=%d.\n", p_m_echo);
                if (p_m_b_channel)
                        if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
-                               ph_control(p_m_b_addr, p_m_echo?CMX_ECHO_ON:CMX_ECHO_OFF, 0);
+                               ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_echo?CMX_ECHO_ON:CMX_ECHO_OFF, 0, "DSP-ECHO", p_m_echo);
        }
 }
 
@@ -777,7 +1166,7 @@ void PmISDN::set_tone(char *dir, char *tone)
                if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
                {
                        PDEBUG(DEBUG_ISDN, "we reset tone from id=%d to OFF.\n", p_m_tone);
-                       ph_control(p_m_b_addr, TONE_PATT_OFF, 0);
+                       ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], TONE_PATT_OFF, 0, "DSP-TONE", 0);
                }
                p_m_tone = 0;
                Port::set_tone(dir, tone);
@@ -859,7 +1248,7 @@ void PmISDN::set_tone(char *dir, char *tone)
                PDEBUG(DEBUG_ISDN, "we set tone to id=%d.\n", p_m_tone);
                if (p_m_b_channel)
                        if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
-                               ph_control(p_m_b_addr, p_m_tone?TONE_PATT_ON:TONE_PATT_OFF, p_m_tone);
+                               ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_tone?TONE_PATT_ON:TONE_PATT_OFF, p_m_tone, "DSP-TONE", p_m_tone);
        }
        /* turn user-space tones off in cases of no tone OR dsp tone */
        Port::set_tone("",NULL);
@@ -879,16 +1268,18 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union
                        PDEBUG(DEBUG_BCHANNEL, "we change tx-volume to shift=%d.\n", p_m_txvol);
                        if (p_m_b_channel)
                                if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
-                                       ph_control(p_m_b_addr, VOL_CHANGE_TX, p_m_txvol);
-               }
+                                       ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], VOL_CHANGE_TX, p_m_txvol, "DSP-TXVOL", p_m_txvol);
+               } else
+                       PDEBUG(DEBUG_BCHANNEL, "we already have tx-volume shift=%d.\n", p_m_rxvol);
                if (p_m_rxvol != param->mISDNsignal.rxvol)
                {
                        p_m_rxvol = param->mISDNsignal.rxvol;
                        PDEBUG(DEBUG_BCHANNEL, "we change rx-volume to shift=%d.\n", p_m_rxvol);
                        if (p_m_b_channel)
                                if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
-                                       ph_control(p_m_b_addr, VOL_CHANGE_RX, p_m_rxvol);
-               }
+                                       ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], VOL_CHANGE_RX, p_m_rxvol, "DSP-RXVOL", p_m_rxvol);
+               } else
+                       PDEBUG(DEBUG_BCHANNEL, "we already have rx-volume shift=%d.\n", p_m_rxvol);
                break;
 
                case mISDNSIGNAL_CONF:
@@ -900,60 +1291,35 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union
                        PDEBUG(DEBUG_BCHANNEL, "we change conference to conf=%d.\n", p_m_conf);
                        if (p_m_b_channel)
                                if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
-                                       ph_control(p_m_b_addr, (p_m_conf)?CMX_CONF_JOIN:CMX_CONF_SPLIT, p_m_conf);
-               }
+                                       ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], (p_m_conf)?CMX_CONF_JOIN:CMX_CONF_SPLIT, p_m_conf, "DSP-CONF", p_m_conf);
+               } else
+                       PDEBUG(DEBUG_BCHANNEL, "we already have conf=%d.\n", p_m_conf);
                /* we must set, even if currently tone forbids conf */
                p_m_conf = param->mISDNsignal.conf;
 //if (dddebug) PDEBUG(DEBUG_ISDN, "dddebug = %d\n", dddebug->type);
                break;
 
-               case mISDNSIGNAL_CALLDATA:
-               if (p_m_calldata != param->mISDNsignal.calldata)
+               case mISDNSIGNAL_JOINDATA:
+               if (p_m_joindata != param->mISDNsignal.joindata)
                {
-                       p_m_calldata = param->mISDNsignal.calldata;
-                       PDEBUG(DEBUG_BCHANNEL, "we change to calldata=%d.\n", p_m_calldata);
-                       auch senden
-               }
+                       p_m_joindata = param->mISDNsignal.joindata;
+                       PDEBUG(DEBUG_BCHANNEL, "we change to joindata=%d.\n", p_m_joindata);
+               } else
+                       PDEBUG(DEBUG_BCHANNEL, "we already have joindata=%d.\n", p_m_joindata);
                break;
                
-#if 0
-               case mISDNSIGNAL_NODATA:
-               p_m_nodata = param->mISDNsignal.nodata;
-               if (p_m_txmix == p_m_nodata) /* txmix != !nodata */
+               case mISDNSIGNAL_DELAY:
+               if (p_m_delay != param->mISDNsignal.delay)
                {
-                       p_m_txmix = !p_m_nodata;
-                       PDEBUG(DEBUG_BCHANNEL, "we change mix mode to txmix=%d (nodata=%d).\n", p_m_txmix, p_m_nodata);
+                       p_m_delay = param->mISDNsignal.delay;
+                       PDEBUG(DEBUG_BCHANNEL, "we change delay mode to delay=%d.\n", p_m_delay);
                        if (p_m_b_channel)
                                if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
-                                       ph_control(p_m_b_addr, p_m_txmix?CMX_MIX_ON:CMX_MIX_OFF, 0);
-               }
-               break;
-#endif
-
-#if 0
-               case mISDNSIGNAL_RXOFF:
-               if (p_m_rxoff != param->mISDNsignal.rxoff)
-               {
-                       p_m_rxoff = param->mISDNsignal.rxoff;
-                       PDEBUG(DEBUG_BCHANNEL, "we change receive mode to rxoff=%d.\n", p_m_rxoff);
-                       if (p_m_b_channel)
-                               if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
-                                       ph_control(p_m_b_addr, p_m_rxoff?CMX_RECEIVE_OFF:CMX_RECEIVE_ON, 0);
-               }
-               break;
-
-               case mISDNSIGNAL_DTMF:
-               if (p_m_dtmf != param->mISDNsignal.dtmf)
-               {
-                       p_m_dtmf = param->mISDNsignal.dtmf;
-                       PDEBUG(DEBUG_BCHANNEL, "we change dtmf mode to dtmf=%d.\n", p_m_dtmf);
-                       if (p_m_b_channel)
-                               if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
-                                       ph_control(p_m_b_addr, p_m_dtmf?DTMF_TONE_START:DTMF_TONE_STOP, 0);
-               }
+                                       ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_delay?CMX_DELAY:CMX_JITTER, p_m_delay, "DSP-DELAY", p_m_delay);
+               } else
+                       PDEBUG(DEBUG_BCHANNEL, "we already have delay=%d.\n", p_m_delay);
                break;
 
-#endif
                default:
                PERROR("PmISDN(%s) unsupported signal message %d.\n", p_name, param->mISDNsignal.message);
        }
@@ -982,7 +1348,7 @@ void PmISDN::message_crypt(unsigned long epoint_id, int message_id, union parame
                PDEBUG(DEBUG_BCHANNEL, "we set encryption to crypt=%d. (0 means OFF)\n", p_m_crypt);
                if (p_m_b_channel)
                        if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
-                               ph_control_block(p_m_b_addr, p_m_crypt?BF_ENABLE_KEY:BF_DISABLE, p_m_crypt_key, p_m_crypt_key_len);
+                               ph_control_block(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_crypt?BF_ENABLE_KEY:BF_DISABLE, p_m_crypt_key, p_m_crypt_key_len, "DSP-CRYPT", p_m_crypt_key_len);
                break;
 
                case CC_DACT_REQ:            /* deactivate session encryption */
@@ -1013,7 +1379,7 @@ void PmISDN::message_crypt(unsigned long epoint_id, int message_id, union parame
                if (p_m_txmix)
                {
                        PDEBUG(DEBUG_BCHANNEL, "for sending CR_MESSAGE_REQ, we reset txmix from txmix=%d.\n", p_m_txmix);
-                       ph_control(p_m_b_addr, CMX_MIX_OFF, 0);
+                       ph_control(p_m_mISDNport, this, p_mISDNport->b_addr[p_m_b_index], CMX_MIX_OFF, 0, "DSP-TXMIX", 0);
                }
 #endif
                break;
@@ -1034,6 +1400,10 @@ int PmISDN::message_epoint(unsigned long epoint_id, int message_id, union parame
 
        switch(message_id)
        {
+               case MESSAGE_DATA: /* tx-data from upper layer */
+               txfromup(param->data.data, param->data.len);
+               return(1);
+
                case MESSAGE_mISDNSIGNAL: /* user command */
                PDEBUG(DEBUG_ISDN, "PmISDN(%s) received special ISDN SIGNAL %d.\n", p_name, param->mISDNsignal.message);
                message_mISDNsignal(epoint_id, message_id, param);
@@ -1050,14 +1420,6 @@ int PmISDN::message_epoint(unsigned long epoint_id, int message_id, union parame
 
 
 /*
- * transmit function for data to mISDN b-channel
- */
-void Port::transmit(unsigned char *buffer, int length)
-{
-}
-
-
-/*
  * main loop for processing messages from mISDN device
  */
 int mISDN_handler(void)
@@ -1081,10 +1443,11 @@ int mISDN_handler(void)
                i = 0;
                while(i < mISDNport->b_num)
                {
-                       if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
+                       isdnport=mISDNport->b_port[i];
+                       if (isdnport)
                        {
-                               isdnport=mISDNport->b_port[i];
-                               if (isdnport->p_m_calldata || isdnport->p_m_crypt_msg_loops || isdnport->p_m_crypt_listen || isdnport->p_record)
+                               /* call bridges in user space OR crypto OR recording */
+                               if (isdnport->p_m_joindata || isdnport->p_m_crypt_msg_loops || isdnport->p_m_crypt_listen || isdnport->p_record)
                                {
                                        /* rx IS required */
                                        if (isdnport->p_m_rxoff)
@@ -1092,7 +1455,8 @@ int mISDN_handler(void)
                                                /* turn on RX */
                                                isdnport->p_m_rxoff = 0;
                                                PDEBUG(DEBUG_BCHANNEL, "%s: receive data is required, so we turn them on\n");
-                                               ph_control(isdnport->p_m_b_addr, CMX_RECEIVE_ON, 0);
+                                               if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
+                                                       ph_control(mISDNport, isdnport, mISDNport->b_addr[isdnport->p_m_b_index], CMX_RECEIVE_ON, 0, "DSP-RXOFF", 0);
                                                return(1);
                                        }
                                } else
@@ -1103,7 +1467,34 @@ int mISDN_handler(void)
                                                /* turn off RX */
                                                isdnport->p_m_rxoff = 1;
                                                PDEBUG(DEBUG_BCHANNEL, "%s: receive data is not required, so we turn them off\n");
-                                               ph_control(isdnport->p_m_b_addr, CMX_RECEIVE_OFF, 0);
+                                               if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
+                                                       ph_control(mISDNport, isdnport, mISDNport->b_addr[isdnport->p_m_b_index], CMX_RECEIVE_OFF, 0, "DSP-RXOFF", 1);
+                                               return(1);
+                                       }
+                               }
+                               /* recording */
+                               if (isdnport->p_record)
+                               {
+                                       /* txdata IS required */
+                                       if (!isdnport->p_m_txdata)
+                                       {
+                                               /* turn on RX */
+                                               isdnport->p_m_txdata = 1;
+                                               PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is required, so we turn them on\n");
+                                               if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
+                                                       ph_control(mISDNport, isdnport, mISDNport->b_addr[isdnport->p_m_b_index], CMX_TXDATA_ON, 0, "DSP-TXDATA", 1);
+                                               return(1);
+                                       }
+                               } else
+                               {
+                                       /* txdata NOT required */
+                                       if (isdnport->p_m_txdata)
+                                       {
+                                               /* turn off RX */
+                                               isdnport->p_m_txdata = 0;
+                                               PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is not required, so we turn them off\n");
+                                               if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
+                                                       ph_control(mISDNport, isdnport, mISDNport->b_addr[isdnport->p_m_b_index], CMX_TXDATA_OFF, 0, "DSP-TXDATA", 0);
                                                return(1);
                                        }
                                }
@@ -1140,6 +1531,8 @@ int mISDN_handler(void)
                                        act.len = 0;
                                        mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
                                }
+                               l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | REQUEST, DIRECTION_OUT);
+                               end_trace();
                                return(1);
                        }
                }
@@ -1165,6 +1558,10 @@ int mISDN_handler(void)
                mISDNport = mISDNport->next;
        } 
 
+       /* no device, no read */
+       if (mISDNdevice < 0)
+               return(0);
+
        /* get message from kernel */
        if (!(msg = alloc_msg(MAX_MSG_SIZE)))
                return(1);
@@ -1174,8 +1571,7 @@ int mISDN_handler(void)
                free_msg(msg);
                if (errno == EAGAIN)
                        return(0);
-               PERROR("FATAL ERROR: failed to do mISDN_read()\n");
-               exit(-1); 
+               FATAL("Failed to do mISDN_read()\n");
        }
        if (!ret)
        {
@@ -1189,253 +1585,265 @@ int mISDN_handler(void)
        /* global prim */
        switch(frm->prim)
        {
+               case MGR_DELLAYER | CONFIRM:
                case MGR_INITTIMER | CONFIRM:
                case MGR_ADDTIMER | CONFIRM:
                case MGR_DELTIMER | CONFIRM:
                case MGR_REMOVETIMER | CONFIRM:
-//             if (options.deb & DEBUG_ISDN)
-//                     PDEBUG(DEBUG_ISDN, "timer-confirm\n");
                free_msg(msg);
                return(1);
        }
 
-       /* find the port */
+       /* handle timer events from mISDN for NT-stack
+        * note: they do not associate with a stack */
+       if (frm->prim == (MGR_TIMER | INDICATION))
+       {
+               itimer_t *it;
+
+               /* find mISDNport */
+               mISDNport = mISDNport_first;
+               while(mISDNport)
+               {
+                       /* nt mode only */
+                       if (mISDNport->ntmode)
+                       {
+                               it = mISDNport->nst.tlist;
+                               /* find timer */
+                               while(it)
+                               {
+                                       if (it->id == (int)frm->addr)
+                                               break;
+                                       it = it->next;
+                               }
+                               if (it)
+                                       break;
+                       }
+                       mISDNport = mISDNport->next;
+               }
+               if (mISDNport)
+               {
+                       mISDN_write_frame(mISDNdevice, msg->data, mISDNport->upper_id | FLG_MSG_DOWN,
+                               MGR_TIMER | RESPONSE, 0, 0, NULL, TIMEOUT_1SEC);
+
+                       PDEBUG(DEBUG_ISDN, "timer-indication port %d it=%p\n", mISDNport->portnum, it);
+                       test_and_clear_bit(FLG_TIMER_RUNING, (long unsigned int *)&it->Flags);
+                       ret = it->function(it->data);
+               } else
+               {
+                       PDEBUG(DEBUG_ISDN, "timer-indication not handled\n");
+               }
+               goto out;
+       }
+
+       /* find the mISDNport that belongs to the stack */
        mISDNport = mISDNport_first;
        while(mISDNport)
        {
-               if ((frm->prim==(MGR_TIMER | INDICATION)) && mISDNport->ntmode)
-               {
-                       itimer_t *it = mISDNport->nst.tlist;
+               if ((frm->addr&MASTER_ID_MASK) == (unsigned int)(mISDNport->upper_id&MASTER_ID_MASK))
+                       break;
+               mISDNport = mISDNport->next;
+       } 
+       if (!mISDNport)
+       {
+               PERROR("message belongs to no mISDNport: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len);
+               goto out;
+       }
 
-                       /* find timer */
-                       while(it)
-                       {
-                               if (it->id == (int)frm->addr)
-                                       break;
-                               it = it->next;
+       /* master stack */
+       if (!(frm->addr&FLG_CHILD_STACK))
+       {
+               /* d-message */
+               switch(frm->prim)
+               {
+                       case MGR_SHORTSTATUS | INDICATION:
+                       case MGR_SHORTSTATUS | CONFIRM:
+                       switch(frm->dinfo) {
+                               case SSTATUS_L1_ACTIVATED:
+                               l1l2l3_trace_header(mISDNport, NULL, PH_ACTIVATE | (frm->prim & 0x3), DIRECTION_IN);
+                               end_trace();
+                               goto ss_act;
+                               case SSTATUS_L1_DEACTIVATED:
+                               l1l2l3_trace_header(mISDNport, NULL, PH_DEACTIVATE | (frm->prim & 0x3), DIRECTION_IN);
+                               end_trace();
+                               goto ss_deact;
+                               case SSTATUS_L2_ESTABLISHED:
+                               l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | (frm->prim & 0x3), DIRECTION_IN);
+                               end_trace();
+                               goto ss_estab;
+                               case SSTATUS_L2_RELEASED:
+                               l1l2l3_trace_header(mISDNport, NULL, DL_RELEASE | (frm->prim & 0x3), DIRECTION_IN);
+                               end_trace();
+                               goto ss_rel;
                        }
-                       if (it)
-                       {
-                               mISDN_write_frame(mISDNdevice, msg->data, mISDNport->upper_id | FLG_MSG_DOWN,
-                                       MGR_TIMER | RESPONSE, 0, 0, NULL, TIMEOUT_1SEC);
+                       break;
 
-                               PDEBUG(DEBUG_ISDN, "timer-indication %s port %d it=%p\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, it);
-                               test_and_clear_bit(FLG_TIMER_RUNING, (long unsigned int *)&it->Flags);
-                               ret = it->function(it->data);
-                               break;
-                       }
-                       /* we will continue here because we have a timer for a different mISDNport */
-               }
-//printf("comparing frm->addr %x with upper_id %x\n", frm->addr, mISDNport->upper_id);
-               if ((frm->addr&STACK_ID_MASK) == (unsigned int)(mISDNport->upper_id&STACK_ID_MASK))
-               {
-                       /* d-message */
-                       switch(frm->prim)
+                       case PH_ACTIVATE | CONFIRM:
+                       case PH_ACTIVATE | INDICATION:
+                       l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+                       end_trace();
+                       if (mISDNport->ntmode)
                        {
-                               case MGR_SHORTSTATUS | INDICATION:
-                               case MGR_SHORTSTATUS | CONFIRM:
-                               switch(frm->dinfo) {
-                                       case SSTATUS_L1_ACTIVATED:
-                                       PDEBUG(DEBUG_ISDN, "Received SSTATUS_L1_ACTIVATED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
-                                       goto ss_act;
-                                       case SSTATUS_L1_DEACTIVATED:
-                                       PDEBUG(DEBUG_ISDN, "Received SSTATUS_L1_DEACTIVATED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
-                                       goto ss_deact;
-                                       case SSTATUS_L2_ESTABLISHED:
-                                       PDEBUG(DEBUG_ISDN, "Received SSTATUS_L2_ESTABLISHED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
-                                       goto ss_estab;
-                                       case SSTATUS_L2_RELEASED:
-                                       PDEBUG(DEBUG_ISDN, "Received SSTATUS_L2_RELEASED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
-                                       goto ss_rel;
-                               }
-                               break;
-
-                               case PH_ACTIVATE | CONFIRM:
-                               case PH_ACTIVATE | INDICATION:
-                               PDEBUG(DEBUG_ISDN, "Received PH_ACTIVATED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
-                               if (mISDNport->ntmode)
-                               {
-                                       mISDNport->l1link = 1;
-                                       setup_queue(mISDNport, 1);
-                                       goto l1_msg;
-                               }
-                               ss_act:
                                mISDNport->l1link = 1;
                                setup_queue(mISDNport, 1);
-                               break;
+                               goto l1_msg;
+                       }
+                       ss_act:
+                       mISDNport->l1link = 1;
+                       setup_queue(mISDNport, 1);
+                       break;
 
-                               case PH_DEACTIVATE | CONFIRM:
-                               case PH_DEACTIVATE | INDICATION:
-                               PDEBUG(DEBUG_ISDN, "Received PH_DEACTIVATED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
-                               if (mISDNport->ntmode)
-                               {
-                                       mISDNport->l1link = 0;
-                                       setup_queue(mISDNport, 0);
-                                       goto l1_msg;
-                               }
-                               ss_deact:
+                       case PH_DEACTIVATE | CONFIRM:
+                       case PH_DEACTIVATE | INDICATION:
+                       l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+                       end_trace();
+                       if (mISDNport->ntmode)
+                       {
                                mISDNport->l1link = 0;
                                setup_queue(mISDNport, 0);
-                               break;
-
-                               case PH_CONTROL | CONFIRM:
-                               case PH_CONTROL | INDICATION:
-                               PDEBUG(DEBUG_ISDN, "Received PH_CONTROL for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
-                               break;
+                               goto l1_msg;
+                       }
+                       ss_deact:
+                       mISDNport->l1link = 0;
+                       setup_queue(mISDNport, 0);
+                       break;
 
-                               case DL_ESTABLISH | INDICATION:
-                               case DL_ESTABLISH | CONFIRM:
-//                             PDEBUG(DEBUG_ISDN, "addr 0x%x established data link (DL) TE portnum=%d (DL_ESTABLISH)\n", frm->addr, mISDNport->portnum);
-                               if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
-                               ss_estab:
-//                             if (mISDNport->ntmode)
-//                                     break;
-                               if (mISDNport->l2establish)
-                               {
-                                       mISDNport->l2establish = 0;
-                                       PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n");
-                               }
-                               mISDNport->l2link = 1;
-                               break;
+                       case PH_CONTROL | CONFIRM:
+                       case PH_CONTROL | INDICATION:
+                       PDEBUG(DEBUG_ISDN, "Received PH_CONTROL for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
+                       break;
 
-                               case DL_RELEASE | INDICATION:
-                               case DL_RELEASE | CONFIRM:
-//                             PDEBUG(DEBUG_ISDN, "addr 0x%x released data link (DL) TE portnum=%d (DL_RELEASE)\n", frm->addr, mISDNport->portnum);
-                               if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
-                               ss_rel:
-//                             if (mISDNport->ntmode)
-//                                     break;
-                               mISDNport->l2link = 0;
-                               if (mISDNport->ptp)
-                               {
-                                       time(&mISDNport->l2establish);
-                                       PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
-                               }
-                               break;
+                       case DL_ESTABLISH | INDICATION:
+                       case DL_ESTABLISH | CONFIRM:
+                       l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+                       end_trace();
+                       if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
+                       ss_estab:
+                       if (mISDNport->l2establish)
+                       {
+                               mISDNport->l2establish = 0;
+                               PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n");
+                       }
+                       mISDNport->l2link = 1;
+                       break;
 
-                               default:
-                               l1_msg:
-                               PDEBUG(DEBUG_STACK, "GOT d-msg from %s port %d prim 0x%x dinfo 0x%x addr 0x%x\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, frm->prim, frm->dinfo, frm->addr);
-                               if (frm->dinfo==(signed long)0xffffffff && frm->prim==(PH_DATA|CONFIRM))
-                               {
-                                       PERROR("SERIOUS BUG, dinfo == 0xffffffff, prim == PH_DATA | CONFIRM !!!!\n");
-                               }
-                               /* d-message */
-                               if (mISDNport->ntmode)
-                               {
-                                       /* l1-data enters the nt-mode library */
-                                       nst = &mISDNport->nst;
-                                       if (nst->l1_l2(nst, msg))
-                                               free_msg(msg);
-                                       return(1);
-                               } else
-                               {
-                                       /* l3-data is sent to pbx */
-                                       if (stack2manager_te(mISDNport, msg))
-                                               free_msg(msg);
-                                       return(1);
-                               }
+                       case DL_RELEASE | INDICATION:
+                       case DL_RELEASE | CONFIRM:
+                       l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+                       end_trace();
+                       if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
+                       ss_rel:
+                       mISDNport->l2link = 0;
+                       if (mISDNport->ptp)
+                       {
+                               time(&mISDNport->l2establish);
+                               PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
                        }
                        break;
+
+                       default:
+                       l1_msg:
+                       PDEBUG(DEBUG_STACK, "GOT d-msg from %s port %d prim 0x%x dinfo 0x%x addr 0x%x\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, frm->prim, frm->dinfo, frm->addr);
+                       if (frm->dinfo==(signed long)0xffffffff && frm->prim==(PH_DATA|CONFIRM))
+                       {
+                               PERROR("SERIOUS BUG, dinfo == 0xffffffff, prim == PH_DATA | CONFIRM !!!!\n");
+                       }
+                       /* d-message */
+                       if (mISDNport->ntmode)
+                       {
+                               /* l1-data enters the nt-mode library */
+                               nst = &mISDNport->nst;
+                               if (nst->l1_l2(nst, msg))
+                                       free_msg(msg);
+                               return(1);
+                       } else
+                       {
+                               /* l3-data is sent to pbx */
+                               if (stack2manager_te(mISDNport, msg))
+                                       free_msg(msg);
+                               return(1);
+                       }
                }
-//PDEBUG(DEBUG_ISDN, "flg:%d upper_id=%x addr=%x\n", (frm->addr&FLG_CHILD_STACK), (mISDNport->b_addr[0])&(~IF_CHILDMASK), (frm->addr)&(~IF_CHILDMASK));
-               /* check if child, and if parent stack match */
-               if ((frm->addr&FLG_CHILD_STACK) && (((unsigned int)(mISDNport->b_addr[0])&(~CHILD_ID_MASK)&STACK_ID_MASK) == ((frm->addr)&(~CHILD_ID_MASK)&STACK_ID_MASK)))
+       } else
+       /* child stack */
+       {
+               /* b-message */
+               switch(frm->prim)
                {
-                       /* b-message */
-                       switch(frm->prim)
-                       {
-                               /* we don't care about confirms, we use rx data to sync tx */
-                               case PH_DATA | CONFIRM:
-                               case DL_DATA | CONFIRM:
-                               break;
+                       /* we don't care about confirms, we use rx data to sync tx */
+                       case PH_DATA | CONFIRM:
+                       case DL_DATA | CONFIRM:
+                       break;
 
-                               /* we receive audio data, we respond to it AND we send tones */
-                               case PH_DATA | INDICATION:
-                               case DL_DATA | INDICATION:
-                               case PH_CONTROL | INDICATION:
-                               i = 0;
-                               while(i < mISDNport->b_num)
-                               {
-                                       if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK))
-                                               break;
-                                       i++;
-                               }
-                               if (i == mISDNport->b_num)
-                               {
-                                       PERROR("unhandled b-message (address 0x%x).\n", frm->addr);
+                       /* we receive audio data, we respond to it AND we send tones */
+                       case PH_DATA | INDICATION:
+                       case DL_DATA | INDICATION:
+                       case PH_CONTROL | INDICATION:
+                       i = 0;
+                       while(i < mISDNport->b_num)
+                       {
+                               if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK))
                                        break;
-                               }
-                               if (mISDNport->b_port[i])
-                               {
-//PERROR("port sech: %s data\n", mISDNport->b_port[i]->p_name);
-                                       mISDNport->b_port[i]->bchannel_receive(frm);
-                               } else
-                                       PDEBUG(DEBUG_BCHANNEL, "b-channel is not associated to an ISDNPort (address 0x%x), ignoring.\n", frm->addr);
+                               i++;
+                       }
+                       if (i == mISDNport->b_num)
+                       {
+                               PERROR("unhandled b-message (prim 0x%x address 0x%x).\n", frm->prim, frm->addr);
                                break;
+                       }
+                       if (mISDNport->b_port[i])
+                       {
+//PERROR("port sech: %s data\n", mISDNport->b_port[i]->p_name);
+                               mISDNport->b_port[i]->bchannel_receive(frm);
+                       } else
+                               PDEBUG(DEBUG_BCHANNEL, "b-channel is not associated to an ISDNPort (address 0x%x), ignoring.\n", frm->addr);
+                       break;
 
-                               case PH_ACTIVATE | INDICATION:
-                               case DL_ESTABLISH | INDICATION:
-                               case PH_ACTIVATE | CONFIRM:
-                               case DL_ESTABLISH | CONFIRM:
-                               PDEBUG(DEBUG_BCHANNEL, "DL_ESTABLISH confirm: bchannel is now activated (address 0x%x).\n", frm->addr);
-                               i = 0;
-                               while(i < mISDNport->b_num)
-                               {
-                                       if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK))
-                                               break;
-                                       i++;
-                               }
-                               if (i == mISDNport->b_num)
-                               {
-                                       PERROR("unhandled b-establish (address 0x%x).\n", frm->addr);
+                       case PH_ACTIVATE | INDICATION:
+                       case DL_ESTABLISH | INDICATION:
+                       case PH_ACTIVATE | CONFIRM:
+                       case DL_ESTABLISH | CONFIRM:
+                       PDEBUG(DEBUG_BCHANNEL, "DL_ESTABLISH confirm: bchannel is now activated (address 0x%x).\n", frm->addr);
+                       i = 0;
+                       while(i < mISDNport->b_num)
+                       {
+                               if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK))
                                        break;
-                               }
-                               mISDNport->b_state[i] = B_STATE_ACTIVE;
-                               if (!mISDNport->b_port[i])
-                                       bchannel_deactivate(mISDNport, i);
-                               else
-                                       bchannel_activate(mISDNport, i);
+                               i++;
+                       }
+                       if (i == mISDNport->b_num)
+                       {
+                               PERROR("unhandled b-establish (prim 0x%x address 0x%x).\n", frm->prim, frm->addr);
                                break;
+                       }
+                       bchannel_event(mISDNport, i, B_EVENT_ACTIVATED);
+                       break;
 
-                               case PH_DEACTIVATE | INDICATION:
-                               case DL_RELEASE | INDICATION:
-                               case PH_DEACTIVATE | CONFIRM:
-                               case DL_RELEASE | CONFIRM:
-                               PDEBUG(DEBUG_BCHANNEL, "DL_RELEASE confirm: bchannel is now de-activated (address 0x%x).\n", frm->addr);
-                               i = 0;
-                               while(i < mISDNport->b_num)
-                               {
-                                       if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK))
-                                               break;
-                                       i++;
-                               }
-                               if (i == mISDNport->b_num)
-                               {
-                                       PERROR("unhandled b-release (address 0x%x).\n", frm->addr);
+                       case PH_DEACTIVATE | INDICATION:
+                       case DL_RELEASE | INDICATION:
+                       case PH_DEACTIVATE | CONFIRM:
+                       case DL_RELEASE | CONFIRM:
+                       PDEBUG(DEBUG_BCHANNEL, "DL_RELEASE confirm: bchannel is now de-activated (address 0x%x).\n", frm->addr);
+                       i = 0;
+                       while(i < mISDNport->b_num)
+                       {
+                               if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK))
                                        break;
-                               }
-                               mISDNport->b_state[i] = B_STATE_IDLE;
-                               if (mISDNport->b_port[i])
-                                       bchannel_activate(mISDNport, i);
-                               else
-                                       bchannel_deactivate(mISDNport, i);
+                               i++;
+                       }
+                       if (i == mISDNport->b_num)
+                       {
+                               PERROR("unhandled b-release (prim 0x%x address 0x%x).\n", frm->prim, frm->addr);
                                break;
                        }
+                       bchannel_event(mISDNport, i, B_EVENT_DEACTIVATED);
                        break;
-               }
 
-               mISDNport = mISDNport->next;
-       } 
-       if (!mISDNport)
-       {
-               if (frm->prim == (MGR_TIMER | INDICATION))
-                       PERROR("unhandled timer indication message: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len);
-               else
-                       PERROR("unhandled message: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len);
-//             PERROR("test: is_child: %x  of stack %x == %x (baddr %x frm %x)\n", (frm->addr&FLG_CHILD_STACK), ((unsigned int)(mISDNport_first->b_addr[0])&(~CHILD_ID_MASK)&STACK_ID_MASK), ((frm->addr)&(~CHILD_ID_MASK)&STACK_ID_MASK), mISDNport_first->b_addr[0], frm->addr);
+                       default:
+                       PERROR("child message not handled: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len);
+               }
        }
 
+       out:
        free_msg(msg);
        return(1);
 }
@@ -1444,66 +1852,41 @@ int mISDN_handler(void)
 /*
  * global function to add a new card (port)
  */
-struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp)
+struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, struct interface *interface)
 {
        int ret;
        unsigned char buff[1025];
        iframe_t *frm = (iframe_t *)buff;
-       stack_info_t *stinf;
        struct mISDNport *mISDNport, **mISDNportp;
        int i, cnt;
-       layer_info_t li;
+       int pri = 0;
+       int nt = 0;
+#ifdef SOCKET_MISDN
+//     struct mlayer3 *layer3;
+#else
 //     interface_info_t ii;
        net_stack_t *nst;
        manager_t *mgr;
-       mISDN_pid_t pid;
-       int pri = 0;
-       int nt = 0;
-       iframe_t dact;
-
-       /* open mISDNdevice if not already open */
-       if (mISDNdevice < 0)
-       {
-               ret = mISDN_open();
-               if (ret < 0)
-               {
-                       PERROR("cannot open mISDN device ret=%d errno=%d (%s) Check for mISDN modules!\nAlso did you create \"/dev/mISDN\"? Do: \"mknod /dev/mISDN c 46 0\"\n", ret, errno, strerror(errno));
-                       return(NULL);
-               }
-               mISDNdevice = ret;
-               PDEBUG(DEBUG_ISDN, "mISDN device opened.\n");
-
-               /* create entity for layer 3 TE-mode */
-               mISDN_write_frame(mISDNdevice, buff, 0, MGR_NEWENTITY | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
-               ret = mISDN_read_frame(mISDNdevice, frm, sizeof(iframe_t), 0, MGR_NEWENTITY | CONFIRM, TIMEOUT_1SEC);
-               if (ret < (int)mISDN_HEADER_LEN)
-               {
-                       noentity:
-                       fprintf(stderr, "cannot request MGR_NEWENTITY from mISDN. Exitting due to software bug.");
-                       exit(-1);
-               }
-               entity = frm->dinfo & 0xffff;
-               if (!entity)
-                       goto noentity;
-               PDEBUG(DEBUG_ISDN, "our entity for l3-processes is %d.\n", entity);
-       }
+       layer_info_t li;
+       stack_info_t *stinf;
+#endif
 
        /* query port's requirements */
        cnt = mISDN_get_stack_count(mISDNdevice);
        if (cnt <= 0)
        {
-               PERROR("Found no card. Please be sure to load card drivers.\n");
+               PERROR_RUNTIME("Found no card. Please be sure to load card drivers.\n");
                return(NULL);
        }
        if (port>cnt || port<1)
        {
-               PERROR("Port (%d) given at 'ports' (options.conf) is out of existing port range (%d-%d)\n", port, 1, cnt);
+               PERROR_RUNTIME("Port (%d) given at 'ports' (options.conf) is out of existing port range (%d-%d)\n", port, 1, cnt);
                return(NULL);
        }
        ret = mISDN_get_stack_info(mISDNdevice, port, buff, sizeof(buff));
        if (ret < 0)
        {
-               PERROR("Cannot get stack info for port %d (ret=%d)\n", port, ret);
+               PERROR_RUNTIME("Cannot get stack info for port %d (ret=%d)\n", port, ret);
                return(NULL);
        }
        stinf = (stack_info_t *)&frm->data.p;
@@ -1516,20 +1899,6 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp)
                PDEBUG(DEBUG_ISDN, "NT-mode BRI S/T interface port\n");
                nt = 1;
                break;
-               case ISDN_PID_L0_TE_U:
-               PDEBUG(DEBUG_ISDN, "TE-mode BRI U   interface line\n");
-               break;
-               case ISDN_PID_L0_NT_U:
-               PDEBUG(DEBUG_ISDN, "NT-mode BRI U   interface port\n");
-               nt = 1;
-               break;
-               case ISDN_PID_L0_TE_UP2:
-               PDEBUG(DEBUG_ISDN, "TE-mode BRI Up2 interface line\n");
-               break;
-               case ISDN_PID_L0_NT_UP2:
-               PDEBUG(DEBUG_ISDN, "NT-mode BRI Up2 interface port\n");
-               nt = 1;
-               break;
                case ISDN_PID_L0_TE_E1:
                PDEBUG(DEBUG_ISDN, "TE-mode PRI E1  interface line\n");
                pri = 1;
@@ -1540,7 +1909,7 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp)
                nt = 1;
                break;
                default:
-               PERROR("unknown port(%d) type 0x%08x\n", port, stinf->pid.protocol[0]);
+               PERROR_RUNTIME("unknown port(%d) type 0x%08x\n", port, stinf->pid.protocol[0]);
                return(NULL);
        }
        if (nt)
@@ -1548,12 +1917,12 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp)
                /* NT */
                if (stinf->pid.protocol[1] == 0)
                {
-                       PERROR("Given port %d: Missing layer 1 NT-mode protocol.\n", port);
+                       PERROR_RUNTIME("Given port %d: Missing layer 1 NT-mode protocol.\n", port);
                        return(NULL);
                }
                if (stinf->pid.protocol[2])
                {
-                       PERROR("Given port %d: Layer 2 protocol 0x%08x is detected, but not allowed for NT lib.\n", port, stinf->pid.protocol[2]);
+                       PERROR_RUNTIME("Given port %d: Layer 2 protocol 0x%08x is detected, but not allowed for NT lib.\n", port, stinf->pid.protocol[2]);
                        return(NULL);
                }
        } else
@@ -1561,17 +1930,17 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp)
                /* TE */
                if (stinf->pid.protocol[1] == 0)
                {
-                       PERROR("Given port %d: Missing layer 1 protocol.\n", port);
+                       PERROR_RUNTIME("Given port %d: Missing layer 1 protocol.\n", port);
                        return(NULL);
                }
                if (stinf->pid.protocol[2] == 0)
                {
-                       PERROR("Given port %d: Missing layer 2 protocol.\n", port);
+                       PERROR_RUNTIME("Given port %d: Missing layer 2 protocol.\n", port);
                        return(NULL);
                }
                if (stinf->pid.protocol[3] == 0)
                {
-                       PERROR("Given port %d: Missing layer 3 protocol.\n", port);
+                       PERROR_RUNTIME("Given port %d: Missing layer 3 protocol.\n", port);
                        return(NULL);
                } else
                {
@@ -1581,13 +1950,13 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp)
                                break;
 
                                default:
-                               PERROR("Given port %d: own protocol 0x%08x", port,stinf->pid.protocol[3]);
+                               PERROR_RUNTIME("Given port %d: own protocol 0x%08x", port,stinf->pid.protocol[3]);
                                return(NULL);
                        }
                }
                if (stinf->pid.protocol[4])
                {
-                       PERROR("Given port %d: Layer 4 protocol not allowed.\n", port);
+                       PERROR_RUNTIME("Given port %d: Layer 4 protocol not allowed.\n", port);
                        return(NULL);
                }
        }
@@ -1595,44 +1964,58 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp)
        /* add mISDNport structure */
        mISDNportp = &mISDNport_first;
        while(*mISDNportp)
-               mISDNportp = &mISDNport->next;
-       mISDNport = (struct mISDNport *)calloc(1, sizeof(struct mISDNport));
-       if (!mISDNport)
-       {
-               PERROR("Cannot alloc mISDNport structure\n");
-               return(NULL);
-       }
+               mISDNportp = &((*mISDNportp)->next);
+       mISDNport = (struct mISDNport *)MALLOC(sizeof(struct mISDNport));
        pmemuse++;
-       memset(mISDNport, 0, sizeof(mISDNport));
        *mISDNportp = mISDNport;
 
        /* allocate ressources of port */
+#ifdef SOCKET_MISDN
+       /* open layer 3 */
+       protocol = (nt)?L3_PROTOCOL_DSS1_USER:L3_PROTOCOL_DSS1_NETWORK;
+       prop = 0;
+       if (ptp)
+              prop |= FLG_PTP;
+       if (ptp)
+              prop |= FLG_FORCE_PTMP;
+       mISDNport->layer3 = open_layer3(port-1, protocol, prop , do_dchannel, mISDNport);
+       if (!mISDNport->layer3)
+       {
+               PERROR_RUNTIME("Cannot get layer(%d) id of port %d\n", nt?2:4, port);
+               return(NULL);
+       }
+
+#warning KKEIL: braucht man das noch?
+       /* if ntmode, establish L1 to send the tei removal during start */
+       if (mISDNport->ntmode)
+       {
+               iframe_t act;
+               /* L1 */
+               act.prim = PH_ACTIVATE | REQUEST; 
+               act.addr = mISDNport->upper_id | FLG_MSG_DOWN;
+               printf("UPPER ID 0x%x, addr 0x%x\n",mISDNport->upper_id, act.addr);
+               act.dinfo = 0;
+               act.len = 0;
+               mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
+               usleep(10000); /* to be sure, that l1 is up */
+       }
+
+#else
        msg_queue_init(&mISDNport->downqueue);
-//     SCPY(mISDNport->name, "noname");
-       mISDNport->portnum = port;
-       mISDNport->ntmode = nt;
-       mISDNport->pri = pri;
        mISDNport->d_stid = stinf->id;
        PDEBUG(DEBUG_ISDN, "d_stid = 0x%x.\n", mISDNport->d_stid);
-       mISDNport->b_num = stinf->childcnt;
-       PDEBUG(DEBUG_ISDN, "Port has %d b-channels.\n", mISDNport->b_num);
        if ((stinf->pid.protocol[2]&ISDN_PID_L2_DF_PTP) || (nt&&ptp) || pri)
        {
                PDEBUG(DEBUG_ISDN, "Port is point-to-point.\n");
-               mISDNport->ptp = ptp = 1;
+               ptp = 1;
                if (ptmp && nt)
                {
                        PDEBUG(DEBUG_ISDN, "Port is forced to point-to-multipoint.\n");
-                       mISDNport->ptp = ptp = 0;
+                       ptp = 0;
                }
        }
-       i = 0;
-       while(i < stinf->childcnt)
-       {
-               mISDNport->b_stid[i] = stinf->child[i];
-               PDEBUG(DEBUG_ISDN, "b_stid[%d] = 0x%x.\n", i, mISDNport->b_stid[i]);
-               i++;
-       }
+
+       /* create layer intance */
        memset(&li, 0, sizeof(li));
        UCPY(&li.name[0], (nt)?"net l2":"pbx l4");
        li.object_id = -1;
@@ -1720,6 +2103,23 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp)
                Isdnl3Init(nst);
        }
 
+#endif
+//     SCPY(mISDNport->name, "noname");
+       mISDNport->portnum = port;
+       mISDNport->ntmode = nt;
+       mISDNport->pri = pri;
+       mISDNport->ptp = ptp;
+       mISDNport->b_num = stinf->childcnt;
+       PDEBUG(DEBUG_ISDN, "Port has %d b-channels.\n", mISDNport->b_num);
+       i = 0;
+       while(i < stinf->childcnt)
+       {
+               mISDNport->b_stid[i] = stinf->child[i];
+               mISDNport->b_state[i] = B_STATE_IDLE;
+               PDEBUG(DEBUG_ISDN, "b_stid[%d] = 0x%x.\n", i, mISDNport->b_stid[i]);
+               i++;
+       }
+
        /* if te-mode, query state link */
        if (!mISDNport->ntmode)
        {
@@ -1757,70 +2157,16 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp)
 
        PDEBUG(DEBUG_BCHANNEL, "using 'mISDN_dsp.o' module\n");
 
-       /* add all bchannel layers */
-       i = 0;
-       while(i < mISDNport->b_num)
-       {
-               /* create new layer */
-               PDEBUG(DEBUG_BCHANNEL, "creating bchannel %d (index %d).\n" , i+1+(i>=15), i);
-               memset(&li, 0, sizeof(li));
-               memset(&pid, 0, sizeof(pid));
-               li.object_id = -1;
-               li.extentions = 0;
-               li.st = mISDNport->b_stid[i];
-               UCPY(li.name, "B L4");
-               li.pid.layermask = ISDN_LAYER((4));
-               li.pid.protocol[4] = ISDN_PID_L4_B_USER;
-               ret = mISDN_new_layer(mISDNdevice, &li);
-               if (ret)
-               {
-                       failed_new_layer:
-                       PERROR("mISDN_new_layer() failed to add bchannel %d (index %d)\n", i+1+(i>=15), i);
-                       goto closeport;
-               }
-               mISDNport->b_addr[i] = li.id;
-               if (!li.id)
-               {
-                       goto failed_new_layer;
-               }
-               PDEBUG(DEBUG_BCHANNEL, "new layer (b_addr=0x%x)\n", mISDNport->b_addr[i]);
-
-               /* create new stack */
-               pid.protocol[1] = ISDN_PID_L1_B_64TRANS;
-               pid.protocol[2] = ISDN_PID_L2_B_TRANS;
-               pid.protocol[3] = ISDN_PID_L3_B_DSP;
-               pid.protocol[4] = ISDN_PID_L4_B_USER;
-               pid.layermask = ISDN_LAYER((1)) | ISDN_LAYER((2)) | ISDN_LAYER((3)) | ISDN_LAYER((4));
-               ret = mISDN_set_stack(mISDNdevice, mISDNport->b_stid[i], &pid);
-               if (ret)
-               {
-                       stack_error:
-                       PERROR("mISDN_set_stack() failed (ret=%d) to add bchannel (index %d) stid=0x%x\n", ret, i, mISDNport->b_stid[i]);
-                       mISDN_write_frame(mISDNdevice, buff, mISDNport->b_addr[i], MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
-                       mISDNport->b_addr[i] = 0;
-//                     mISDNport->b_addr_low[i] = 0;
-                       goto closeport;
-               }
-               ret = mISDN_get_setstack_ind(mISDNdevice, mISDNport->b_addr[i]);
-               if (ret)
-                       goto stack_error;
-
-               /* get layer id */
-               mISDNport->b_addr[i] = mISDN_get_layerid(mISDNdevice, mISDNport->b_stid[i], 4);
-               if (!mISDNport->b_addr[i])
-                       goto stack_error;
-               /* deactivate bchannel if already enabled due to crash */
-               PDEBUG(DEBUG_BCHANNEL, "deactivating bchannel (index %d) as a precaution.\n", i);
-               dact.prim = DL_RELEASE | REQUEST; 
-               dact.addr = mISDNport->b_addr[i] | FLG_MSG_DOWN;
-               dact.dinfo = 0;
-               dact.len = 0;
-               mISDN_write(mISDNdevice, &dact, mISDN_HEADER_LEN+dact.len, TIMEOUT_1SEC);
-
-               i++;
-       }
-       PDEBUG(DEBUG_ISDN, "- port %d %s (%s) %d b-channels\n", mISDNport->portnum, (mISDNport->ntmode)?"NT-mode":"TE-mode", (mISDNport->ptp)?"Point-To-Point":"Multipoint", mISDNport->b_num);
-       printlog("opening port %d %s (%s) %d b-channels\n", mISDNport->portnum, (mISDNport->ntmode)?"NT-mode":"TE-mode", (mISDNport->ptp)?"Point-To-Point":"Multipoint", mISDNport->b_num);
+       start_trace(mISDNport->portnum,
+                   interface,
+                   NULL,
+                   NULL,
+                   DIRECTION_NONE,
+                   CATEGORY_CH,
+                   0,
+                   "PORT (open)");
+       add_trace("channels", NULL, "%d", mISDNport->b_num);
+       end_trace();
        return(mISDNport);
 }
 
@@ -1842,7 +2188,7 @@ void mISDNport_close(struct mISDNport *mISDNport)
 {
        struct mISDNport **mISDNportp;
        class Port *port;
-       classs PmISDN *pmISDN;
+       class PmISDN *isdnport;
        net_stack_t *nst;
        unsigned char buf[32];
        int i;
@@ -1853,29 +2199,38 @@ void mISDNport_close(struct mISDNport *mISDNport)
        {
                if ((port->p_type&PORT_CLASS_MASK) == PORT_CLASS_mISDN)
                {
-                       pmISDN = (class PmISDN)*port;
-                       if (pmISDN->p_m_mISDNport)
+                       isdnport = (class PmISDN *)port;
+                       if (isdnport->p_m_mISDNport)
                        {
-                               PDEBUG(DEBUG_ISDN, "port %s uses mISDNport %d, destroying it.\n", pnISDN->p_name, mISDNport->portnum);
-                               delete pmISDN;
+                               PDEBUG(DEBUG_ISDN, "port %s uses mISDNport %d, destroying it.\n", isdnport->p_name, mISDNport->portnum);
+                               delete isdnport;
                        }
                }
                port = port->next;
        }
 
-       printlog("closing port %d\n", mISDNport->portnum);
+       /* only if we are already part of interface */
+       if (mISDNport->ifport)
+       {
+               start_trace(mISDNport->portnum,
+                           mISDNport->ifport->interface,
+                           NULL,
+                           NULL,
+                           DIRECTION_NONE,
+                           CATEGORY_CH,
+                           0,
+                           "PORT (close)");
+               end_trace();
+       }
 
        /* free bchannels */
        i = 0;
        while(i < mISDNport->b_num)
        {
-               bchannel_deactivate(mISDNport, i);
-               PDEBUG(DEBUG_BCHANNEL, "freeing %s port %d bchannel (index %d).\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, i);
-               if (mISDNport->b_stid[i])
+               if (mISDNport->b_addr[i])
                {
-                       mISDN_clear_stack(mISDNdevice, mISDNport->b_stid[i]);
-                       if (mISDNport->b_addr[i])
-                               mISDN_write_frame(mISDNdevice, buf, mISDNport->b_addr[i] | FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+                       _bchannel_destroy(mISDNport, i);
+                       PDEBUG(DEBUG_BCHANNEL, "freeing %s port %d bchannel (index %d).\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, i);
                }
                i++;
        }
@@ -1896,16 +2251,15 @@ void mISDNport_close(struct mISDNport *mISDNport)
                        /* phd */
                        msg_queue_purge(&nst->down_queue);
                        if (nst->phd_down_msg)
-                               free(nst->phd_down_msg);
+                               FREE(nst->phd_down_msg, 0);
                }
        }
 
        PDEBUG(DEBUG_BCHANNEL, "freeing d-stack.\n");
        if (mISDNport->d_stid)
        {
-//             mISDN_clear_stack(mISDNdevice, mISDNport->d_stid);
-               if (mISDNport->lower_id)
-                       mISDN_write_frame(mISDNdevice, buf, mISDNport->lower_id, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+               if (mISDNport->upper_id)
+                       mISDN_write_frame(mISDNdevice, buf, mISDNport->upper_id | FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
        }
 
        /* remove from list */
@@ -1915,31 +2269,18 @@ void mISDNport_close(struct mISDNport *mISDNport)
                if (*mISDNportp == mISDNport)
                {
                        *mISDNportp = (*mISDNportp)->next;
+                       mISDNportp = NULL;
                        break;
                }
                mISDNportp = &((*mISDNportp)->next);
        }
 
-       if (!(*mISDNportp))
-       {
-               PERROR("software error, mISDNport not in list\n");
-               exit(-1);
-       }
+       if (mISDNportp)
+               FATAL("mISDNport not in list\n");
        
-       memset(mISDNport, 0, sizeof(struct mISDNport));
-       free(mISDNport);
+       FREE(mISDNport, sizeof(struct mISDNport));
        pmemuse--;
 
-       /* close mISDNdevice, if no port */
-       if (mISDNdevice>=0 && mISDNport_first==NULL)
-       {
-               /* free entity */
-               mISDN_write_frame(mISDNdevice, buf, 0, MGR_DELENTITY | REQUEST, entity, 0, NULL, TIMEOUT_1SEC);
-               /* close device */
-               mISDN_close(mISDNdevice);
-               mISDNdevice = -1;
-               PDEBUG(DEBUG_ISDN, "mISDN device closed.\n");
-       }
 }
 
 
@@ -1960,7 +2301,7 @@ void mISDN_port_info(void)
        if ((device = mISDN_open()) < 0)
        {
                fprintf(stderr, "cannot open mISDN device ret=%d errno=%d (%s) Check for mISDN modules!\nAlso did you create \"/dev/mISDN\"? Do: \"mknod /dev/mISDN c 46 0\"\n", device, errno, strerror(errno));
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        /* get number of stacks */
@@ -2005,20 +2346,6 @@ void mISDN_port_info(void)
                                printf(" HFC multiport card");
 #endif
                        break;
-                       case ISDN_PID_L0_TE_U:
-                       printf("TE-mode BRI U   interface line");
-                       break;
-                       case ISDN_PID_L0_NT_U:
-                       nt = 1;
-                       printf("NT-mode BRI U   interface port");
-                       break;
-                       case ISDN_PID_L0_TE_UP2:
-                       printf("TE-mode BRI Up2 interface line");
-                       break;
-                       case ISDN_PID_L0_NT_UP2:
-                       nt = 1;
-                       printf("NT-mode BRI Up2 interface port");
-                       break;
                        case ISDN_PID_L0_TE_E1:
                        pri = 1;
                        printf("TE-mode PRI E1  interface line (for phone lines)");
@@ -2054,7 +2381,7 @@ void mISDN_port_info(void)
                                if (stinf->pid.protocol[p])
                                {
                                        useable = 0;
-                                       printf(" -> Layer %d protocol 0x%08x is detected, but not allowed for NT lib.\n", p, stinf->pid.protocol[p]);
+                                       printf(" -> Layer %d protocol 0x%08x is detected, port already in use by another application.\n", p, stinf->pid.protocol[p]);
                                }
                                p++;
                        }
@@ -2105,7 +2432,7 @@ void mISDN_port_info(void)
                                if (stinf->pid.protocol[p])
                                {
                                        useable = 0;
-                                       printf(" -> Layer %d protocol 0x%08x is detected, but not allowed for TE lib.\n", p, stinf->pid.protocol[p]);
+                                       printf(" -> Layer %d protocol 0x%08x is detected, port already in use by another application.\n", p, stinf->pid.protocol[p]);
                                }
                                p++;
                        }
@@ -2113,7 +2440,7 @@ void mISDN_port_info(void)
                printf("  - %d B-channels\n", stinf->childcnt);
 
                if (!useable)
-                       printf(" * Port NOT useable for PBX\n");
+                       printf(" * Port NOT useable for LCR\n");
 
                printf("--------\n");
 
@@ -2123,10 +2450,53 @@ void mISDN_port_info(void)
 
        /* close mISDN */
        if ((err = mISDN_close(device)))
+               FATAL("mISDN_close() failed: err=%d '%s'\n", err, strerror(err));
+}
+
+
+/*
+ * enque data from upper buffer
+ */
+void PmISDN::txfromup(unsigned char *data, int length)
+{
+       unsigned char buf[mISDN_HEADER_LEN+((length>ISDN_LOAD)?length:ISDN_LOAD)];
+       iframe_t *frm = (iframe_t *)buf;
+
+       /* configure frame */
+       frm->prim = DL_DATA | REQUEST; 
+       frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN;
+       frm->dinfo = 0;
+
+       /* check if high priority tones exist
+        * ignore data in this case
+        */
+       if (p_tone_name[0] || p_m_crypt_msg_loops)
+               return;
+
+       /* preload procedure
+        * if transmit buffer in DSP module is empty,
+        * preload it to DSP_LOAD to prevent jitter gaps.
+        */
+       if (p_m_load==0 && ISDN_LOAD>0)
        {
-               fprintf(stderr, "mISDN_close() failed: err=%d '%s'\n", err, strerror(err));
-               exit(-1);
+
+               memcpy(buf+mISDN_HEADER_LEN, data, ISDN_LOAD);
+               frm->len = ISDN_LOAD;
+               mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC);
+               p_m_load += frm->len;
        }
-}
 
+       /* drop if load would exceed ISDN_MAXLOAD
+        * this keeps the delay not too high
+        */
+       if (p_m_load+length > ISDN_MAXLOAD)
+               return;
+
+       /* load data to buffer
+        */
+       memcpy(buf+mISDN_HEADER_LEN, data, length);
+       frm->len = length;
+       mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC);
+       p_m_load += frm->len;
+}