fixed partyline-conference handling
[lcr.git] / mISDN.cpp
index eab914a..9d3cfa0 100644 (file)
--- a/mISDN.cpp
+++ b/mISDN.cpp
 \*****************************************************************************/ 
 
 
-#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>
 }
-
-#if 0
-#ifndef ISDN_PID_L2_B_USER
-#define ISDN_PID_L2_B_USER 0x420000ff
-#endif
-#ifndef ISDN_PID_L3_B_USER
-#define ISDN_PID_L3_B_USER 0x430000ff
-#endif
 #endif
+
 #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(PF_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);
 
-/* list of mISDN ports */
-struct mISDNport *mISDNport_first;
+       init_layer3(4); // buffer of 4
+
+       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
@@ -74,6 +159,8 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti
        p_m_dtmf = !mISDNport->ifport->nodtmf;
        p_m_timeout = 0;
        p_m_timer = 0;
+       p_m_remote_ref = 0; /* channel shall be exported to given remote */
+       p_m_remote_id = 0; /* channel shall be exported to given remote */
 
        /* audio */
        p_m_load = 0;
@@ -387,7 +474,7 @@ failed:
 
 /*
  * subfunction for bchannel_event
- * activate request
+ * activate / deactivate request
  */
 static void _bchannel_activate(struct mISDNport *mISDNport, int i, int activate)
 {
@@ -497,23 +584,58 @@ It may be linked to a Port class, that likes to reactivate it.
 See above.
 After deactivating bchannel, and if not used, the bchannel becomes idle again.
 
+Also the bchannel may be exported, but only if the state is or becomes idle:
+
+- B_STATE_EXPORTING
+The bchannel assignment has been sent to the remove application.
+
+- B_STATE_REMOTE
+The bchannel assignment is acknowledged by the remote application.
+
+- B_STATE_IMPORTING
+The bchannel is re-imported by mISDN port object.
+
+- B_STATE_IDLE
+See above.
+After re-importing bchannel, and if not used, the bchannel becomes idle again.
+
 
 A bchannel can have the following events:
 
-- B_EVENT_ACTIVATE
+- B_EVENT_USE
 A bchannel is required by a Port class.
+The bchannel shall be exported to the remote application.
 
 - B_EVENT_ACTIVATED
 The bchannel beomes active.
 
-- B_EVENT_DEACTIVATE
+- B_EVENT_DROP
 The bchannel is not required by Port class anymore
 
 - B_EVENT_DEACTIVATED
 The bchannel becomes inactive.
 
+- B_EVENT_EXPORTED
+The bchannel is now used by remote application.
+
+- B_EVENT_IMPORTED
+The bchannel is not used by remote application.
+
 All actions taken on these events depend on the current bchannel's state and if it is linked to a Port class.
 
+if an export request is receive by remote application, p_m_remote_* is set.
+the b_remote_*[index] indicates if and where the channel is exported to. (set from the point on, where export is initiated, until imported is acknowledged.)
+- set on export request from remote application (if port is assigned)
+- set on channel use, if requested by remote application (p_m_remote_*)
+- cleared on drop request
+
+the bchannel will be exported with ref and stack given. remote application uses the ref to link bchannel to the call.
+the bchannel will be imported with stack given only. remote application must store stack id with the bchannel process.
+the bchannel import/export is acknowledged with stack given.
+
+if exporting, b_remote_*[index] is set to the remote socket id.
+if importing has been acknowledged. b_remote_*[index] is cleared.
+
 */
 
 /*
@@ -525,34 +647,112 @@ All actions taken on these events depend on the current bchannel's state and if
  */
 void bchannel_event(struct mISDNport *mISDNport, int i, int event)
 {
+       class PmISDN *b_port = mISDNport->b_port[i];
        int state = mISDNport->b_state[i];
+       unsigned long p_m_remote_ref = 0;
+       unsigned long p_m_remote_id = 0;
+       unsigned long addr = mISDNport->b_addr[i];
+
+       if (b_port)
+       {
+               p_m_remote_id = b_port->p_m_remote_id;
+               p_m_remote_ref = b_port->p_m_remote_ref;
+       }
 
        switch(event)
        {
-               case B_EVENT_ACTIVATE:
+               case B_EVENT_USE:
                /* port must be linked in order to allow activation */
-               if (!mISDNport->b_port[i])
+               if (!b_port)
                        FATAL("bchannel must be linked to a Port class\n");
                switch(state)
                {
                        case B_STATE_IDLE:
-                       /* create stack and send activation request */
-                       if (_bchannel_create(mISDNport, i))
+                       if (p_m_remote_ref)
                        {
-                               _bchannel_activate(mISDNport, i, 1);
-                               state = B_STATE_ACTIVATING;
+                               /* export bchannel */
+                               message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, addr);
+                               chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
+                               add_trace("type", NULL, "assign");
+                               add_trace("stack", "address", "%x", addr);
+                               end_trace();
+                               state = B_STATE_EXPORTING;
+                               mISDNport->b_remote_id[i] = p_m_remote_id;
+                               mISDNport->b_remote_ref[i] = p_m_remote_ref;
+                       } else
+                       {
+                               /* create stack and send activation request */
+                               if (_bchannel_create(mISDNport, i))
+                               {
+                                       _bchannel_activate(mISDNport, i, 1);
+                                       state = B_STATE_ACTIVATING;
+                               }
                        }
                        break;
 
                        case B_STATE_ACTIVATING:
+                       case B_STATE_EXPORTING:
+                       /* do nothing, because it is already activating */
+                       break;
+
+                       case B_STATE_DEACTIVATING:
+                       case B_STATE_IMPORTING:
+                       /* do nothing, because we must wait until we can reactivate */
+                       break;
+
+                       default:
+                       /* problems that might ocurr:
+                        * B_EVENT_USE is received when channel already in use.
+                        * bchannel exported, but not freed by other port
+                        */
+                       PERROR("Illegal event %d at state %d, please correct.\n", event, state);
+               }
+               break;
+
+               case B_EVENT_EXPORTREQUEST:
+               /* special case where the bchannel is requested by remote */
+               if (!p_m_remote_ref)
+               {
+                       PERROR("export request without remote channel set, please correct.\n");
+                       break;
+               }
+               switch(state)
+               {
+                       case B_STATE_IDLE:
+                       /* in case, the bchannel is exported right after seize_bchannel */
+                       /* export bchannel */
+                       /* p_m_remote_id is set, when this event happens. */
+                       message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, addr);
+                       chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
+                       add_trace("type", NULL, "assign");
+                       add_trace("stack", "address", "%x", addr);
+                       end_trace();
+                       state = B_STATE_EXPORTING;
+                       mISDNport->b_remote_id[i] = p_m_remote_id;
+                       mISDNport->b_remote_ref[i] = p_m_remote_ref;
+                       break;
+
+                       case B_STATE_ACTIVATING:
+                       case B_STATE_EXPORTING:
                        /* do nothing, because it is already activating */
                        break;
 
                        case B_STATE_DEACTIVATING:
+                       case B_STATE_IMPORTING:
                        /* do nothing, because we must wait until we can reactivate */
                        break;
 
+                       case B_STATE_ACTIVE:
+                       /* bchannel is active, so we deactivate */
+                       _bchannel_activate(mISDNport, i, 0);
+                       state = B_STATE_DEACTIVATING;
+                       break;
+
                        default:
+                       /* problems that might ocurr:
+                        * ... when channel already in use.
+                        * bchannel exported, but not freed by other port
+                        */
                        PERROR("Illegal event %d at state %d, please correct.\n", event, state);
                }
                break;
@@ -561,14 +761,14 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
                switch(state)
                {
                        case B_STATE_ACTIVATING:
-                       if (mISDNport->b_port[i])
+                       if (b_port && !p_m_remote_id)
                        {
                                /* bchannel is active and used by Port class, so we configure bchannel */
                                _bchannel_configure(mISDNport, i);
                                state = B_STATE_ACTIVE;
                        } else
                        {
-                               /* bchannel is active, but not used anymore (or has wrong stack config), so we deactivate */
+                               /* bchannel is active, but exported OR not used anymore (or has wrong stack config), so we deactivate */
                                _bchannel_activate(mISDNport, i, 0);
                                state = B_STATE_DEACTIVATING;
                        }
@@ -579,8 +779,36 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
                }
                break;
 
-               case B_EVENT_DEACTIVATE:
-               if (!mISDNport->b_port[i])
+               case B_EVENT_EXPORTED:
+               switch(state)
+               {
+                       case B_STATE_EXPORTING:
+                       if (b_port && p_m_remote_ref && p_m_remote_ref==mISDNport->b_remote_ref[i])
+                       {
+                               /* remote export done */
+                               state = B_STATE_REMOTE;
+                       } else
+                       {
+                               /* bchannel is now exported, but we need bchannel back
+                                * OR bchannel is not used anymore
+                                * OR bchannel has been exported to an obsolete ref,
+                                * so reimport, to later export to new remote */
+                               message_bchannel_to_join(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, addr);
+                               chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
+                               add_trace("type", NULL, "remove");
+                               add_trace("stack", "address", "%x", addr);
+                               end_trace();
+                               state = B_STATE_IMPORTING;
+                       }
+                       break;
+
+                       default:
+                       PERROR("Illegal event %d at state %d, please correct.\n", event, state);
+               }
+               break;
+
+               case B_EVENT_DROP:
+               if (!b_port)
                        FATAL("bchannel must be linked to a Port class\n");
                switch(state)
                {
@@ -589,6 +817,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
                        break;
 
                        case B_STATE_ACTIVATING:
+                       case B_STATE_EXPORTING:
                        /* do nothing because we must wait until bchanenl is active before deactivating */
                        break;
 
@@ -598,7 +827,18 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
                        state = B_STATE_DEACTIVATING;
                        break;
 
+                       case B_STATE_REMOTE:
+                       /* bchannel is exported, so we re-import */
+                       message_bchannel_to_join(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, addr);
+                       chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
+                       add_trace("type", NULL, "remove");
+                       add_trace("stack", "address", "%x", addr);
+                       end_trace();
+                       state = B_STATE_IMPORTING;
+                       break;
+
                        case B_STATE_DEACTIVATING:
+                       case B_STATE_IMPORTING:
                        /* we may have taken an already deactivating bchannel, but do not require it anymore, so we do nothing */
                        break;
 
@@ -617,13 +857,26 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
                        case B_STATE_DEACTIVATING:
                        _bchannel_destroy(mISDNport, i);
                        state = B_STATE_IDLE;
-                       if (mISDNport->b_port[i])
+                       if (b_port)
                        {
-                               /* bchannel is now deactivate, but is requied by Port class, so we reactivate */
-                               if (_bchannel_create(mISDNport, i))
+                               /* bchannel is now deactivate, but is requied by Port class, so we reactivate / export */
+                               if (p_m_remote_ref)
                                {
-                                       _bchannel_activate(mISDNport, i, 1);
-                                       state = B_STATE_ACTIVATING;
+                                       message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, addr);
+                                       chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
+                                       add_trace("type", NULL, "assign");
+                                       add_trace("stack", "address", "%x", addr);
+                                       end_trace();
+                                       state = B_STATE_EXPORTING;
+                                       mISDNport->b_remote_id[i] = p_m_remote_id;
+                                       mISDNport->b_remote_ref[i] = p_m_remote_ref;
+                               } else
+                               {
+                                       if (_bchannel_create(mISDNport, i))
+                                       {
+                                               _bchannel_activate(mISDNport, i, 1);
+                                               state = B_STATE_ACTIVATING;
+                                       }
                                }
                        }
                        break;
@@ -633,6 +886,43 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
                }
                break;
 
+               case B_EVENT_IMPORTED:
+               switch(state)
+               {
+                       case B_STATE_IMPORTING:
+                       state = B_STATE_IDLE;
+                       mISDNport->b_remote_id[i] = 0;
+                       mISDNport->b_remote_ref[i] = 0;
+                       if (b_port)
+                       {
+                               /* bchannel is now imported, but is requied by Port class, so we reactivate / export */
+                               if (p_m_remote_ref)
+                               {
+                                       message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, addr);
+                                       chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
+                                       add_trace("type", NULL, "assign");
+                                       add_trace("stack", "address", "%x", addr);
+                                       end_trace();
+                                       state = B_STATE_EXPORTING;
+                                       mISDNport->b_remote_id[i] = p_m_remote_id;
+                                       mISDNport->b_remote_ref[i] = p_m_remote_ref;
+                               } else
+                               {
+                                       if (_bchannel_create(mISDNport, i))
+                                       {
+                                               _bchannel_activate(mISDNport, i, 1);
+                                               state = B_STATE_ACTIVATING;
+                                       }
+                               }
+                       }
+                       break;
+
+                       default:
+                       /* ignore, because not assigned */
+                       ;
+               }
+               break;
+
                default:
                PERROR("Illegal event %d, please correct.\n", event);
        }
@@ -742,13 +1032,107 @@ 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);
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_DROP);
        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;
 }
 
+/* process bchannel export/import message from join */
+void message_bchannel_from_join(class JoinRemote *joinremote, int type, unsigned long addr)
+{
+       class Endpoint *epoint;
+       class Port *port;
+       class PmISDN *isdnport;
+       struct mISDNport *mISDNport;
+       int i, ii;
+
+       switch(type)
+       {
+               case BCHANNEL_REQUEST:
+               /* find the port object for the join object ref */
+               if (!(epoint = find_epoint_id(joinremote->j_epoint_id)))
+               {
+                       PDEBUG(DEBUG_BCHANNEL, "join %d has no endpoint (anymore)\n", joinremote->j_serial);
+                       return;
+               }
+               if (!epoint->ep_portlist)
+               {
+                       PDEBUG(DEBUG_BCHANNEL, "join %d has no port (anymore in portlist)\n", joinremote->j_serial);
+                       return;
+               }
+               if (epoint->ep_portlist->next)
+               {
+                       PERROR("join %d has enpoint %d with more than one port. this shall not happen to remote joins.\n", joinremote->j_serial, epoint->ep_serial);
+               }
+               if (!(port = find_port_id(epoint->ep_portlist->port_id)))
+               {
+                       PDEBUG(DEBUG_BCHANNEL, "join %d has no port (anymore as object)\n", joinremote->j_serial);
+                       return;
+               }
+               if (!((port->p_type&PORT_CLASS_MASK) != PORT_CLASS_mISDN))
+               {
+                       PERROR("join %d has port %d not of mISDN type. This shall not happen.\n", joinremote->j_serial, port->p_serial);
+               }
+               isdnport = (class PmISDN *)port;
+
+               /* assign */
+               if (isdnport->p_m_remote_id)
+               {
+                       PERROR("join %d recevied bchannel request from remote, but channel is already assinged.\n", joinremote->j_serial);
+                       break;
+               }
+               mISDNport = isdnport->p_m_mISDNport;
+               i = isdnport->p_m_b_index;
+               chan_trace_header(mISDNport, isdnport, "MESSAGE_BCHANNEL (from remote application)", DIRECTION_NONE);
+               add_trace("type", NULL, "export request");
+               isdnport->p_m_remote_ref = joinremote->j_serial;
+               isdnport->p_m_remote_id = joinremote->j_remote_id;
+               if (mISDNport && i>=0)
+               {
+                       bchannel_event(mISDNport, i, B_EVENT_EXPORTREQUEST);
+               }
+               end_trace();
+               break;
+
+               case BCHANNEL_ASSIGN_ACK:
+               case BCHANNEL_REMOVE_ACK:
+               /* find mISDNport for stack ID */
+               mISDNport = mISDNport_first;
+               while(mISDNport)
+               {
+                       i = 0;
+                       ii = mISDNport->b_num;
+                       while(i < ii)
+                       {
+                               if (mISDNport->b_addr[i] == addr)
+                                       break;
+                               i++;
+                       }
+                       if (i != ii)
+                               break;
+                       mISDNport = mISDNport->next;
+               }
+               if (!mISDNport)
+               {
+                       PERROR("received assign/remove ack for addr=%x, but address does not exist.\n", addr);
+                       break;
+               }
+               /* mISDNport may now be set or NULL */
+               
+               /* set */
+               chan_trace_header(mISDNport, mISDNport->b_port[i], "MESSAGE_BCHANNEL (from remote application)", DIRECTION_NONE);
+               add_trace("type", NULL, (type==BCHANNEL_ASSIGN_ACK)?"assign_ack":"remove_ack");
+               if (mISDNport && i>=0)
+                       bchannel_event(mISDNport, i, (type==BCHANNEL_ASSIGN_ACK)?B_EVENT_EXPORTED:B_EVENT_IMPORTED);
+               end_trace();
+               break;
+               default:
+               PERROR("received wrong bchannel message type %d from remote\n", type);
+       }
+}
+
 
 /*
  * handler
@@ -1772,58 +2156,36 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, struct interface *
        int ret;
        unsigned char buff[1025];
        iframe_t *frm = (iframe_t *)buff;
-       stack_info_t *stinf;
        struct mISDNport *mISDNport, **mISDNportp;
        int i, cnt;
+       int pri = 0;
+       int nt = 0;
+#ifdef SOCKET_MISDN
+//     struct mlayer3 *layer3;
+#else
 //     interface_info_t ii;
        net_stack_t *nst;
        manager_t *mgr;
        layer_info_t li;
-       int pri = 0;
-       int nt = 0;
-
-       /* 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:
-                       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);
-       }
+       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;
@@ -1846,7 +2208,7 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, struct interface *
                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)
@@ -1854,12 +2216,12 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, struct interface *
                /* 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
@@ -1867,17 +2229,17 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, struct interface *
                /* 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
                {
@@ -1887,13 +2249,13 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, struct interface *
                                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);
                }
        }
@@ -1907,33 +2269,52 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, struct interface *
        *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];
-               mISDNport->b_state[i] = B_STATE_IDLE;
-               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;
@@ -2021,6 +2402,23 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, struct interface *
                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)
        {
@@ -2182,16 +2580,6 @@ void mISDNport_close(struct mISDNport *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");
-       }
 }