Add -lncurses to LDD flags
[lcr.git] / dss1.cpp
index cbb622d..43452bb 100644 (file)
--- a/dss1.cpp
+++ b/dss1.cpp
@@ -1,6 +1,6 @@
 /*****************************************************************************\
 **                                                                           **
-** PBX4Linux                                                                 **
+** LCR                                                                       **
 **                                                                           **
 **---------------------------------------------------------------------------**
 ** Copyright: Andreas Eversberg                                              **
@@ -9,43 +9,40 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-
-#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>
+#include "myisdn.h"
+// socket mISDN
+//#include <sys/socket.h>
 extern "C" {
-#include <net_l2.h>
 }
+#include <mISDN/q931.h>
+#include <mISDN/suppserv.h>
+#ifdef OLD_MT_ASSIGN
+extern unsigned int mt_assign_pid;
+#endif
 
-//#define CENTREX
-
-#include "q931.h"
 #include "ie.cpp"
 
+static int delete_event(struct lcr_work *work, void *instance, int index);
 
 /*
  * constructor
  */
-Pdss1::Pdss1(int type, mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive) : PmISDN(type, mISDNport, portname, settings, channel, exclusive)
+Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, struct interface *interface, int channel, int exclusive, int mode) : PmISDN(type, mISDNport, portname, settings, interface, channel, exclusive, mode)
 {
-       p_callerinfo.itype = (mISDNport->ifport->interface->extension)?INFO_ITYPE_ISDN:INFO_ITYPE_ISDN_EXTENSION;
+       p_callerinfo.itype = (mISDNport->ifport->interface->extension)?INFO_ITYPE_ISDN_EXTENSION:INFO_ITYPE_ISDN;
        p_m_d_ntmode = mISDNport->ntmode;
+       p_m_d_tespecial = mISDNport->tespecial;
        p_m_d_l3id = 0;
+       memset(&p_m_d_delete, 0, sizeof(p_m_d_delete));
+       add_work(&p_m_d_delete, delete_event, this, 0);
        p_m_d_ces = -1;
-       p_m_d_queue = NULL;
+       p_m_d_queue[0] = '\0';
        p_m_d_notify_pending = NULL;
-       p_m_d_collect_cause = CAUSE_NOUSER;
-       p_m_d_collect_location = LOCATION_PRIVATE_LOCAL;
+       p_m_d_collect_cause = 0;
+       p_m_d_collect_location = 0;
 
-       PDEBUG(DEBUG_ISDN, "Created new mISDNPort(%s). Currently %d objects use, %s port #%d\n", portname, mISDNport->use, (mISDNport->ntmode)?"NT":"TE", p_m_portnum);
+       PDEBUG(DEBUG_ISDN, "Created new mISDNPort(%s). Currently %d objects use, %s%s port #%d\n", portname, mISDNport->use, (mISDNport->ntmode)?"NT":"TE", (mISDNport->tespecial)?" (special)":"", p_m_portnum);
 }
 
 
@@ -54,241 +51,58 @@ Pdss1::Pdss1(int type, mISDNport *mISDNport, char *portname, struct port_setting
  */
 Pdss1::~Pdss1()
 {
-       /* remove queued message */
-       if (p_m_d_queue)
-               message_free(p_m_d_queue);
+       del_work(&p_m_d_delete);
 
+       /* remove queued message */
        if (p_m_d_notify_pending)
                message_free(p_m_d_notify_pending);
-
-       /* check how many processes are left */
-       if (p_m_d_ntmode == 1)
-       {
-               if (p_m_mISDNport->nst.layer3->proc)
-                       PDEBUG(DEBUG_ISDN, "destroyed mISDNPort(%s). WARNING: There is still a layer 3 process left. Ignore this, if currently are other calls. This message is not an error!\n", p_name);
-       }
 }
 
 
 /*
  * create layer 3 message
  */
-static msg_t *create_l3msg(int prim, int mt, int dinfo, int size, int ntmode)
+static struct l3_msg *create_l3msg(void)
 {
-       int i = 0;
-       msg_t *dmsg;
-       Q931_info_t *qi;
-       iframe_t *frm;
+       struct l3_msg *l3m;
 
-       if (!ntmode)
-               size = sizeof(Q931_info_t)+2;
-
-       while(i < 10)
-       {
-               if (ntmode)
-               {
-                       dmsg = prep_l3data_msg(prim, dinfo, size, 256, NULL);
-                       if (dmsg)
-                       {
-                               return(dmsg);
-                       }
-               } else
-               {
-                       dmsg = alloc_msg(size+256+mISDN_HEADER_LEN+DEFAULT_HEADROOM);
-                       if (dmsg)
-                       {
-                               memset(msg_put(dmsg,size+mISDN_HEADER_LEN), 0, size+mISDN_HEADER_LEN);
-                               frm = (iframe_t *)dmsg->data;
-                               frm->prim = prim;
-                               frm->dinfo = dinfo;
-                               qi = (Q931_info_t *)(dmsg->data + mISDN_HEADER_LEN);
-                               qi->type = mt;
-                               return(dmsg);
-                       }
-               }
+       l3m = alloc_l3_msg();
+       if (l3m)
+               return(l3m);
 
-               if (!i)
-                       PERROR("cannot allocate memory, trying again...\n");
-               i++;
-               usleep(50000);
-       }
-       PERROR("cannot allocate memory, system overloaded.\n");
-       exit(-1);
+       FATAL("Cannot allocate memory, system overloaded.\n");
+       exit(0); // make gcc happy
 }
 
-msg_t *create_l2msg(int prim, int dinfo, int size) /* NT only */
-{
-       int i = 0;
-       msg_t *dmsg;
-
-       while(i < 10)
-       {
-               dmsg = prep_l3data_msg(prim, dinfo, size, 256, NULL);
-               if (dmsg)
-                       return(dmsg);
-
-               if (!i)
-                       PERROR("cannot allocate memory, trying again...\n");
-               i++;
-               usleep(50000);
-       }
-       PERROR("cannot allocate memory, system overloaded.\n");
-       exit(-1);
-}
-
-/* isdn messaging */
-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_ESTABLSIH", DL_ESTABLSIH},
-       {"DL_RELEASE", DL_RELEASE},
-       {"PH_ACTICATIE", PH_ACTICATIE},
-       {"PH_DEACTICATIE", PH_DEACTICATIE},
-
-       {NULL, 0},
-};
-
-static char *isdn_prim[4] = {
-       " REQUEST",
-       " CONFIRM",
-       " INDICATION",
-       " RESPONSE",
-};
-
-
-/*
- * isdn trace header
- */
-void Pdss1::l1l2l3_trace_header(unsigned long prim, int direction_out)
-{
-       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 (p_m_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(p_m_mISDNport->portnum,
-                   p_m_mISDNport->ifport->interface,
-                   nationalize(p_callerinfo.id, p_callerinfo.ntype),
-                   p_dialinginfo.number,
-                   direction,
-                   CATEGORY_L3,
-                   p_serial,
-                   msgtext);
-}
-
-
-void Pdss1::chan_trace_header(char *msgtext)
-{
-       int i;
-
-
-       /* init trace with given values */
-       start_trace(p_m_mISDNport->portnum,
-                   p_m_mISDNport->ifport->interface,
-                   nationalize(p_callerinfo.id, p_callerinfo.ntype),
-                   p_dialinginfo.number,
-                   0,
-                   CATEGORY_L3,
-                   p_serial,
-                   msgtext);
-}
-
-
 /*
  * if we received a first reply to the setup message,
  * we will check if we have now channel information 
  * return: <0: error, call is released, -cause is given
  *         0: ok, nothing to do
  */
-int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int exclusive)
+int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int exclusive)
 {
        int ret;
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       RELEASE_COMPLETE_t *release_complete;
-       msg_t *dmsg;
+       l3_msg *l3m;
 
        /* correct exclusive to 0, if no explicit channel was given */
        if (exclusive<0 || channel<=0)
                exclusive = 0;
        
        /* select scenario */
-       if (p_m_b_channel && p_m_b_exclusive)
-       {
+       if (p_m_b_channel && p_m_b_exclusive) {
                /*** we gave an exclusive channel (or if we are done) ***/
 
                /* if not first reply, we are done */
                if (p_state != PORT_STATE_OUT_SETUP)
                        return(0);
 
-               chan_trace_header("CHANNEL SELECTION (first reply to setup)");
+               chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE);
                add_trace("channel", "request", "%d (forced)", p_m_b_channel);
                add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel);
 
                /* if give channel not accepted or not equal */
-               if (channel!=-1 && p_m_b_channel!=channel)
-               {
+               if (channel!=-1 && p_m_b_channel!=channel) {
                        add_trace("conclusion", NULL, "forced channel not accepted");
                        end_trace();
                        ret = -44;
@@ -300,34 +114,31 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                end_trace();
 
                /* activate our exclusive channel */
-               bchannel_activate(p_m_mISDNport, p_m_b_index);
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
        } else
-       if (p_m_b_channel)
-       {
+       if (p_m_b_channel) {
                /*** we gave a non-exclusive channel ***/
 
                /* if not first reply, we are done */
                if (p_state != PORT_STATE_OUT_SETUP)
                        return(0);
 
-               chan_trace_header("CHANNEL SELECTION (first reply to setup)");
+               chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE);
                add_trace("channel", "request", "%d (suggest)", p_m_b_channel);
                add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel);
 
                /* if channel was accepted as given */
-               if (channel==-1 || p_m_b_channel==channel)
-               {
+               if (channel==-1 || p_m_b_channel==channel) {
                        add_trace("conclusion", NULL, "channel was accepted as given");
                        add_trace("connect", "channel", "%d", p_m_b_channel);
                        end_trace();
                        p_m_b_exclusive = 1; // we are done
-                       bchannel_activate(p_m_mISDNport, p_m_b_index);
+                       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
                        return(0);
                }
 
                /* if channel value is faulty */
-               if (channel <= 0)
-               {
+               if (channel <= 0) {
                        add_trace("conclusion", NULL, "illegal reply");
                        end_trace();
                        ret = -111; // protocol error
@@ -337,8 +148,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                /* if channel was not accepted, try to get it */
                ret = seize_bchannel(channel, 1); // exclusively
                add_trace("channel", "available", ret<0?"no":"yes");
-               if (ret < 0)
-               {
+               if (ret < 0) {
                        add_trace("conclusion", NULL, "replied channel not available");
                        end_trace();
                        goto channelerror;
@@ -348,22 +158,20 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                end_trace();
 
                /* activate channel given by remote */
-               bchannel_activate(p_m_mISDNport, p_m_b_index);
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
        } else
-       if (p_m_b_reserve)
-       {
+       if (p_m_b_reserve) {
                /*** we sent 'any channel acceptable' ***/
 
                /* if not first reply, we are done */
                if (p_state != PORT_STATE_OUT_SETUP)
                        return(0);
 
-               chan_trace_header("CHANNEL SELECTION (first reply to setup)");
+               chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE);
                add_trace("channel", "request", "any");
                add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel);
                /* if no channel was replied */
-               if (channel <= 0)
-               {
+               if (channel <= 0) {
                        add_trace("conclusion", NULL, "no channel, protocol error");
                        end_trace();
                        ret = -111; // protocol error
@@ -373,8 +181,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                /* we will see, if our received channel is available */
                ret = seize_bchannel(channel, 1); // exclusively
                add_trace("channel", "available", ret<0?"no":"yes");
-               if (ret < 0)
-               {
+               if (ret < 0) {
                        add_trace("conclusion", NULL, "replied channel not available");
                        end_trace();
                        goto channelerror;
@@ -384,25 +191,21 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                end_trace();
 
                /* activate channel given by remote */
-               bchannel_activate(p_m_mISDNport, p_m_b_index);
-       } else
-       {
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
+       } else {
                /*** we sent 'no channel available' ***/
 
                /* if not the first reply, but a connect, we are forced */
-               if (prim==(CC_CONNECT | INDICATION) && p_state!=PORT_STATE_OUT_SETUP)
-               {
-                       chan_trace_header("CHANNEL SELECTION (connect)");
+               if (cmd==MT_CONNECT && p_state!=PORT_STATE_OUT_SETUP) {
+                       chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (connect)", DIRECTION_NONE);
                        add_trace("channel", "request", "no-channel");
                        add_trace("channel", "reply", (channel>=0)?"%d%s":"(none)", channel, exclusive?" (forced)":"");
-                       if (channel > 0)
-                       {
+                       if (channel > 0) {
                                goto use_from_connect;
                        }
                        ret = seize_bchannel(CHANNEL_ANY, 0); // any channel
                        add_trace("channel", "available", ret<0?"no":"yes");
-                       if (ret < 0)
-                       {
+                       if (ret < 0) {
                                add_trace("conclusion", NULL, "no channel available during call-waiting");
                                end_trace();
                                goto channelerror;
@@ -413,7 +216,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                        p_m_b_exclusive = 1; // we are done
 
                        /* activate channel given by remote */
-                       bchannel_activate(p_m_mISDNport, p_m_b_index);
+                       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
                        return(0);
                }
                
@@ -421,12 +224,11 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                if (p_state != PORT_STATE_OUT_SETUP)
                        return(0);
 
-               chan_trace_header("CHANNEL SELECTION (first reply to setup)");
+               chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE);
                add_trace("channel", "request", "no-channel");
                add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel);
                /* if first reply has no channel, we are done */
-               if (channel <= 0)
-               {
+               if (channel <= 0) {
                        add_trace("conclusion", NULL, "no channel until connect");
                        end_trace();
                        return(0);
@@ -436,8 +238,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                use_from_connect:
                ret = seize_bchannel(channel, exclusive);
                add_trace("channel", "available", ret<0?"no":"yes");
-               if (ret < 0)
-               {
+               if (ret < 0) {
                        add_trace("conclusion", NULL, "replied channel not available");
                        end_trace();
                        goto channelerror;
@@ -448,101 +249,225 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                p_m_b_exclusive = 1; // we are done
 
                /* activate channel given by remote */
-               bchannel_activate(p_m_mISDNport, p_m_b_index);
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
        }
        return(0);
 
        channelerror:
-       dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
-       l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-
-       release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
-       enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+       /*
+        * NOTE: we send MT_RELEASE_COMPLETE to "REJECT" the channel
+        * in response to the setup reply
+        */
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
+       enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
        new_state(PORT_STATE_RELEASE);
-       p_m_delete = 1;
+       trigger_work(&p_m_d_delete);
        return(-34); /* to epoint: no channel available */
 }
 
 
 /*
+ * hunt bchannel for incoming setup or retrieve or resume
+ */
+int Pdss1::hunt_bchannel(int channel, int exclusive)
+{
+       struct select_channel *selchannel;
+       struct interface_port *ifport = p_m_mISDNport->ifport;
+       int i;
+
+       chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (setup)", DIRECTION_NONE);
+       if (exclusive<0)
+               exclusive = 0;
+       if (channel == CHANNEL_NO)
+               add_trace("channel", "request", "no-channel");
+       else
+               add_trace("channel", "request", (channel>0)?"%d%s":"any", channel, exclusive?" (forced)":"");
+       if (channel==CHANNEL_NO && p_type==PORT_TYPE_DSS1_TE_IN) {
+               add_trace("conclusion", NULL, "incoming call-waiting not supported for TE-mode");
+               end_trace();
+               return(-6); // channel unacceptable
+       }
+       if (channel <= 0) /* not given, no channel, whatever.. */
+               channel = CHANNEL_ANY; /* any channel */
+       add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved);
+       if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) { // of out chan..
+               add_trace("conclusion", NULL, "all channels are reserved");
+               end_trace();
+               return(-34); // no channel
+       }
+       if (channel == CHANNEL_ANY)
+               goto get_from_list;
+       if (channel > 0) {
+               /* check for given channel in selection list */
+               selchannel = ifport->in_channel;
+               while(selchannel) {
+                       if (selchannel->channel == channel || selchannel->channel == CHANNEL_FREE)
+                               break;
+                       selchannel = selchannel->next;
+               }
+               if (!selchannel)
+                       channel = 0;
+
+               /* exclusive channel requests must be in the list */
+               if (exclusive) {
+                       /* no exclusive channel */
+                       if (!channel) {
+                               add_trace("conclusion", NULL, "exclusively requested channel not in list");
+                               end_trace();
+                               return(-6); // channel unacceptable
+                       }
+                       /* get index for channel */
+                       i = channel-1-(channel>=17);
+                       if (i < 0 || i >= p_m_mISDNport->b_num || channel == 16) {
+                               add_trace("conclusion", NULL, "exclusively requested channel outside interface range");
+                               end_trace();
+                               return(-6); // channel unacceptable
+                       }
+                       /* check if busy */
+                       if (p_m_mISDNport->b_port[i] == NULL)
+                               goto use_channel;
+                       add_trace("conclusion", NULL, "exclusively requested channel is busy");
+                       end_trace();
+                       return(-6); // channel unacceptable
+               }
+
+               /* requested channels in list will be used */
+               if (channel) {
+                       /* get index for channel */
+                       i = channel-1-(channel>=17);
+                       if (i < 0 || i >= p_m_mISDNport->b_num || channel == 16) {
+                               add_trace("info", NULL, "requested channel %d outside interface range", channel);
+                       } else /* if inside range (else) check if available */
+                       if (p_m_mISDNport->b_port[i] == NULL)
+                               goto use_channel;
+               }
+
+               /* if channel is not available or not in list, it must be searched */
+               get_from_list:
+               /* check for first free channel in list */
+               channel = 0;
+               selchannel = ifport->in_channel;
+               while(selchannel) {
+                       switch(selchannel->channel) {
+                               case CHANNEL_FREE: /* free channel */
+                               add_trace("hunting", "channel", "free");
+                               if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num)
+                                       break; /* all channel in use or reserverd */
+                               /* find channel */
+                               i = 0;
+                               while(i < p_m_mISDNport->b_num) {
+                                       if (p_m_mISDNport->b_port[i] == NULL) {
+                                               channel = i+1+(i>=15);
+                                               break;
+                                       }
+                                       i++;
+                               }
+                               break;
+
+                               default:
+                               add_trace("hunting", "channel", "%d", selchannel->channel);
+                               if (selchannel->channel<1 || selchannel->channel==16)
+                                       break; /* invalid channels */
+                               i = selchannel->channel-1-(selchannel->channel>=17);
+                               if (i >= p_m_mISDNport->b_num)
+                                       break; /* channel not in port */
+                               if (p_m_mISDNport->b_port[i] == NULL) {
+                                       channel = selchannel->channel;
+                                       break;
+                               }
+                               break;
+                       }
+                       if (channel)
+                               break; /* found channel */
+                       selchannel = selchannel->next;
+               }
+               if (!channel) {
+                       add_trace("conclusion", NULL, "no channel available");
+                       end_trace();
+                       return(-6); // channel unacceptable
+               }
+       }
+use_channel:
+       add_trace("conclusion", NULL, "channel available");
+       add_trace("connect", "channel", "%d", channel);
+       end_trace();
+       return(channel);
+}
+
+/*
  * handles all indications
  */
 /* CC_SETUP INDICATION */
-void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       SETUP_t *setup = (SETUP_t *)((unsigned long)data + headerlen);
-       int type, plan, present, screen, reason;
-       int coding, capability, mode, rate, multi, user, presentation, interpretation, hlc, exthlc;
+       int calling_type, calling_plan, calling_present, calling_screen;
+       int calling_type2, calling_plan2, calling_present2, calling_screen2;
+       int called_type, called_plan;
+       int redir_type, redir_plan, redir_present, redir_screen, redir_reason;
+       int hlc_coding, hlc_presentation, hlc_interpretation, hlc_hlc, hlc_exthlc;
+       int bearer_coding, bearer_capability, bearer_mode, bearer_rate, bearer_multi, bearer_user;
        int exclusive, channel;
        int ret;
-       msg_t *dmsg;
-       unsigned char keypad[32] = "";
+       unsigned char keypad[33] = "";
        unsigned char useruser[128];
        int useruser_len = 0, useruser_protocol;
        class Endpoint *epoint;
-       struct message *message;
-
-       /* callref from nt-lib */
-       if (p_m_d_ntmode)
-       {
-               /* nt-library now gives us the id via CC_SETUP */
-               if (dinfo&(~0xff) == 0xff00)
-               {
-                       PERROR("fatal software error: l3-stack gives us a process id 0xff00-0xffff\n");
-                       exit(-1);
-               }
-               l1l2l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN);
-               if (p_m_d_l3id)
-                       add_trace("callref", "old", "0x%x", p_m_d_l3id);
-               add_trace("callref", "new", "0x%x", dinfo);
+       struct lcr_msg *message;
+
+       /* process given callref */
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_IND, DIRECTION_IN);
+       add_trace("callref", "new", "0x%x", pid);
+       if (p_m_d_l3id) {
+               /* release in case the ID is already in use */
+               add_trace("error", NULL, "callref already in use");
+               end_trace();
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
+               add_trace("reason", NULL, "callref already in use");
                end_trace();
-               if (p_m_d_l3id&(~0xff) == 0xff00)
-                       p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0;
-               p_m_d_l3id = dinfo;
-               p_m_d_ces = setup->ces;
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, pid, l3m);
+               new_state(PORT_STATE_RELEASE);
+               trigger_work(&p_m_d_delete);
+               return;
        }
+       p_m_d_l3id = pid;
+       p_m_d_ces = pid >> 16;
+       end_trace();
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_calling_pn(setup->CALLING_PN, (Q931_info_t *)((unsigned long)data+headerlen), &calling_type, &calling_plan, &calling_present, &calling_screen, (unsigned char *)p_callerinfo.id, sizeof(p_callerinfo.id));
-       dec_ie_called_pn(setup->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &called_type, &called_plan, (unsigned char *)p_dialinginfo.number, sizeof(p_dialinginfo.number));
-       dec_ie_keypad(setup->KEYPAD, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)keypad, sizeof(keypad));
-#ifdef CENTREX
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_IND, DIRECTION_IN);
+       dec_ie_calling_pn(l3m, &calling_type, &calling_plan, &calling_present, &calling_screen, (unsigned char *)p_callerinfo.id, sizeof(p_callerinfo.id), &calling_type2, &calling_plan2, &calling_present2, &calling_screen2, (unsigned char *)p_callerinfo.id2, sizeof(p_callerinfo.id2));
+       dec_ie_called_pn(l3m, &called_type, &called_plan, (unsigned char *)p_dialinginfo.id, sizeof(p_dialinginfo.id));
+       dec_ie_keypad(l3m, (unsigned char *)keypad, sizeof(keypad));
        /* te-mode: CNIP (calling name identification presentation) */
-       if (!p_m_d_ntmode)
-               dec_facility_centrex(setup->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)p_callerinfo.name, sizeof(p_callerinfo.name));
-#endif
-       dec_ie_useruser(setup->USER_USER, (Q931_info_t *)((unsigned long)data+headerlen), &useruser_protocol, useruser, &useruser_len);
-       dec_ie_complete(setup->COMPLETE, (Q931_info_t *)((unsigned long)data+headerlen), &p_dialinginfo.sending_complete);
-       dec_ie_redir_nr(setup->REDIR_NR, (Q931_info_t *)((unsigned long)data+headerlen), &redir_type, &redir_plan, &redir_present, &redir_screen, &redir_reason, (unsigned char *)p_redirinfo.id, sizeof(p_redirinfo.id));
-       dec_ie_channel_id(setup->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
-       dec_ie_hlc(setup->HLC, (Q931_info_t *)((unsigned long)data+headerlen), &hlc_coding, &interpretation, &presentation, &hlc, &exthlc);
-       dec_ie_bearer(setup->BEARER, (Q931_info_t *)((unsigned long)data+headerlen), &bearer_coding, &capability, &mode, &rate, &multi, &user);
+       dec_facility_centrex(l3m, (unsigned char *)p_callerinfo.name, sizeof(p_callerinfo.name));
+       dec_ie_useruser(l3m, &useruser_protocol, useruser, &useruser_len);
+       dec_ie_complete(l3m, &p_dialinginfo.sending_complete);
+       dec_ie_redir_nr(l3m, &redir_type, &redir_plan, &redir_present, &redir_screen, &redir_reason, (unsigned char *)p_redirinfo.id, sizeof(p_redirinfo.id));
+       dec_ie_channel_id(l3m, &exclusive, &channel);
+       dec_ie_hlc(l3m, &hlc_coding, &hlc_interpretation, &hlc_presentation, &hlc_hlc, &hlc_exthlc);
+       dec_ie_bearer(l3m, &bearer_coding, &bearer_capability, &bearer_mode, &bearer_rate, &bearer_multi, &bearer_user);
+       dec_ie_display(l3m, (unsigned char *)p_dialinginfo.display, sizeof(p_dialinginfo.display));
        end_trace();
 
-       /* if blocked, release call */
-       if (p_m_mISDNport->ifport->block)
-       {
-               RELEASE_COMPLETE_t *release_complete;
-
-               printlog("---  port#%d is blocked.\n", mISDNport->ifport->portnum);
-               dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
-               l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-               release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
-               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */
+       /* if blocked, release call with MT_RELEASE_COMPLETE */
+       if (p_m_mISDNport->ifport->block) {
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */
                add_trace("reason", NULL, "port blocked");
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
 
        /* caller info */
-       switch (present)
-       {
+       switch (calling_present) {
                case 1:
                p_callerinfo.present = INFO_PRESENT_RESTRICTED;
                break;
@@ -553,21 +478,26 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
                p_callerinfo.present = INFO_PRESENT_ALLOWED;
                break;
        }
-       switch (screen)
-       {
+       switch (calling_screen) {
                case 0:
                p_callerinfo.screen = INFO_SCREEN_USER;
                break;
+               case 1:
+               p_callerinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED;
+               break;
+               case 2:
+               p_callerinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED;
+               break;
                default:
                p_callerinfo.screen = INFO_SCREEN_NETWORK;
                break;
        }
-       switch (type)
-       {
+       switch (calling_type) {
                case -1:
+               p_callerinfo.ntype = INFO_NTYPE_NOTPRESENT;
+               break;
+               case 0x0:
                p_callerinfo.ntype = INFO_NTYPE_UNKNOWN;
-               p_callerinfo.present = INFO_PRESENT_NOTAVAIL;
-               p_callerinfo.screen = INFO_SCREEN_NETWORK;
                break;
                case 0x1:
                p_callerinfo.ntype = INFO_NTYPE_INTERNATIONAL;
@@ -585,10 +515,56 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
        p_callerinfo.isdn_port = p_m_portnum;
        SCPY(p_callerinfo.interface, p_m_mISDNport->ifport->interface->name);
 
+       /* caller info2 */
+       switch (calling_present2) {
+               case 1:
+               p_callerinfo.present2 = INFO_PRESENT_RESTRICTED;
+               break;
+               case 2:
+               p_callerinfo.present2 = INFO_PRESENT_NOTAVAIL;
+               break;
+               default:
+               p_callerinfo.present2 = INFO_PRESENT_ALLOWED;
+               break;
+       }
+       switch (calling_screen2) {
+               case 0:
+               p_callerinfo.screen2 = INFO_SCREEN_USER;
+               break;
+               case 1:
+               p_callerinfo.screen2 = INFO_SCREEN_USER_VERIFIED_PASSED;
+               break;
+               case 2:
+               p_callerinfo.screen2 = INFO_SCREEN_USER_VERIFIED_FAILED;
+               break;
+               default:
+               p_callerinfo.screen2 = INFO_SCREEN_NETWORK;
+               break;
+       }
+       switch (calling_type2) {
+               case -1:
+               p_callerinfo.ntype2 = INFO_NTYPE_NOTPRESENT;
+               break;
+               case 0x0:
+               p_callerinfo.ntype2 = INFO_NTYPE_UNKNOWN;
+               break;
+               case 0x1:
+               p_callerinfo.ntype2 = INFO_NTYPE_INTERNATIONAL;
+               break;
+               case 0x2:
+               p_callerinfo.ntype2 = INFO_NTYPE_NATIONAL;
+               break;
+               case 0x4:
+               p_callerinfo.ntype2 = INFO_NTYPE_SUBSCRIBER;
+               break;
+               default:
+               p_callerinfo.ntype2 = INFO_NTYPE_UNKNOWN;
+               break;
+       }
+
        /* dialing information */
-       SCAT(p_dialinginfo.number, (char *)keypad);
-       switch (type)
-       {
+       SCAT(p_dialinginfo.id, (char *)keypad);
+       switch (called_type) {
                case 0x1:
                p_dialinginfo.ntype = INFO_NTYPE_INTERNATIONAL;
                break;
@@ -602,8 +578,9 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
                p_dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
                break;
        }
-       switch (present)
-       {
+
+       /* redir info */
+       switch (redir_present) {
                case 1:
                p_redirinfo.present = INFO_PRESENT_RESTRICTED;
                break;
@@ -614,17 +591,21 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
                p_redirinfo.present = INFO_PRESENT_ALLOWED;
                break;
        }
-       switch (screen)
-       {
+       switch (redir_screen) {
                case 0:
                p_redirinfo.screen = INFO_SCREEN_USER;
                break;
+               case 1:
+               p_redirinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED;
+               break;
+               case 2:
+               p_redirinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED;
+               break;
                default:
                p_redirinfo.screen = INFO_SCREEN_NETWORK;
                break;
        }
-       switch (reason)
-       {
+       switch (redir_reason) {
                case 1:
                p_redirinfo.reason = INFO_REDIR_BUSY;
                break;
@@ -644,12 +625,12 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
                p_redirinfo.reason = INFO_REDIR_UNKNOWN;
                break;
        }
-       switch (type)
-       {
+       switch (redir_type) {
                case -1:
+               p_redirinfo.ntype = INFO_NTYPE_NOTPRESENT;
+               break;
+               case 0x0:
                p_redirinfo.ntype = INFO_NTYPE_UNKNOWN;
-               p_redirinfo.present = INFO_PRESENT_NULL; /* not redirecting */
-               p_redirinfo.reason = INFO_REDIR_UNKNOWN;
                break;
                case 0x1:
                p_redirinfo.ntype = INFO_NTYPE_INTERNATIONAL;
@@ -667,18 +648,16 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
        p_redirinfo.isdn_port = p_m_portnum;
 
        /* bearer capability */
-       switch (capability)
-       {
+       switch (bearer_capability) {
                case -1:
                p_capainfo.bearer_capa = INFO_BC_AUDIO;
-               user = (options.law=='a')?3:2;
+               bearer_user = (options.law=='a')?3:2;
                break;
                default:
-               p_capainfo.bearer_capa = capability;
+               p_capainfo.bearer_capa = bearer_capability;
                break;
        }
-       switch (mode)
-       {
+       switch (bearer_mode) {
                case 2:
                p_capainfo.bearer_mode = INFO_BMODE_PACKET;
                break;
@@ -686,215 +665,79 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
                p_capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
                break;
        }
-       switch (user)
-       {
+       switch (bearer_user) {
                case -1:
                p_capainfo.bearer_info1 = INFO_INFO1_NONE;
                break;
                default:
-               p_capainfo.bearer_info1 = user + 0x80;
+               p_capainfo.bearer_info1 = bearer_user + 0x80;
                break;
        }
 
        /* hlc */
-       switch (hlc)
-       {
+       switch (hlc_hlc) {
                case -1:
                p_capainfo.hlc = INFO_HLC_NONE;
                break;
                default:
-               p_capainfo.hlc = hlc + 0x80;
+               p_capainfo.hlc = hlc_hlc + 0x80;
                break;
        }
-       switch (exthlc)
-       {
+       switch (hlc_exthlc) {
                case -1:
                p_capainfo.exthlc = INFO_HLC_NONE;
                break;
                default:
-               p_capainfo.exthlc = exthlc + 0x80;
+               p_capainfo.exthlc = hlc_exthlc + 0x80;
                break;
        }
 
-       /* process channel */
-       chan_trace_header("CHANNEL SELECTION (setup)");
-       if (exclusive<0)
-               exclusive = 0;
-       if (channel == CHANNEL_NO)
-               add_trace("channel", "request", "no-channel");
+       /* set bchannel mode */
+       if (p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED
+        || p_capainfo.bearer_capa==INFO_BC_DATARESTRICTED
+        || p_capainfo.bearer_capa==INFO_BC_VIDEO)
+               p_capainfo.source_mode = B_MODE_HDLC;
        else
-               add_trace("channel", "request", (channel>0)?"%d%s":"any", channel, exclusive?" (forced)":"");
-       if (channel==CHANNEL_NO && p_type==PORT_TYPE_DSS1_TE_IN)
-       {
-               add_trace("conclusion", NULL, "incoming call-waiting not supported for TE-mode");
-               end_trace();
-               ret = -6; // channel unacceptable
-               goto no_channel;
-       }
-       if (channel <= 0) /* not given, no channel, whatever.. */
-               channel = CHANNEL_ANY; /* any channel */
-       if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) // of out chan..
-       {
-               add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved);
-               add_trace("conclusion", NULL, "all channels are reserved");
-               end_trace();
-               ret = -34; // no channel
-               goto no_channel;
-       }
-       if (channel == CHANNEL_ANY)
-               goto get_from_list;
-       if (channel > 0)
-       {
-               /* check for given channel in selection list */
-               selchannel = ifport->channel_in;
-               while(selchannel)
-               {
-                       if (selchannel->channel == channel || selchannel->channel == CHANNEL_FREE)
-                               break;
-                       selchannel = selchannel->next;
-               }
-               if (!selchannel)
-                       channel = 0;
-
-               /* exclusive channel requests must be in the list */
-               if (exclusive)
-               {
-                       if (!channel)
-                       {
-                               add_trace("conclusion", NULL, "exclusively requested channel not in list");
-                               end_trace();
-                               ret = 6; // unacceptable
-                               goto no_channel;
-                       }
-                       i = selchannel->channel-1-(selchannel->channel>=17);
-                       if (mISDNport->b_port[i] == NULL)
-                               goto use_channel;
-                       add_trace("conclusion", NULL, "exclusively requested channel is busy");
-                       end_trace();
-                       ret = 6; // unacceptable
-                       goto no_channel;
-               }
-
-               /* requested channels in list will be used */
-               if (channel)
-               {
-                       i = selchannel->channel-1-(selchannel->channel>=17);
-                       if (mISDNport->b_port[i] == NULL)
-                               goto use_channel;
-               }
+               p_capainfo.source_mode = B_MODE_TRANSPARENT;
+       p_m_b_mode = p_capainfo.source_mode;
 
-               /* if channel is not available or not in list, it must be searched */
-               get_from_list:
-               /* check for first free channel in list */
-               channel = 0;
-               selchannel = ifport->channel_in;
-               while(selchannel)
-               {
-                       switch(selchannel->channel)
-                       {
-                               case CHANNEL_FREE: /* free channel */
-                               add_trace("hunting", "channel", "free");
-                               if (mISDNport->b_inuse >= mISDNport->b_num)
-                                       break; /* all channel in use or reserverd */
-                               /* find channel */
-                               i = 0;
-                               while(i < mISDNport->b_num)
-                               {
-                                       if (mISDNport->b_port[i] == NULL)
-                                       {
-                                               channel = i+1+(i>=15);
-                                               break;
-                                       }
-                                       i++;
-                               }
-                               break;
-
-                               default:
-                               add_trace("hunting", "channel", "%d", selchannel->channel);
-                               if (selchannel->channel<1 || selchannel->channel==16)
-                                       break; /* invalid channels */
-                               i = selchannel->channel-1-(selchannel->channel>=17);
-                               if (i >= mISDNport->b_num)
-                                       break; /* channel not in port */
-                               if (mISDNport->b_port[i] == NULL)
-                               {
-                                       channel = selchannel->channel;
-                                       break;
-                               }
-                               break;
-                       }
-                       if (channel)
-                               break; /* found channel */
-                       selchannel = selchannel->next;
-               }
-               if (!channel)
-               {
-                       add_trace("conclusion", NULL, "no channel available");
-                       end_trace();
-                       ret = 6; // unacceptable
-                       goto no_channel;
-               }
-       }
+       /* hunt channel */
+       ret = channel = hunt_bchannel(channel, exclusive);
+       if (ret < 0)
+               goto no_channel;
 
        /* open channel */
-       use_channel:
        ret = seize_bchannel(channel, 1);
-       if (ret < 0)
-       {
-               add_trace("conclusion", NULL, "channel not available");
-               end_trace();
+       if (ret < 0) {
                no_channel:
-               RELEASE_COMPLETE_t *release_complete;
-
-               dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
-               l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-               release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
-               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+               /*
+                * NOTE: we send MT_RELEASE_COMPLETE to "REJECT" the channel
+                * in response to the setup
+                */
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
-       add_trace("conclusion", NULL, "channel available");
-       add_trace("connect", "channel", "%d", p_m_b_channel);
-       end_trace();
-       bchannel_activate(p_m_mISDNport, p_m_b_index);
+       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
 
        /* create endpoint */
        if (p_epointlist)
-       {
-               PERROR("SOFTWARE ERROR: incoming call but already got an endpoint, exitting...\n");
-               exit(-1);
-       }
+               FATAL("Incoming call but already got an endpoint.\n");
        if (!(epoint = new Endpoint(p_serial, 0)))
-       {
-               RELEASE_COMPLETE_t *release_complete;
-
-               dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
-               l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-               release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
-               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 41); /* temporary failure */
-               end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
-               new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
-               return;
-       }
-       if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint)))
-       {
-               PERROR("no memory for application\n");
-               exit(-1);
-       }
-       if (!(epointlist_new(epoint->ep_serial)))
-       {
-               PERROR("no memory for epointlist\n");
-               exit(-1);
-       }
+               FATAL("No memory for Endpoint instance\n");
+       epoint->ep_app = new_endpointapp(epoint, 0, p_m_mISDNport->ifport->interface->app); //incoming
+       epointlist_new(epoint->ep_serial);
+
        /* send setup message to endpoit */
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_SETUP);
        message->param.setup.isdn_port = p_m_portnum;
        message->param.setup.port_type = p_type;
+//     message->param.setup.dtmf = !p_m_mISDNport->ifport->nodtmf;
        memcpy(&message->param.setup.dialinginfo, &p_dialinginfo, sizeof(struct dialing_info));
        memcpy(&message->param.setup.callerinfo, &p_callerinfo, sizeof(struct caller_info));
        memcpy(&message->param.setup.redirinfo, &p_redirinfo, sizeof(struct redir_info));
@@ -908,23 +751,21 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
 }
 
 /* CC_INFORMATION INDICATION */
-void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       INFORMATION_t *information = (INFORMATION_t *)((unsigned long)data + headerlen);
        int type, plan;
-       unsigned char keypad[32] = "";
-       struct message *message;
-
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_called_pn(information->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, (unsigned char *)p_dialinginfo.number, sizeof(p_dialinginfo.number));
-       dec_ie_keypad(information->KEYPAD, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)keypad, sizeof(keypad));
-       dec_ie_complete(information->COMPLETE, (Q931_info_t *)((unsigned long)data+headerlen), &p_dialinginfo.sending_complete);
+       unsigned char keypad[33] = "", display[128] = "";
+       struct lcr_msg *message;
+
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_IND, DIRECTION_IN);
+       dec_ie_called_pn(l3m, &type, &plan, (unsigned char *)p_dialinginfo.id, sizeof(p_dialinginfo.id));
+       dec_ie_keypad(l3m, (unsigned char *)keypad, sizeof(keypad));
+       dec_ie_display(l3m, (unsigned char *)display, sizeof(display));
+       dec_ie_complete(l3m, &p_dialinginfo.sending_complete);
        end_trace();
 
-       SCAT(p_dialinginfo.number, (char *)keypad);
-       switch (type)
-       {
+       SCAT(p_dialinginfo.id, (char *)keypad);
+       switch (type) {
                case 0x1:
                p_dialinginfo.ntype = INFO_NTYPE_INTERNATIONAL;
                break;
@@ -938,6 +779,7 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data)
                p_dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
                break;
        }
+       SCPY(p_dialinginfo.display, (char *)display);
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_INFORMATION);
        memcpy(&message->param.information, &p_dialinginfo, sizeof(struct dialing_info));
        message_put(message);
@@ -946,30 +788,37 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data)
 }
 
 /* CC_SETUP_ACCNOWLEDGE INDICATION */
-void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       SETUP_ACKNOWLEDGE_t *setup_acknowledge = (SETUP_ACKNOWLEDGE_t *)((unsigned long)data + headerlen);
        int exclusive, channel;
        int coding, location, progress;
        int ret;
-       struct message *message;
-
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_channel_id(setup_acknowledge->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
-       dec_ie_progress(setup_acknowledge->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &location, &progress);
+       struct lcr_msg *message;
+       int max = p_m_mISDNport->ifport->dialmax;
+       char *number;
+       l3_msg *nl3m;
+
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_IND, DIRECTION_IN);
+       dec_ie_channel_id(l3m, &exclusive, &channel);
+       dec_ie_progress(l3m, &coding, &location, &progress);
        end_trace();
 
+       if (progress >= 0) {
+               message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+               message->param.progressinfo.progress = progress;
+               message->param.progressinfo.location = location;
+               message_put(message);
+       }
+
        /* process channel */
-       ret = received_first_reply_to_setup(prim, exclusive, channel);
-       if (ret < 0)
-       {
+       ret = received_first_reply_to_setup(cmd, channel, exclusive);
+       if (ret < 0) {
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
                message->param.disconnectinfo.cause = -ret;
                message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
                message_put(message);
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
 
@@ -977,36 +826,54 @@ void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void
        message_put(message);
 
        new_state(PORT_STATE_OUT_OVERLAP);
+
+       number = p_m_d_queue;
+       while (number[0]) { /* as long we have something to dial */
+               if (max > (int)strlen(number) || max == 0)
+                       max = (int)strlen(number);
+      
+               nl3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
+               enc_ie_called_pn(nl3m, 0, 1, (unsigned char *)number, max);
+               end_trace();
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, nl3m);
+               number += max;
+       }
+       p_m_d_queue[0] = '\0';
 }
 
 /* CC_PROCEEDING INDICATION */
-void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       CALL_PROCEEDING_t *proceeding = (CALL_PROCEEDING_t *)((unsigned long)data + headerlen);
        int exclusive, channel;
        int coding, location, progress;
        int ret;
-       struct message *message;
+       struct lcr_msg *message;
        int notify = -1, type, plan, present;
        char redir[32];
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_channel_id(proceeding->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
-       dec_ie_progress(proceeding->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &location, &progress);
-       dec_ie_notify(NULL/*proceeding->NOTIFY*/, (Q931_info_t *)((unsigned long)data+headerlen), &notify);
-       dec_ie_redir_dn(proceeding->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_IND, DIRECTION_IN);
+       dec_ie_channel_id(l3m, &exclusive, &channel);
+       dec_ie_progress(l3m, &coding, &location, &progress);
+       dec_ie_notify(l3m, &notify);
+       dec_ie_redir_dn(l3m, &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
        end_trace();
 
-       ret = received_first_reply_to_setup(prim, exclusive, channel);
-       if (ret < 0)
-       {
+       if (progress >= 0) {
+               message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+               message->param.progressinfo.progress = progress;
+               message->param.progressinfo.location = location;
+               message_put(message);
+       }
+
+       ret = received_first_reply_to_setup(cmd, channel, exclusive);
+       if (ret < 0) {
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
                message->param.disconnectinfo.cause = -ret;
                message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
                message_put(message);
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROCEEDING);
@@ -1018,16 +885,14 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data)
                notify |= 0x80;
        else
                notify = 0;
-       if (type >= 0 || notify)
-       {
+       if (type >= 0 || notify) {
                if (!notify && type >= 0)
                        notify = 251;
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_NOTIFY);
                message->param.notifyinfo.notify = notify;
                SCPY(message->param.notifyinfo.id, redir);
                /* redirection number */
-               switch (present)
-               {
+               switch (present) {
                        case 1:
                        message->param.notifyinfo.present = INFO_PRESENT_RESTRICTED;
                        break;
@@ -1038,11 +903,9 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data)
                        message->param.notifyinfo.present = INFO_PRESENT_ALLOWED;
                        break;
                }
-               switch (type)
-               {
+               switch (type) {
                        case -1:
-                       message->param.notifyinfo.ntype = INFO_NTYPE_UNKNOWN;
-                       message->param.notifyinfo.present = INFO_PRESENT_NULL;
+                       message->param.notifyinfo.ntype = INFO_NTYPE_NOTPRESENT;
                        break;
                        case 1:
                        message->param.notifyinfo.ntype = INFO_NTYPE_INTERNATIONAL;
@@ -1063,34 +926,38 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data)
 }
 
 /* CC_ALERTING INDICATION */
-void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       ALERTING_t *alerting = (ALERTING_t *)((unsigned long)data + headerlen);
        int exclusive, channel;
        int coding, location, progress;
        int ret;
-       struct message *message;
+       struct lcr_msg *message;
        int notify = -1, type, plan, present;
        char redir[32];
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_channel_id(alerting->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
-       dec_ie_progress(alerting->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &location, &progress);
-       dec_ie_notify(NULL/*alerting->NOTIFY*/, (Q931_info_t *)((unsigned long)data+headerlen), &notify);
-       dec_ie_redir_dn(alerting->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_ALERTING_IND, DIRECTION_IN);
+       dec_ie_channel_id(l3m, &exclusive, &channel);
+       dec_ie_progress(l3m, &coding, &location, &progress);
+       dec_ie_notify(l3m, &notify);
+       dec_ie_redir_dn(l3m, &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
        end_trace();
 
+       if (progress >= 0) {
+               message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+               message->param.progressinfo.progress = progress;
+               message->param.progressinfo.location = location;
+               message_put(message);
+       }
+
        /* process channel */
-       ret = received_first_reply_to_setup(prim, exclusive, channel);
-       if (ret < 0)
-       {
+       ret = received_first_reply_to_setup(cmd, channel, exclusive);
+       if (ret < 0) {
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
                message->param.disconnectinfo.cause = -ret;
                message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
                message_put(message);
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_ALERTING);
@@ -1102,15 +969,13 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data)
                notify |= 0x80;
        else
                notify = 0;
-       if (type >= 0 || notify)
-       {
+       if (type >= 0 || notify) {
                if (!notify && type >= 0)
                        notify = 251;
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_NOTIFY);
                message->param.notifyinfo.notify = notify;
                SCPY(message->param.notifyinfo.id, redir);
-               switch (present)
-               {
+               switch (present) {
                        case 1:
                        message->param.notifyinfo.present = INFO_PRESENT_RESTRICTED;
                        break;
@@ -1121,11 +986,9 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data)
                        message->param.notifyinfo.present = INFO_PRESENT_ALLOWED;
                        break;
                }
-               switch (type)
-               {
+               switch (type) {
                        case -1:
-                       message->param.notifyinfo.ntype = INFO_NTYPE_UNKNOWN;
-                       message->param.notifyinfo.present = INFO_PRESENT_NULL;
+                       message->param.notifyinfo.ntype = INFO_NTYPE_NOTPRESENT;
                        break;
                        case 1:
                        message->param.notifyinfo.ntype = INFO_NTYPE_INTERNATIONAL;
@@ -1146,48 +1009,37 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data)
 }
 
 /* CC_CONNECT INDICATION */
-void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       CONNECT_t *connect = (CONNECT_t *)((unsigned long)data + headerlen);
        int exclusive, channel;
        int type, plan, present, screen;
        int ret;
-       msg_t *dmsg;
-       struct message *message;
+       struct lcr_msg *message;
        int bchannel_before;
-       CONNECT_ACKNOWLEDGE_t *connect_acknowledge;
-
-       if (p_m_d_ntmode)
-               p_m_d_ces = connect->ces;
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_channel_id(connect->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
-       dec_ie_connected_pn(connect->CONNECT_PN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, &screen, (unsigned char *)p_connectinfo.id, sizeof(p_connectinfo.id));
-#ifdef CENTREX
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_IND, DIRECTION_IN);
+       dec_ie_channel_id(l3m, &exclusive, &channel);
+       dec_ie_connected_pn(l3m, &type, &plan, &present, &screen, (unsigned char *)p_connectinfo.id, sizeof(p_connectinfo.id));
+       dec_ie_display(l3m, (unsigned char *)p_connectinfo.display, sizeof(p_connectinfo.display));
        /* te-mode: CONP (connected name identification presentation) */
-       if (!p_m_d_ntmode)
-               dec_facility_centrex(connect->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)p_connectinfo.name, sizeof(p_connectinfo.name));
-#endif
+       dec_facility_centrex(l3m, (unsigned char *)p_connectinfo.name, sizeof(p_connectinfo.name));
        end_trace();
 
        /* select channel */
        bchannel_before = p_m_b_channel;
-       ret = received_first_reply_to_setup(prim, exclusive, channel);
-       if (ret < 0)
-       {
+       ret = received_first_reply_to_setup(cmd, channel, exclusive);
+       if (ret < 0) {
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
                message->param.disconnectinfo.cause = -ret;
                message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
                message_put(message);
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
 
        /* connect information */
-       switch (present)
-       {
+       switch (present) {
                case 1:
                p_connectinfo.present = INFO_PRESENT_RESTRICTED;
                break;
@@ -1198,20 +1050,23 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
                p_connectinfo.present = INFO_PRESENT_ALLOWED;
                break;
        }
-       switch (screen)
-       {
+       switch (screen) {
                case 0:
                p_connectinfo.screen = INFO_SCREEN_USER;
                break;
+               case 1:
+               p_connectinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED;
+               break;
+               case 2:
+               p_connectinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED;
+               break;
                default:
                p_connectinfo.screen = INFO_SCREEN_NETWORK;
                break;
        }
-       switch (type)
-       {
-               case 0x0:
-               p_connectinfo.present = INFO_PRESENT_NULL; /* no COLP info */
-               p_connectinfo.ntype = INFO_NTYPE_UNKNOWN;
+       switch (type) {
+               case -1:
+               p_connectinfo.ntype = INFO_NTYPE_NOTPRESENT;
                break;
                case 0x1:
                p_connectinfo.ntype = INFO_NTYPE_INTERNATIONAL;
@@ -1227,18 +1082,20 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
                break;
        }
        p_connectinfo.isdn_port = p_m_portnum;
-       SCPY(p_connectingo.interface, p_m_mISDNport->ifport->interface->name);
-
-       /* send connect acknowledge */
-       dmsg = create_l3msg(CC_CONNECT | RESPONSE, MT_CONNECT, dinfo, sizeof(CONNECT_ACKNOWLEDGE_t), p_m_d_ntmode);
-       l1l2l3_trace_header(CC_CONNECT | RESPONSE, DIRECTION_OUT);
-       connect_acknowledge = (CONNECT_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
-       /* if we had no bchannel before, we send it now */
-       if (!bchannel_before && p_m_b_channel)
-               enc_ie_channel_id(&connect_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
-       end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
-
+       SCPY(p_connectinfo.interface, p_m_mISDNport->ifport->interface->name);
+
+       /* only in nt-mode we send connect ack. in te-mode it is done by stack itself or optional */
+       if (p_m_d_ntmode) {
+               /* send connect acknowledge */
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_RES, DIRECTION_OUT);
+               /* if we had no bchannel before, we send it now */
+               if (!bchannel_before && p_m_b_channel)
+                       enc_ie_channel_id(l3m, 1, p_m_b_channel);
+               end_trace();
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CONNECT_ACKNOWLEDGE, p_m_d_l3id, l3m);
+       }
+       
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CONNECT);
        memcpy(&message->param.connectinfo, &p_connectinfo, sizeof(struct connect_info));
        message_put(message);
@@ -1247,64 +1104,74 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
 }
 
 /* CC_DISCONNECT INDICATION */
-void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       DISCONNECT_t *disconnect = (DISCONNECT_t *)((unsigned long)data + headerlen);
        int location, cause;
        int coding, proglocation, progress;
-       struct message *message;
+       struct lcr_msg *message;
+       unsigned char display[128] = "";
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_progress(disconnect->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &proglocation, &progress);
-       dec_ie_cause(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_IND, DIRECTION_IN);
+       dec_ie_progress(l3m, &coding, &proglocation, &progress);
+       dec_ie_cause(l3m, &location, &cause);
+       dec_ie_display(l3m, (unsigned char *)display, sizeof(display));
        end_trace();
 
-       if (cause < 0)
+       if (cause < 0) {
                cause = 16;
+               location = LOCATION_PRIVATE_LOCAL;
+       }
 
-       /* release if we are remote sends us no tones */
-       if (p_m_mISDNport->is_earlyb)
-       {
-               RELEASE_t *release;
-               msg_t *dmsg;
+       if (progress >= 0) {
+               message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+               message->param.progressinfo.progress = progress;
+               message->param.progressinfo.location = proglocation;
+               message_put(message);
+       }
 
-               dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, dinfo, sizeof(RELEASE_t), p_m_d_ntmode);
-               release = (RELEASE_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_RELEASE | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&release->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */
+       /* release if remote sends us no tones */
+       if (!p_m_mISDNport->earlyb) {
+               l3_msg *l3m;
+
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT);
+               enc_ie_cause(l3m, location, cause); /* normal */
                add_trace("reason", NULL, "no remote patterns");
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE, p_m_d_l3id, l3m);
 
                /* sending release to endpoint */
-               while(p_epointlist)
-               {
+               if (location == LOCATION_PRIVATE_LOCAL)
+                       location = LOCATION_PRIVATE_REMOTE;
+               while(p_epointlist) {
                        message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
                        message->param.disconnectinfo.cause = cause;
                        message->param.disconnectinfo.location = location;
+                       SCAT(message->param.disconnectinfo.display, (char *)display);
                        message_put(message);
                        /* remove epoint */
                        free_epointlist(p_epointlist);
                }
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
 
        /* sending disconnect to active endpoint and release to inactive endpoints */
-       if (ACTIVE_EPOINT(p_epointlist))
-       {
+       if (location == LOCATION_PRIVATE_LOCAL)
+               location = LOCATION_PRIVATE_REMOTE;
+       if (ACTIVE_EPOINT(p_epointlist)) {
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DISCONNECT);
                message->param.disconnectinfo.location = location;
                message->param.disconnectinfo.cause = cause;
+               SCAT(message->param.disconnectinfo.display, (char *)display);
                message_put(message);
        }
-       while(INACTIVE_EPOINT(p_epointlist))
-       {
+       while(INACTIVE_EPOINT(p_epointlist)) {
                message = message_create(p_serial, INACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
                message->param.disconnectinfo.location = location;
                message->param.disconnectinfo.cause = cause;
+               SCAT(message->param.disconnectinfo.display, (char *)display);
                message_put(message);
                /* remove epoint */
                free_epointid(INACTIVE_EPOINT(p_epointlist));
@@ -1313,116 +1180,100 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data)
 }
 
 /* CC_DISCONNECT INDICATION */
-void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::disconnect_ind_i(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       DISCONNECT_t *disconnect = (DISCONNECT_t *)((unsigned long)data + headerlen);
        int location, cause;
 
        /* cause */
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       if (p_m_d_collect_cause > 0)
-       {
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_IND, DIRECTION_IN);
+       if (p_m_d_collect_cause > 0) {
                add_trace("old-cause", "location", "%d", p_m_d_collect_location);
                add_trace("old-cause", "value", "%d", p_m_d_collect_cause);
        }
-       dec_ie_cause(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
-       end_trace();
+       dec_ie_cause(l3m, &location, &cause);
+       if (location == LOCATION_PRIVATE_LOCAL)
+               location = LOCATION_PRIVATE_REMOTE;
 
        /* collect cause */
-       if (cause == CAUSE_REJECTED) /* call rejected */
-       {
-               p_m_d_collect_cause = CAUSE_REJECTED;
-               p_m_d_collect_location = location;
-       } else
-       if (cause==CAUSE_NORMAL && p_m_d_collect_cause!=CAUSE_REJECTED) /* reject via hangup */
-       {
-               p_m_d_collect_cause = CAUSE_NORMAL;
-               p_m_d_collect_location = location;
-       } else
-       if (cause==CAUSE_BUSY && p_m_d_collect_cause!=CAUSE_REJECTED && p_m_d_collect_cause!=CAUSE_NORMAL) /* busy */
-       {
-               p_m_d_collect_cause = CAUSE_BUSY;
-               p_m_d_collect_location = location;
-       } else
-       if (cause==CAUSE_OUTOFORDER && p_m_d_collect_cause!=CAUSE_BUSY && p_m_d_collect_cause!=CAUSE_REJECTED && p_m_d_collect_cause!=CAUSE_NORMAL) /* no L1 */
-       {
-               p_m_d_collect_cause = CAUSE_OUTOFORDER;
-               p_m_d_collect_location = location;
-       } else
-       if (cause!=0 && cause!=CAUSE_NOUSER && p_m_d_collect_cause!=CAUSE_OUTOFORDER && p_m_d_collect_cause!=CAUSE_BUSY && p_m_d_collect_cause!=CAUSE_REJECTED && p_m_d_collect_cause!=CAUSE_NORMAL) /* anything if cause exists and not 18 */
-       {
-               p_m_d_collect_cause = cause;
-               p_m_d_collect_location = location;
-       }
+       collect_cause(&p_m_d_collect_cause, &p_m_d_collect_location, cause, location);
        add_trace("new-cause", "location", "%d", p_m_d_collect_location);
        add_trace("new-cause", "value", "%d", p_m_d_collect_cause);
+       end_trace();
 
 }
 
 /* CC_RELEASE INDICATION */
-void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::release_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       RELEASE_t *release = (RELEASE_t *)((unsigned long)data + headerlen);
-       msg_t *dmsg;
        int location, cause;
-       struct message *message;
+       struct lcr_msg *message;
+       unsigned char display[128] = "";
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_cause(release->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_IND, DIRECTION_IN);
+       dec_ie_cause(l3m, &location, &cause);
+       dec_ie_display(l3m, (unsigned char *)display, sizeof(display));
        end_trace();
 
-       if (cause < 0)
+       if (cause < 0) {
                cause = 16;
+               location = LOCATION_PRIVATE_LOCAL;
+       }
 
        /* sending release to endpoint */
-       while(p_epointlist)
-       {
+       if (location == LOCATION_PRIVATE_LOCAL)
+               location = LOCATION_PRIVATE_REMOTE;
+       while(p_epointlist) {
                message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
                message->param.disconnectinfo.cause = cause;
                message->param.disconnectinfo.location = location;
+               SCAT(message->param.disconnectinfo.display, (char *)display);
                message_put(message);
                /* remove epoint */
                free_epointlist(p_epointlist);
        }
 
-       /* only in NT mode we must send release_complete, if we got a release confirm */
-       if (prim == (CC_RELEASE | CONFIRM))
-       {
-               /* sending release complete */
-               RELEASE_COMPLETE_t *release_complete;
+       new_state(PORT_STATE_RELEASE);
+       trigger_work(&p_m_d_delete);
+}
 
-               dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
-               release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16);
-               end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
-       }
+/* CC_RESTART INDICATION */
+void Pdss1::restart_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_RESTART_IND, DIRECTION_IN);
+       end_trace();
 
-       new_state(PORT_STATE_RELEASE);
-       p_m_delete = 1;
+       // L3 process is not toucht. (not even by network stack)
 }
 
-/* CC_RELEASE_COMPLETE INDICATION */
-void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void *data)
+/* CC_RELEASE_COMPLETE INDICATION (a reject) */
+void Pdss1::release_complete_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       RELEASE_COMPLETE_t *release_complete = (RELEASE_COMPLETE_t *)((unsigned long)data + headerlen);
        int location, cause;
-       struct message *message;
-
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_cause(release_complete->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
+       struct lcr_msg *message;
+       
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_IND, DIRECTION_IN);
+       /* in case layer 2 is down during setup, we send cause 27 loc 5 */
+       if (p_state == PORT_STATE_OUT_SETUP && p_m_mISDNport->l1link == 0) {
+               cause = 27;
+               location = 5;
+       } else {
+               dec_ie_cause(l3m, &location, &cause);
+               if (p_m_mISDNport->l1link < 0)
+                       add_trace("layer 1", NULL, "unknown");
+               else
+                       add_trace("layer 1", NULL, (p_m_mISDNport->l1link)?"up":"down");
+       }
        end_trace();
+       if (location == LOCATION_PRIVATE_LOCAL)
+               location = LOCATION_PRIVATE_REMOTE;
 
-       if (cause < 0)
+       if (cause < 0) {
                cause = 16;
+               location = LOCATION_PRIVATE_LOCAL;
+       }
 
        /* sending release to endpoint */
-       while(p_epointlist)
-       {
+       while(p_epointlist) {
                message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
                message->param.disconnectinfo.cause = cause;
                message->param.disconnectinfo.location = location;
@@ -1432,42 +1283,27 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void *
        }
 
        new_state(PORT_STATE_RELEASE);
-       p_m_delete = 1;
+       trigger_work(&p_m_d_delete);
 }
 
 /* T312 timeout  */
-void Pdss1::t312_timeout(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::t312_timeout_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       struct message *message;
-
-       // trace is done at message_isdn()
-       
-       /* sending release to endpoint */
-       while(p_epointlist)
-       {
-               message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
-               message->param.disconnectinfo.cause = p_m_d_collect_cause;
-               message->param.disconnectinfo.location = p_m_d_collect_location;
-               message_put(message);
-               /* remove epoint */
-               free_epointlist(p_epointlist);
-       }
-
-       new_state(PORT_STATE_RELEASE);
-       p_m_delete = 1;
+       // not required, release is performed with MT_FREE
 }
 
 /* CC_NOTIFY INDICATION */
-void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::notify_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       NOTIFY_t *notifying = (NOTIFY_t *)((unsigned long)data + headerlen);
-       struct message *message;
+       struct lcr_msg *message;
        int notify, type, plan, present;
+       unsigned char notifyid[sizeof(message->param.notifyinfo.id)];
+       unsigned char display[128] = "";
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_notify(notifying->NOTIFY, (Q931_info_t *)((unsigned long)data+headerlen), &notify);
-       dec_ie_redir_dn(notifying->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)message->param.notifyinfo.id, sizeof(message->param.notifyinfo.id));
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_IND, DIRECTION_IN);
+       dec_ie_notify(l3m, &notify);
+       dec_ie_redir_dn(l3m, &type, &plan, &present, notifyid, sizeof(notifyid));
+       dec_ie_display(l3m, (unsigned char *)display, sizeof(display));
        end_trace();
 
        if (!ACTIVE_EPOINT(p_epointlist))
@@ -1478,9 +1314,9 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data)
        notify |= 0x80;
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_NOTIFY);
        message->param.notifyinfo.notify = notify;
+       SCPY(message->param.notifyinfo.id, (char *)notifyid);
        /* redirection number */
-       switch (present)
-       {
+       switch (present) {
                case 1:
                message->param.notifyinfo.present = INFO_PRESENT_RESTRICTED;
                break;
@@ -1491,11 +1327,9 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data)
                message->param.notifyinfo.present = INFO_PRESENT_ALLOWED;
                break;
        }
-       switch (type)
-       {
+       switch (type) {
                case -1:
-               message->param.notifyinfo.ntype = INFO_NTYPE_UNKNOWN;
-               message->param.notifyinfo.present = INFO_PRESENT_NULL;
+               message->param.notifyinfo.ntype = INFO_NTYPE_NOTPRESENT;
                break;
                case 1:
                message->param.notifyinfo.ntype = INFO_NTYPE_INTERNATIONAL;
@@ -1510,34 +1344,28 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data)
                message->param.notifyinfo.ntype = INFO_NTYPE_UNKNOWN;
                break;
        }
+       SCAT(message->param.notifyinfo.display, (char *)display);
        message->param.notifyinfo.isdn_port = p_m_portnum;
        message_put(message);
 }
 
 
 /* CC_HOLD INDICATION */
-void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
+       struct lcr_msg *message;
+void Pdss1::hold_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-//     HOLD_t *hold = (HOLD_t *)((unsigned long)data + headerlen);
-       struct message *message;
-       HOLD_REJECT_t *hold_reject;
-       HOLD_ACKNOWLEDGE_t *hold_acknowledge;
-       msg_t *dmsg;
 //     class Endpoint *epoint;
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_IND, DIRECTION_IN);
        end_trace();
 
-       if (!ACTIVE_EPOINT(p_epointlist) || p_m_hold)
-       {
-               dmsg = create_l3msg(CC_HOLD_REJECT | REQUEST, MT_HOLD_REJECT, dinfo, sizeof(HOLD_REJECT_t), p_m_d_ntmode);
-               hold_reject = (HOLD_REJECT_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_HOLD_REJECT | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&hold_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, p_m_hold?101:31); /* normal unspecified / incompatible state */
+       if (!ACTIVE_EPOINT(p_epointlist) || p_m_hold) {
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_REJECT_REQ, DIRECTION_OUT);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, p_m_hold?101:31); /* normal unspecified / incompatible state */
                add_trace("reason", NULL, "no endpoint");
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_HOLD_REJECT, p_m_d_l3id, l3m);
 
                return;
        }
@@ -1549,59 +1377,49 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
        message_put(message);
 
        /* deactivate bchannel */
-       chan_trace_header("CHANNEL RELEASE (hold)");
+       chan_trace_header(p_m_mISDNport, this, "CHANNEL RELEASE (hold)", DIRECTION_NONE);
        add_trace("disconnect", "channel", "%d", p_m_b_channel);
        end_trace();
-       free_bchannel();
-prüfen, ob bei allen alloc_bchannel/free_bchannel ein trace erfolgt
+       drop_bchannel();
 
        /* set hold state */
        p_m_hold = 1;
 #if 0
        epoint = find_epoint_id(ACTIVE_EPOINT(p_epointlist));
-       if (epoint && p_m_d_ntmode)
-       {
-               p_m_timeout = p_settings.tout_hold;
-               time(&p_m_timer);
+       if (epoint && p_m_d_ntmode) {
+               if (p_settings.tout_hold)
+                       schedule_timer(&p_m_timeout, p_settings.tout_hold, 0);
        }
 #endif
 
        /* acknowledge hold */
-       dmsg = create_l3msg(CC_HOLD_ACKNOWLEDGE | REQUEST, MT_HOLD_ACKNOWLEDGE, dinfo, sizeof(HOLD_ACKNOWLEDGE_t), p_m_d_ntmode);
-       hold_acknowledge = (HOLD_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_HOLD_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_ACKNOWLEDGE_REQ, DIRECTION_OUT);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_HOLD_ACKNOWLEDGE, p_m_d_l3id, l3m);
 }
 
 
 /* CC_RETRIEVE INDICATION */
-void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::retrieve_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       RETRIEVE_t *retrieve = (RETRIEVE_t *)((unsigned long)data + headerlen);
-       RETRIEVE_REJECT_t *retrieve_reject;
-       RETRIEVE_ACKNOWLEDGE_t *retrieve_acknowledge;
-       struct message *message;
+       struct lcr_msg *message;
        int channel, exclusive, cause;
-       msg_t *dmsg;
        int ret;
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_channel_id(retrieve->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_RETRIEVE_IND, DIRECTION_IN);
+       dec_ie_channel_id(l3m, &exclusive, &channel);
        end_trace();
 
-       if (!p_m_hold)
-       {
+       if (!p_m_hold) {
                cause = 101; /* incompatible state */
                reject:
 
-               dmsg = create_l3msg(CC_RETRIEVE_REJECT | REQUEST, MT_RETRIEVE_REJECT, dinfo, sizeof(RETRIEVE_REJECT_t), p_m_d_ntmode);
-               retrieve_reject = (RETRIEVE_REJECT_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_RETRIEVE_REJECT | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&retrieve_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RETRIEVE_REJECT_REQ, DIRECTION_OUT);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RETRIEVE_REJECT, p_m_d_l3id, l3m);
 
                return;
        }
@@ -1612,104 +1430,52 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
        message->param.notifyinfo.local = 1; /* call is retrieved by supplementary service */
        message_put(message);
 
+       /* hunt channel */
+       ret = channel = hunt_bchannel(channel, exclusive);
+       if (ret < 0)
+               goto no_channel;
 
-
-mach den channel-kram, wie beim setup
-
-
-
-
-
-
-
-
-       
-       /* channel_id */
-       chan_trace_header("CHANNEL RELEASE (retrieve)");
-       if (exclusive<0)
-               exclusive = 0;
-alle channels richtig convertieren 
-       if (channel < 0)
-               channel = -1; /* any channel */
-       if (channel == ANY_CHANNEL)
-               channel = -1; /* any channel */
-       if (channel == CHANNEL_NO)
-               add_trace("channel", "request", "no-channel");
-       else
-               add_trace("channel", "request", (channel>0)?"%d%s":"any", channel, exclusive?" (forced)":"");
-       /* debug */
-       if (channel==CHANNEL_NO && (p_type==PORT_TYPE_DSS1_TE_IN||p_type==PORT_TYPE_DSS1_TE_OUT))
-       {
-               add_trace("conclusion", NULL, "incoming call-waiting not supported for TE-mode");
-               end_trace();
-               cause = 6;
-               goto reject;
-       }
        /* open channel */
-       ret = alloc_bchannel(channel, exclusive);
-       if (ret < 0)
-       {
-               PDEBUG(DEBUG_BCHANNEL, "- channel is not available (cause=%d), so we send a retrieve_reject.\n", -ret);
+       ret = seize_bchannel(channel, 1);
+       if (ret < 0) {
+               no_channel:
                cause = -ret;
                goto reject;
        }
+       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-       
        /* set hold state */
        p_m_hold = 0;
-       p_m_timeout = 0;
+       unsched_timer(&p_m_timeout);
 
        /* acknowledge retrieve */
-       dmsg = create_l3msg(CC_RETRIEVE_ACKNOWLEDGE | REQUEST, MT_RETRIEVE_ACKNOWLEDGE, dinfo, sizeof(RETRIEVE_ACKNOWLEDGE_t), p_m_d_ntmode);
-       retrieve_acknowledge = (RETRIEVE_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_RETRIEVE_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
-       enc_ie_channel_id(&retrieve_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_RETRIEVE_ACKNOWLEDGE_REQ, DIRECTION_OUT);
+       enc_ie_channel_id(l3m, 1, p_m_b_channel);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RETRIEVE_ACKNOWLEDGE, p_m_d_l3id, l3m);
 }
 
 /* CC_SUSPEND INDICATION */
-void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       SUSPEND_t *suspend = (SUSPEND_t *)((unsigned long)data + headerlen);
-       SUSPEND_ACKNOWLEDGE_t *suspend_acknowledge;
-       SUSPEND_REJECT_t *suspend_reject;
-       struct message *message;
+       struct lcr_msg *message;
        class Endpoint *epoint;
        unsigned char callid[8];
        int len;
-       msg_t *dmsg;
        int ret = -31; /* normal, unspecified */
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_call_id(suspend->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len);
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_IND, DIRECTION_IN);
+       dec_ie_call_id(l3m, callid, &len);
        end_trace();
 
-       if (!ACTIVE_EPOINT(p_epointlist))
-       {
+       if (!ACTIVE_EPOINT(p_epointlist)) {
                reject:
-               dmsg = create_l3msg(CC_SUSPEND_REJECT | REQUEST, MT_SUSPEND_REJECT, dinfo, sizeof(SUSPEND_REJECT_t), p_m_d_ntmode);
-               suspend_reject = (SUSPEND_REJECT_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&suspend_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_REJECT_REQ, DIRECTION_OUT);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
-
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SUSPEND_REJECT, p_m_d_l3id, l3m);
                return;
        }
 
@@ -1718,13 +1484,10 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
 
        /* check if call id is in use */
        epoint = epoint_first;
-       while(epoint)
-       {
-               if (epoint->ep_park)
-               {
+       while(epoint) {
+               if (epoint->ep_park) {
                        if (epoint->ep_park_len == len)
-                       if (!memcmp(epoint->ep_park_callid, callid, len))
-                       {
+                       if (!memcmp(epoint->ep_park_callid, callid, len)) {
                                ret = -84; /* call id in use */
                                goto reject;
                        }
@@ -1739,14 +1502,13 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
        message_put(message);
 
        /* deactivate bchannel */
-       chan_trace_header("CHANNEL RELEASE (suspend)");
+       chan_trace_header(p_m_mISDNport, this, "CHANNEL RELEASE (suspend)", DIRECTION_NONE);
        add_trace("disconnect", "channel", "%d", p_m_b_channel);
        end_trace();
-       free_bchannel();
+       drop_bchannel();
 
        /* sending suspend to endpoint */
-       while (p_epointlist)
-       {
+       while (p_epointlist) {
                message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_SUSPEND);
                memcpy(message->param.parkinfo.callid, callid, sizeof(message->param.parkinfo.callid));
                message->param.parkinfo.len = len;
@@ -1756,61 +1518,52 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
        }
 
        /* sending SUSPEND_ACKNOWLEDGE */
-       dmsg = create_l3msg(CC_SUSPEND_ACKNOWLEDGE | REQUEST, MT_SUSPEND_ACKNOWLEDGE, dinfo, sizeof(SUSPEND_ACKNOWLEDGE_t), p_m_d_ntmode);
-       suspend_acknowledge = (SUSPEND_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_SUSPEND_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_ACKNOWLEDGE_REQ, DIRECTION_OUT);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SUSPEND_ACKNOWLEDGE, p_m_d_l3id, l3m);
 
        new_state(PORT_STATE_RELEASE);
-       p_m_delete = 1;
+       trigger_work(&p_m_d_delete);
 }
 
 /* CC_RESUME INDICATION */
-void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       RESUME_t *resume = (RESUME_t *)((unsigned long)data + headerlen);
-       RESUME_REJECT_t *resume_reject;
-       RESUME_ACKNOWLEDGE_t *resume_acknowledge;
        unsigned char callid[8];
        int len;
        int channel, exclusive;
-       msg_t *dmsg;
        class Endpoint *epoint;
-       struct message *message;
+       struct lcr_msg *message;
        int ret;
 
-       /* callref from nt-lib */
-       if (p_m_d_ntmode)
-       {
-               /* nt-library now gives us the id via CC_RESUME */
-               if (dinfo&(~0xff) == 0xff00)
-               {
-                       PERROR("fatal software error: l3-stack gives us a process id 0xff00-0xffff\n");
-                       exit(-1);
-               }
-               l1l2l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN);
-               if (p_m_d_l3id)
-                       add_trace("callref", "old", "0x%x", p_m_d_l3id);
-               add_trace("callref", "new", "0x%x", dinfo);
+       /* process given callref */
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_IND, DIRECTION_IN);
+       add_trace("callref", "new", "0x%x", pid);
+       if (p_m_d_l3id) {
+               /* release is case the ID is already in use */
+               add_trace("error", NULL, "callref already in use");
+               end_trace();
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_REJECT_REQ, DIRECTION_OUT);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
+               add_trace("reason", NULL, "callref already in use");
                end_trace();
-               if (p_m_d_l3id&(~0xff) == 0xff00)
-                       p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0;
-               p_m_d_l3id = dinfo;
-               p_m_d_ces = setup->ces;
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_REJECT, pid, l3m);
+               new_state(PORT_STATE_RELEASE);
+               trigger_work(&p_m_d_delete);
+               return;
        }
+       p_m_d_l3id = pid;
+       p_m_d_ces = pid >> 16;
+       end_trace();
 
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_call_id(resume->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len);
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_IND, DIRECTION_IN);
+       dec_ie_call_id(l3m, callid, &len);
        end_trace();
 
        /* if blocked, release call */
-       if (p_m_mISDNport->ifport->block)
-       {
-               RELEASE_COMPLETE_t *release_complete;
-
-               printlog("---  port#%d is blocked.\n", mISDNport->ifport->portnum);
+       if (p_m_mISDNport->ifport->block) {
                ret = -27;
                goto reject;
        }
@@ -1818,40 +1571,41 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
        /* call id */
        if (len<0) len = 0;
 
-       /* channel_id */
+       /* channel_id (no channel is possible in message) */
        exclusive = 0;
        channel = -1; /* any channel */
 
        /* hunt channel */
-       ret = hunt_bchannel(channel, exclusive);
+       ret = channel = hunt_bchannel(channel, exclusive);
        if (ret < 0)
-       {
+               goto no_channel;
+
+// mode (if hdlc parked) to be done. never mind, this is almost never requested
+       /* open channel */
+       ret = seize_bchannel(channel, 1);
+       if (ret < 0) {
+               no_channel:
                reject:
-               dmsg = create_l3msg(CC_RESUME_REJECT | REQUEST, MT_RESUME_REJECT, dinfo, sizeof(RESUME_REJECT_t), p_m_d_ntmode);
-               resume_reject = (RESUME_REJECT_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_RESUME_REJECT | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&resume_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_REJECT_REQ, DIRECTION_OUT);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
                if (ret == -27)
                        add_trace("reason", NULL, "port blocked");
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_REJECT, p_m_d_l3id, l3m);
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
+       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
 
        /* create endpoint */
        if (p_epointlist)
-       {
-               PERROR("SOFTWARE ERROR: incoming resume but already got an endpoint, exitting...\n");
-               exit(-1);
-       }
+               FATAL("Incoming resume but already got an endpoint.\n");
        ret = -85; /* no call suspended */
        epoint = epoint_first;
-       while(epoint)
-       {
-               if (epoint->ep_park)
-               {
+       while(epoint) {
+               if (epoint->ep_park) {
                        ret = -83; /* suspended call exists, but this not */
                        if (epoint->ep_park_len == len)
                        if (!memcmp(epoint->ep_park_callid, callid, len))
@@ -1862,16 +1616,9 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
        if (!epoint)
                goto reject;
 
-       if (!(epointlist_new(epoint->ep_serial)))
-       {
-               PERROR("no memory for epointlist\n");
-               exit(-1);
-       }
-       if (!(epoint->portlist_new(p_serial, p_type, p_m_mISDNport->is_earlyb)))
-       {
-               PERROR("no memory for portlist\n");
-               exit(-1);
-       }
+       epointlist_new(epoint->ep_serial);
+       if (!(epoint->portlist_new(p_serial, p_type, p_m_mISDNport->earlyb)))
+               FATAL("No memory for portlist\n");
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RESUME);
        message_put(message);
 
@@ -1882,134 +1629,160 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
        message_put(message);
 
        /* sending RESUME_ACKNOWLEDGE */
-       dmsg = create_l3msg(CC_RESUME_ACKNOWLEDGE | REQUEST, MT_RESUME_ACKNOWLEDGE, dinfo, sizeof(RESUME_ACKNOWLEDGE_t), p_m_d_ntmode);
-       resume_acknowledge = (RESUME_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_RESUME_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
-       enc_ie_channel_id(&resume_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_ACKNOWLEDGE_REQ, DIRECTION_OUT);
+       enc_ie_channel_id(l3m, 1, p_m_b_channel);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_ACKNOWLEDGE, p_m_d_l3id, l3m);
 
        new_state(PORT_STATE_CONNECT);
 }
 
 
 /* CC_FACILITY INDICATION */
-void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::facility_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       FACILITY_t *facility = (FACILITY_t *)((unsigned long)data + headerlen);
-       unsigned char facil[256];
-       int facil_len;
-       struct message *message;
-
-       l1l2l3_trace_header(prim, DIRECTION_IN);
-       dec_ie_facility(facility->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), facil, &facil_len);
+       unsigned char fac_ie[256];
+       struct asn1_parm fac;
+       int fac_len;
+       struct lcr_msg *message;
+
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_FACILITY_IND, DIRECTION_IN);
+       dec_ie_facility(l3m, fac_ie + 1, &fac_len);
+       fac_ie[0] = fac_len;
        end_trace();
 
        /* facility */
-       if (facil_len<=0)
+       if (fac_len<=0)
                return;
 
+       decodeFac(fac_ie, &fac);
+       switch (fac.comp) {
+       case CompInvoke:
+               switch(fac.u.inv.operationValue) {
+                       case Fac_Begin3PTY:
+                       message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_3PTY);
+                       message->param.threepty.begin = 1;
+                       message->param.threepty.invoke = 1;
+                       message->param.threepty.invoke_id = fac.u.inv.invokeId;
+                       message_put(message);
+                       return;
+
+                       case Fac_End3PTY:
+                       message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_3PTY);
+                       message->param.threepty.end = 1;
+                       message->param.threepty.invoke = 1;
+                       message->param.threepty.invoke_id = fac.u.inv.invokeId;
+                       message_put(message);
+                       return;
+               default:
+                       ;
+               }
+               break;
+       default:
+               ;
+       }
+
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_FACILITY);
-       message->param.facilityinfo.len = facil_len;
-       memcpy(message->param.facilityinfo.data, facil, facil_len);
+       message->param.facilityinfo.len = fac_len;
+       memcpy(message->param.facilityinfo.data, fac_ie + 1, fac_len);
        message_put(message);
 }
 
 
+/* CC_PROGRESS INDICATION */
+void Pdss1::progress_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+       int coding, location, progress;
+
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_PROGRESS_IND, DIRECTION_IN);
+       dec_ie_progress(l3m, &coding, &location, &progress);
+       end_trace();
+
+       if (progress >= 0) {
+               message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+               message->param.progressinfo.progress = progress;
+               message->param.progressinfo.location = location;
+               message_put(message);
+       }
+}
+
+
 /*
  * handler for isdn connections
  * incoming information are parsed and sent via message to the endpoint
  */
-void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
+void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
-       int i;
-       int new_l3id;
-       int timer_hex=0;
+       int timer = 0;
 
-       switch (prim)
-       {
-               case CC_TIMEOUT | INDICATION:
-               l1l2l3_trace_header(prim, DIRECTION_IN);
-               if (p_m_d_ntmode)
-               {
-                       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-                       timer_hex = *((int *)(((char *)data)+headerlen));
+       switch (cmd) {
+               case MT_TIMEOUT:
+               if (!l3m->cause) {
+                       PERROR("Pdss1(%s) timeout without cause.\n", p_name);
+                       break;
+               }
+               if (l3m->cause[0] != 5) {
+                       PERROR("Pdss1(%s) expecting timeout with timer diagnostic. (got len=%d)\n", p_name, l3m->cause[0]);
+                       break;
                }
-               if (timer_hex)
-                       add_trace("timer", NULL, "%x", timer_hex);
+               timer = (l3m->cause[3]-'0')*100;
+               timer += (l3m->cause[4]-'0')*10;
+               timer += (l3m->cause[5]-'0');
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_TIMEOUT_IND, DIRECTION_IN);
+               add_trace("timer", NULL, "%d", timer);
                end_trace();
-               if (timer_hex==0x312 && p_m_d_ntmode)
-                       t312_timeout(prim, dinfo, data);
+               if (timer == 312)
+                       t312_timeout_ind(cmd, pid, l3m);
                break;
 
-               case CC_SETUP | INDICATION:
+               case MT_SETUP:
                if (p_state != PORT_STATE_IDLE)
                        break;
-               setup_ind(prim, dinfo, data);
-               break;
-
-               case CC_SETUP | CONFIRM:
-               if (p_m_d_ntmode)
-               {
-                       l1l2l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN);
-                       add_trace("callref", "old", "0x%x", p_m_d_l3id);
-                       /* nt-library now gives us a new id via CC_SETUP_CONFIRM */
-                       if ((p_m_d_l3id&0xff00) != 0xff00)
-                               PERROR("    strange setup-procid 0x%x\n", p_m_d_l3id);
-                       p_m_d_l3id = *((int *)(((u_char *)data)+ mISDNUSER_HEAD_SIZE));
-                       add_trace("callref", "new", "0x%x", p_m_d_l3id);
-                       end_trace();
-               }
-               end_trace;
+               setup_ind(cmd, pid, l3m);
                break;
 
-               case CC_INFORMATION | INDICATION:
-               information_ind(prim, dinfo, data);
+               case MT_INFORMATION:
+               information_ind(cmd, pid, l3m);
                break;
 
-               case CC_SETUP_ACKNOWLEDGE | INDICATION:
-               if (p_state != PORT_STATE_OUT_SETUP)
-               {
-                       PERROR("Pdss1(%s) received setup_acknowledge, but we are not in outgoing setup state, IGNORING.\n", p_name);
+               case MT_SETUP_ACKNOWLEDGE:
+               if (p_state != PORT_STATE_OUT_SETUP) {
+                       PDEBUG(DEBUG_ISDN, "Pdss1(%s) received setup_acknowledge, but we are not in outgoing setup state, IGNORING.\n", p_name);
                        break;
                }
-               setup_acknowledge_ind(prim, dinfo, data);
+               setup_acknowledge_ind(cmd, pid, l3m);
                break;
 
-               case CC_PROCEEDING | INDICATION:
+               case MT_CALL_PROCEEDING:
                if (p_state != PORT_STATE_OUT_SETUP
-                && p_state != PORT_STATE_OUT_OVERLAP)
-               {
-                       PERROR("Pdss1(%s) received proceeding, but we are not in outgoing setup OR overlap state, IGNORING.\n", p_name);
+                && p_state != PORT_STATE_OUT_OVERLAP) {
+                       PDEBUG(DEBUG_ISDN, "Pdss1(%s) received proceeding, but we are not in outgoing setup OR overlap state, IGNORING.\n", p_name);
                        break;
                }
-               proceeding_ind(prim, dinfo, data);
+               proceeding_ind(cmd, pid, l3m);
                break;
 
-               case CC_ALERTING | INDICATION:
+               case MT_ALERTING:
                if (p_state != PORT_STATE_OUT_SETUP
                 && p_state != PORT_STATE_OUT_OVERLAP
-                && p_state != PORT_STATE_OUT_PROCEEDING)
-               {
-                       PERROR("Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding state, IGNORING.\n", p_name);
+                && p_state != PORT_STATE_OUT_PROCEEDING) {
+                       PDEBUG(DEBUG_ISDN, "Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding state, IGNORING.\n", p_name);
                        break;
                }
-               alerting_ind(prim, dinfo, data);
+               alerting_ind(cmd, pid, l3m);
                break;
 
-               case CC_CONNECT | INDICATION:
+               case MT_CONNECT:
                if (p_state != PORT_STATE_OUT_SETUP
                 && p_state != PORT_STATE_OUT_OVERLAP
                 && p_state != PORT_STATE_OUT_PROCEEDING
-                && p_state != PORT_STATE_OUT_ALERTING)
-               {
-                       PERROR("Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding OR ALERTING state, IGNORING.\n", p_name);
+                && p_state != PORT_STATE_OUT_ALERTING) {
+                       PDEBUG(DEBUG_ISDN, "Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding OR ALERTING state, IGNORING.\n", p_name);
                        break;
                }
-               connect_ind(prim, dinfo, data);
-               if (p_m_d_notify_pending)
-               {
+               connect_ind(cmd, pid, l3m);
+               if (p_m_d_notify_pending) {
                        /* send pending notify message during connect */
                        message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
                        message_free(p_m_d_notify_pending);
@@ -2017,12 +1790,10 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
                }
                break;
 
-               case CC_CONNECT_ACKNOWLEDGE | INDICATION:
-               case CC_CONNECT | CONFIRM:
+               case MT_CONNECT_ACKNOWLEDGE:
                if (p_state == PORT_STATE_CONNECT_WAITING)
                        new_state(PORT_STATE_CONNECT);
-               if (p_m_d_notify_pending)
-               {
+               if (p_m_d_notify_pending) {
                        /* send pending notify message during connect-ack */
                        message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
                        message_free(p_m_d_notify_pending);
@@ -2030,67 +1801,70 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
                }
                break;
 
-               case CC_DISCONNECT | INDICATION:
-               disconnect_ind(prim, dinfo, data);
+               case MT_DISCONNECT:
+               disconnect_ind(cmd, pid, l3m);
+               break;
+
+               case MT_RELEASE:
+               release_ind(cmd, pid, l3m);
                break;
 
-               case CC_RELEASE | CONFIRM:
-               case CC_RELEASE | INDICATION:
-               release_ind(prim, dinfo, data);
+               case MT_RELEASE_COMPLETE:
+               release_complete_ind(cmd, pid, l3m);
                break;
 
-               case CC_RELEASE_COMPLETE | INDICATION:
-               release_complete_ind(prim, dinfo, data);
+               case MT_RESTART:
+               restart_ind(cmd, pid, l3m);
                break;
 
-               case CC_RELEASE_COMPLETE | CONFIRM:
+               case MT_NOTIFY:
+               notify_ind(cmd, pid, l3m);
                break;
 
-               case CC_NOTIFY | INDICATION:
-               notify_ind(prim, dinfo, data);
+               case MT_HOLD:
+               hold_ind(cmd, pid, l3m);
                break;
 
-               case CC_HOLD | INDICATION:
-               hold_ind(prim, dinfo, data);
+               case MT_RETRIEVE:
+               retrieve_ind(cmd, pid, l3m);
                break;
 
-               case CC_RETRIEVE | INDICATION:
-               retrieve_ind(prim, dinfo, data);
+               case MT_SUSPEND:
+               suspend_ind(cmd, pid, l3m);
                break;
 
-               case CC_SUSPEND | INDICATION:
-               suspend_ind(prim, dinfo, data);
+               case MT_RESUME:
+               resume_ind(cmd, pid, l3m);
                break;
 
-               case CC_RESUME | INDICATION:
-               resume_ind(prim, dinfo, data);
+               case MT_FACILITY:
+               facility_ind(cmd, pid, l3m);
                break;
 
-               case CC_FACILITY | INDICATION:
-               facility_ind(prim, dinfo, data);
+               case MT_PROGRESS:
+               progress_ind(cmd, pid, l3m);
                break;
 
-               case CC_RELEASE_CR | INDICATION:
-               l1l2l3_trace_header(CC_RELEASE_CR | INDICATION, DIRECTION_IN);
+               case MT_FREE:
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_L3ID_IND, DIRECTION_IN);
                add_trace("callref", NULL, "0x%x", p_m_d_l3id);
                end_trace();
-               if (p_m_d_ntmode)
-               {
-                       if ((p_m_d_l3id&0xff00) == 0xff00)
-                               p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0;
-               }
                p_m_d_l3id = 0;
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
+               p_m_d_ces = -1;
                /* sending release to endpoint in case we still have an endpoint
-                * NOTE: this only happens if the stack releases due to layer1
-                * or layer2 breakdown. otherwhise a release is received first.
+                * this is because we don't get any response if a release_complete is received (or a release in release state)
                 */
-               while(p_epointlist)
-               {
-                       struct message *message;
+               while(p_epointlist) { // only if not already released
+                       struct lcr_msg *message;
                        message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
-                       message->param.disconnectinfo.cause = (p_m_d_collect_cause!=CAUSE_NOUSER)?p_m_d_collect_cause:CAUSE_UNSPECIFIED;
-                       message->param.disconnectinfo.location = (p_m_d_collect_cause!=CAUSE_NOUSER)?p_m_d_collect_location:LOCATION_PRIVATE_LOCAL;
+                       if (p_m_d_collect_cause) {
+                               message->param.disconnectinfo.cause = p_m_d_collect_cause;
+                               message->param.disconnectinfo.location = p_m_d_collect_location;
+                       } else {
+                               message->param.disconnectinfo.cause = CAUSE_NOUSER;
+                               message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+                       }
                        message_put(message);
                        /* remove epoint */
                        free_epointlist(p_epointlist);
@@ -2099,75 +1873,52 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
                }
                break;
 
-               case CC_NEW_CR | INDICATION:
-               l1l2l3_trace_header(prim, DIRECTION_IN);
-               if (p_m_d_l3id)
-                       add_trace("callref", "old", "0x%x", p_m_d_l3id);
-               if (p_m_d_ntmode)
-               {
-                       new_l3id = *((int *)(((u_char *)data+mISDNUSER_HEAD_SIZE)));
-                       if (((new_l3id&0xff00)!=0xff00) && ((p_m_d_l3id&0xff00)==0xff00))
-                               p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0;
-               } else
-               {
-                       new_l3id = dinfo;
-               }
-               p_m_d_l3id = new_l3id;
-               add_trace("callref", "new", "0x%x", p_m_d_l3id);
-               end_trace();
-               break;
-
                default:
-               l1l2l3_trace_header(prim, DIRECTION_IN);
-               add_trace("unhandled", "prim", "0x%x", prim);
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_UNKNOWN_IND, DIRECTION_IN);
+               add_trace("unhandled", "cmd", "0x%x", cmd);
                end_trace();
        }
 }
 
 void Pdss1::new_state(int state)
 {
-       class Endpoint *epoint;
+//     class Endpoint *epoint;
 
        /* set timeout */
-       epoint = find_epoint_id(ACTIVE_EPOINT(p_epointlist));
-       if (epoint && p_m_d_ntmode)
-       {
-               if (state == PORT_STATE_IN_OVERLAP)
-               {
-                       p_m_timeout = p_settings.tout_dialing;
-                       time(&p_m_timer);
+       if (state == PORT_STATE_IN_OVERLAP) {
+               if (p_m_mISDNport->ifport->tout_dialing)
+                       schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_dialing, 0);
+       }
+       if (state != p_state) {
+               unsched_timer(&p_m_timeout);
+               if (state == PORT_STATE_IN_SETUP
+                || state == PORT_STATE_OUT_SETUP
+                || state == PORT_STATE_IN_OVERLAP
+                || state == PORT_STATE_OUT_OVERLAP) {
+                       if (p_m_mISDNport->ifport->tout_setup)
+                               schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_setup, 0);
+               }
+               if (state == PORT_STATE_IN_PROCEEDING
+                || state == PORT_STATE_OUT_PROCEEDING) {
+                       if (p_m_mISDNport->ifport->tout_proceeding)
+                               schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_proceeding, 0);
+               }
+               if (state == PORT_STATE_IN_ALERTING
+                || state == PORT_STATE_OUT_ALERTING) {
+                       if (p_m_mISDNport->ifport->tout_alerting)
+                               schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_alerting, 0);
                }
-               if (state != p_state)
-               {
-                       if (state == PORT_STATE_IN_SETUP
-                        || state == PORT_STATE_IN_OVERLAP)
-                       {
-                               p_m_timeout = p_settings.tout_setup;
-                               time(&p_m_timer);
-                       }
-                       if (state == PORT_STATE_IN_PROCEEDING
-                        || state == PORT_STATE_OUT_PROCEEDING)
-                       {
-                               p_m_timeout = p_settings.tout_proceeding;
-                               time(&p_m_timer);
-                       }
-                       if (state == PORT_STATE_IN_ALERTING
-                        || state == PORT_STATE_OUT_ALERTING)
-                       {
-                               p_m_timeout = p_settings.tout_alerting;
-                               time(&p_m_timer);
-                       }
-                       if (state == PORT_STATE_CONNECT
-                        || state == PORT_STATE_CONNECT_WAITING)
-                       {
-                               p_m_timeout = 0;
-                       }
-                       if (state == PORT_STATE_IN_DISCONNECT
-                        || state == PORT_STATE_OUT_DISCONNECT)
-                       {
-                               p_m_timeout = p_settings.tout_disconnect;
-                               time(&p_m_timer);
-                       }
+#if 0
+               if (state == PORT_STATE_CONNECT
+                || state == PORT_STATE_CONNECT_WAITING) {
+                       if (p_m_mISDNport->ifport->tout_connect)
+                               schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_connect, 0);
+               }
+#endif
+               if (state == PORT_STATE_IN_DISCONNECT
+                || state == PORT_STATE_OUT_DISCONNECT) {
+                       if (p_m_mISDNport->ifport->tout_disconnect)
+                               schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_disconnect, 0);
                }
        }
        
@@ -2175,24 +1926,15 @@ void Pdss1::new_state(int state)
 }
 
 
-/*
- * handler
- */
-int Pdss1::handler(void)
+/* deletes only if l3id is release, otherwhise it will be triggered then */
+static int delete_event(struct lcr_work *work, void *instance, int index)
 {
-       int ret;
+       class Pdss1 *isdnport = (class Pdss1 *)instance;
 
-       if ((ret = Port::handler()))
-               return(ret);
+       if (!isdnport->p_m_d_l3id)
+               delete isdnport;
 
-       /* handle destruction */
-       if (p_m_delete && p_m_d_l3id==0)
-       {
-               delete this;
-               return(-1);
-       }
-
-       return(0);
+       return 0;
 }
 
 
@@ -2200,49 +1942,56 @@ int Pdss1::handler(void)
  * handles all messages from endpoint
  */
 /* MESSAGE_INFORMATION */
-void Pdss1::message_information(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_information(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       INFORMATION_t *information;
-       msg_t *dmsg;
-
-       if (param->information.number[0]) /* only if we have something to dial */
-       {
-               dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode);
-               l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT);
-               information = (INFORMATION_t *)(dmsg->data + headerlen);
-               enc_ie_called_pn(&information->CALLED_PN, dmsg, 0, 1, (unsigned char *)param->information.number);
+       l3_msg *l3m;
+       char *display = param->information.display;
+       char *number = param->information.id;
+       int max = p_m_mISDNport->ifport->dialmax;
+
+       while (number[0]) { /* as long we have something to dial */
+               if (max > (int)strlen(number) || max == 0)
+                       max = (int)strlen(number);
+      
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
+               enc_ie_called_pn(l3m, 0, 1, (unsigned char *)number, max);
+               if ((p_m_d_ntmode || p_m_d_tespecial) && display[0]) {
+                       enc_ie_display(l3m, (unsigned char *)display);
+                       display = (char *)"";
+               }
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m);
+               number += max;
        }
        new_state(p_state);
 }
 
 
-int newteid = 0;
-
 /* MESSAGE_SETUP */
-void Pdss1::message_setup(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_setup(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       INFORMATION_t *information;
-       SETUP_t *setup;
-       msg_t *dmsg;
+       l3_msg *l3m;
+#ifdef OLD_MT_ASSIGN
+       int ret;
+#endif
        int plan, type, screen, present, reason;
+       int plan2, type2, screen2, present2;
        int capability, mode, rate, coding, user, presentation, interpretation, hlc, exthlc;
        int channel, exclusive;
-       int i;
        struct epoint_list *epointlist;
+       int max = p_m_mISDNport->ifport->dialmax;
 
        /* release if port is blocked */
-       if (p_m_mISDNport->ifport->block)
-       {
+       if (p_m_mISDNport->ifport->block) {
+               struct lcr_msg *message;
+
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
                message->param.disconnectinfo.cause = 27; // temp. unavail.
                message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
                message_put(message);
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
 
@@ -2251,49 +2000,41 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
        memcpy(&p_dialinginfo, &param->setup.dialinginfo, sizeof(p_dialinginfo));
        memcpy(&p_capainfo, &param->setup.capainfo, sizeof(p_capainfo));
        memcpy(&p_redirinfo, &param->setup.redirinfo, sizeof(p_redirinfo));
-//             SCPY(&p_m_tones_dir, param->setup.ext.tones_dir);
+       /* screen outgoing caller id */
+       do_screen(1, p_callerinfo.id, sizeof(p_callerinfo.id), &p_callerinfo.ntype, &p_callerinfo.present, p_m_mISDNport->ifport->interface->name);
+       do_screen(1, p_callerinfo.id2, sizeof(p_callerinfo.id2), &p_callerinfo.ntype2, &p_callerinfo.present2, p_m_mISDNport->ifport->interface->name);
+       do_screen(1, p_redirinfo.id, sizeof(p_redirinfo.id), &p_redirinfo.ntype, &p_redirinfo.present, p_m_mISDNport->ifport->interface->name);
 
        /* only display at connect state: this case happens if endpoint is in connected mode */
-       if (p_state==PORT_STATE_CONNECT)
-       {
+       if (p_state==PORT_STATE_CONNECT) {
                if (p_type!=PORT_TYPE_DSS1_NT_OUT
                 && p_type!=PORT_TYPE_DSS1_NT_IN)
                        return;
-               if (p_callerinfo.display[0])
-               {
+               if (p_callerinfo.display[0]) {
                        /* sending information */
-                       dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode);
-                       information = (INFORMATION_t *)(dmsg->data + headerlen);
-                       l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT);
-                       if (p_m_d_ntmode)
-                               enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_callerinfo.display);
+                       l3m = create_l3msg();
+                       l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
+                       if (p_m_d_ntmode || p_m_d_tespecial)
+                               enc_ie_display(l3m, (unsigned char *)p_callerinfo.display);
                        end_trace();
-                       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+                       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m);
                        return;
                }
        }
 
        /* attach only if not already */
        epointlist = p_epointlist;
-       while(epointlist)
-       {
+       while(epointlist) {
                if (epointlist->epoint_id == epoint_id)
                        break;
                epointlist = epointlist->next;
        }
        if (!epointlist)
-       {
-               if (!(epointlist_new(epoint_id)))
-               {
-                       PERROR("no memory for epointlist\n");
-                       exit(-1);
-               }
-       }
+               epointlist_new(epoint_id);
 
        /* get channel */
        exclusive = 0;
-       if (p_m_b_channel)
-       {
+       if (p_m_b_channel) {
                channel = p_m_b_channel;
                exclusive = p_m_b_exclusive;
        } else
@@ -2303,65 +2044,50 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                channel = CHANNEL_NO;
 
        /* creating l3id */
-       l1l2l3_trace_header(CC_NEW_CR | REQUEST, DIRECTION_OUT);
-       if (p_m_d_ntmode)
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_REQ, DIRECTION_OUT);
+#ifdef OLD_MT_ASSIGN
+       /* see MT_ASSIGN notes at do_layer3() */
+       mt_assign_pid = 0;
+       ret = p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_ASSIGN, 0, NULL);
+       if (mt_assign_pid == 0 || ret < 0)
+       p_m_d_l3id = mt_assign_pid;
+       mt_assign_pid = ~0;
+#else
+       p_m_d_l3id = request_new_pid(p_m_mISDNport->ml3);
+       if (p_m_d_l3id == MISDN_PID_NONE)
+#endif
        {
-               i = 0;
-               while(i < 0x100)
-               {
-                       if (p_m_mISDNport->procids[i] == 0)
-                               break;
-                       i++;
-               }
-               if (i == 0x100)
-               {
-                       struct message *message;
+               struct lcr_msg *message;
 
-                       add_trace("callref", NULL, "no free id");
-                       end_trace();
-                       message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
-                       message->param.disconnectinfo.cause = 47;
-                       message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
-                       message_put(message);
-                       new_state(PORT_STATE_RELEASE);
-                       p_m_delete = 1;
-                       return;
-               }
-               p_m_mISDNport->procids[i] = 1;
-               p_m_d_l3id = 0xff00 | i;
-       } else
-       {
-               iframe_t ncr;
-               /* if we are in te-mode, we need to create a process first */
-               if (newteid++ > 0x7fff)
-                       newteid = 0x0001;
-               p_m_d_l3id = (entity<<16) | newteid;
-               /* preparing message */
-               ncr.prim = CC_NEW_CR | REQUEST; 
-               ncr.addr = p_m_mISDNport->upper_id | FLG_MSG_DOWN;
-               ncr.dinfo = p_m_d_l3id;
-               ncr.len = 0;
-               /* send message */
-               mISDN_write(mISDNdevice, &ncr, mISDN_HEADER_LEN+ncr.len, TIMEOUT_1SEC);
-//             if (!dmsg)
-//                     goto nomem;
+               add_trace("callref", NULL, "no free id");
+               end_trace();
+               message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
+               message->param.disconnectinfo.cause = 47;
+               message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+               message_put(message);
+               new_state(PORT_STATE_RELEASE);
+               trigger_work(&p_m_d_delete);
+               return;
        }
+#ifdef OLD_MT_ASSIGN
+       p_m_d_l3id = mt_assign_pid;
+       mt_assign_pid = ~0;
+#endif
        add_trace("callref", "new", "0x%x", p_m_d_l3id);
        end_trace();
 
        /* preparing setup message */
-       dmsg = create_l3msg(CC_SETUP | REQUEST, MT_SETUP, p_m_d_l3id, sizeof(SETUP_t), p_m_d_ntmode);
-       l1l2l3_trace_header(CC_SETUP | REQUEST, DIRECTION_OUT);
-       setup = (SETUP_t *)(dmsg->data + headerlen);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_REQ, DIRECTION_OUT);
        /* channel information */
-       if (channel >= 0) /* it should */
-       {
-               enc_ie_channel_id(&setup->CHANNEL_ID, dmsg, exclusive, channel);
-       }
+       if (p_m_d_ntmode || channel != CHANNEL_ANY) /* only omit channel id in te-mode/any channel */
+               enc_ie_channel_id(l3m, exclusive, channel);
        /* caller information */
        plan = 1;
-       switch (p_callerinfo.ntype)
-       {
+       switch (p_callerinfo.ntype) {
+               case INFO_NTYPE_UNKNOWN:
+               type = 0x0;
+               break;
                case INFO_NTYPE_INTERNATIONAL:
                type = 0x1;
                break;
@@ -2371,50 +2097,104 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                case INFO_NTYPE_SUBSCRIBER:
                type = 0x4;
                break;
-               default: /* INFO_NTYPE_UNKNOWN */
-               type = 0x0;
+               default: /* INFO_NTYPE_NOTPRESENT */
+               type = -1;
                break;
        }
-       switch (p_callerinfo.screen)
-       {
+       switch (p_callerinfo.screen) {
                case INFO_SCREEN_USER:
                screen = 0;
                break;
+               case INFO_SCREEN_USER_VERIFIED_PASSED:
+               screen = 1;
+               break;
+               case INFO_SCREEN_USER_VERIFIED_FAILED:
+               screen = 2;
+               break;
                default: /* INFO_SCREEN_NETWORK */
                screen = 3;
                break;
        }
-       switch (p_callerinfo.present)
-       {
+       switch (p_callerinfo.present) {
+               case INFO_PRESENT_ALLOWED:
+               present = 0;
+               break;
                case INFO_PRESENT_RESTRICTED:
                present = 1;
                break;
-               case INFO_PRESENT_NOTAVAIL:
+               default: /* INFO_PRESENT_NOTAVAIL */
                present = 2;
                break;
-               default: /* INFO_PRESENT_ALLOWED */
-               present = 0;
+       }
+       /* caller information 2 */
+       plan2 = 1;
+       switch (p_callerinfo.ntype2) {
+               case INFO_NTYPE_UNKNOWN:
+               type2 = 0x0;
+               break;
+               case INFO_NTYPE_INTERNATIONAL:
+               type2 = 0x1;
+               break;
+               case INFO_NTYPE_NATIONAL:
+               type2 = 0x2;
+               break;
+               case INFO_NTYPE_SUBSCRIBER:
+               type2 = 0x4;
+               break;
+               default: /* INFO_NTYPE_NOTPRESENT */
+               type2 = -1;
+               break;
+       }
+       switch (p_callerinfo.screen2) {
+               case INFO_SCREEN_USER:
+               screen2 = 0;
+               break;
+               case INFO_SCREEN_USER_VERIFIED_PASSED:
+               screen2 = 1;
+               break;
+               case INFO_SCREEN_USER_VERIFIED_FAILED:
+               screen2 = 2;
+               break;
+               default: /* INFO_SCREEN_NETWORK */
+               screen2 = 3;
+               break;
+       }
+       switch (p_callerinfo.present2) {
+               case INFO_PRESENT_ALLOWED:
+               present2 = 0;
+               break;
+               case INFO_PRESENT_RESTRICTED:
+               present2 = 1;
+               break;
+               default: /* INFO_PRESENT_NOTAVAIL */
+               present2 = 2;
                break;
        }
        if (type >= 0)
-               enc_ie_calling_pn(&setup->CALLING_PN, dmsg, type, plan, present, screen, (unsigned char *)p_callerinfo.id);
+               enc_ie_calling_pn(l3m, type, plan, present, screen, (unsigned char *)p_callerinfo.id, type2, plan2, present2, screen2, (unsigned char *)p_callerinfo.id2);
        /* dialing information */
-       if (p_dialinginfo.number[0]) /* only if we have something to dial */
-       {
-               enc_ie_called_pn(&setup->CALLED_PN, dmsg, 0, 1, (unsigned char *)p_dialinginfo.number);
-       }
+       if (p_dialinginfo.id[0]) { /* only if we have something to dial */
+               if (max > (int)strlen(p_dialinginfo.id) || max == 0)
+                       max = (int)strlen(p_dialinginfo.id);
+               enc_ie_called_pn(l3m, 0, 1, (unsigned char *)p_dialinginfo.id, max);
+               SCPY(p_m_d_queue, p_dialinginfo.id + max);
+       }
+       /* keypad */
+       if (p_dialinginfo.keypad[0])
+               enc_ie_keypad(l3m, (unsigned char *)p_dialinginfo.keypad);
        /* sending complete */
        if (p_dialinginfo.sending_complete)
-               enc_ie_complete(&setup->COMPLETE, dmsg, 1);
+               enc_ie_complete(l3m, 1);
        /* sending user-user */
-       if (param->setup.useruser.len)
-       {
-               enc_ie_useruser(&setup->USER_USER, dmsg, param->setup.useruser.protocol, param->setup.useruser.data, param->setup.useruser.len);
+       if (param->setup.useruser.len) {
+               enc_ie_useruser(l3m, param->setup.useruser.protocol, param->setup.useruser.data, param->setup.useruser.len);
        }
        /* redirecting number */
        plan = 1;
-       switch (p_redirinfo.ntype)
-       {
+       switch (p_redirinfo.ntype) {
+               case INFO_NTYPE_UNKNOWN:
+               type = 0x0;
+               break;
                case INFO_NTYPE_INTERNATIONAL:
                type = 0x1;
                break;
@@ -2424,21 +2204,25 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                case INFO_NTYPE_SUBSCRIBER:
                type = 0x4;
                break;
-               default: /* INFO_NTYPE_UNKNOWN */
-               type = 0x0;
+               default: /* INFO_NTYPE_NOTPRESENT */
+               type = -1;
                break;
        }
-       switch (p_redirinfo.screen)
-       {
+       switch (p_redirinfo.screen) {
                case INFO_SCREEN_USER:
                screen = 0;
                break;
+               case INFO_SCREEN_USER_VERIFIED_PASSED:
+               screen = 1;
+               break;
+               case INFO_SCREEN_USER_VERIFIED_FAILED:
+               screen = 2;
+               break;
                default: /* INFO_SCREE_NETWORK */
                screen = 3;
                break;
        }
-       switch (p_redirinfo.reason)
-       {
+       switch (p_redirinfo.reason) {
                case INFO_REDIR_BUSY:
                reason = 1;
                break;
@@ -2458,36 +2242,27 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                reason = 0;
                break;
        }
-       switch (p_redirinfo.present)
-       {
-               case INFO_PRESENT_NULL: /* no redir at all */
-               present = -1;
-               screen = -1;
-               reason = -1;
-               plan = -1;
-               type = -1;
+       switch (p_redirinfo.present) {
+               case INFO_PRESENT_ALLOWED:
+               present = 0;
                break;
                case INFO_PRESENT_RESTRICTED:
                present = 1;
                break;
-               case INFO_PRESENT_NOTAVAIL:
+               default: /* INFO_PRESENT_NOTAVAIL */
                present = 2;
                break;
-               default: /* INFO_PRESENT_ALLOWED */
-               present = 0;
-               break;
        }
        /* sending redirecting number only in ntmode */
-       if (type >= 0 && p_m_d_ntmode)
-               enc_ie_redir_nr(&setup->REDIR_NR, dmsg, type, plan, present, screen, reason, (unsigned char *)p_redirinfo.id);
+       if (type >= 0 && (p_m_d_ntmode || p_m_d_tespecial))
+               enc_ie_redir_nr(l3m, type, plan, present, screen, reason, (unsigned char *)p_redirinfo.id);
        /* bearer capability */
 //printf("hlc=%d\n",p_capainfo.hlc);
        coding = 0;
        capability = p_capainfo.bearer_capa;
        mode = p_capainfo.bearer_mode;
        rate = (mode==INFO_BMODE_CIRCUIT)?0x10:0x00;
-       switch (p_capainfo.bearer_info1)
-       {
+       switch (p_capainfo.bearer_info1) {
                case INFO_INFO1_NONE:
                user = -1;
                break;
@@ -2495,10 +2270,9 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                user = p_capainfo.bearer_info1 & 0x7f;
                break;
        }
-       enc_ie_bearer(&setup->BEARER, dmsg, coding, capability, mode, rate, -1, user);
+       enc_ie_bearer(l3m, coding, capability, mode, rate, -1, user);
        /* hlc */
-       if (p_capainfo.hlc)
-       {
+       if (p_capainfo.hlc) {
                coding = 0;
                interpretation = 4;
                presentation = 1;
@@ -2506,69 +2280,99 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                exthlc = -1;
                if (p_capainfo.exthlc)
                        exthlc = p_capainfo.exthlc & 0x7f;
-               enc_ie_hlc(&setup->HLC, dmsg, coding, interpretation, presentation, hlc, exthlc);
+               enc_ie_hlc(l3m, coding, interpretation, presentation, hlc, exthlc);
        }
 
        /* display */
-       if (p_callerinfo.display[0] && p_m_d_ntmode)
-               enc_ie_display(&setup->DISPLAY, dmsg, (unsigned char *)p_callerinfo.display);
-#ifdef CENTREX
+       if (p_callerinfo.display[0] && (p_m_d_ntmode || p_m_d_tespecial))
+               enc_ie_display(l3m, (unsigned char *)p_callerinfo.display);
        /* nt-mode: CNIP (calling name identification presentation) */
-       if (p_callerinfo.name[0] && p_m_d_ntmode)
-               enc_facility_centrex(&setup->FACILITY, dmsg, (unsigned char *)p_callerinfo.name, 1);
-#endif
+//     if (p_callerinfo.name[0] && (p_m_d_ntmode || p_m_d_tespecial))
+//             enc_facility_centrex(&setup->FACILITY, dmsg, (unsigned char *)p_callerinfo.name, 1);
        end_trace();
 
        /* send setup message now */
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SETUP, p_m_d_l3id, l3m);
 
        new_state(PORT_STATE_OUT_SETUP);
 }
 
 /* MESSAGE_FACILITY */
-void Pdss1::message_facility(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_facility(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       FACILITY_t *facility;
-       msg_t *dmsg;
+       l3_msg *l3m;
 
        /* facility will not be sent to external lines */
-       if (!p_m_d_ntmode)
+       if (!p_m_d_ntmode && !p_m_d_tespecial)
                return;
 
        /* sending facility */
-       dmsg = create_l3msg(CC_FACILITY | REQUEST, MT_FACILITY, p_m_d_l3id, sizeof(FACILITY_t), p_m_d_ntmode);
-       facility = (FACILITY_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_FACILITY | REQUEST, DIRECTION_OUT);
-       enc_ie_facility(&facility->FACILITY, dmsg, (unsigned char *)param->facilityinfo.data, param->facilityinfo.len);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_FACILITY_REQ, DIRECTION_OUT);
+       enc_ie_facility(l3m, (unsigned char *)param->facilityinfo.data, param->facilityinfo.len);
+       end_trace();
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_FACILITY, p_m_d_l3id, l3m);
+}
+
+/* MESSAGE_3PTY */
+void Pdss1::message_3pty(unsigned int epoint_id, int message_id, union parameter *param)
+{
+       l3_msg *l3m;
+       unsigned char fac_ie[256];
+       struct asn1_parm fac;
+
+       /* encode 3PTY facility */
+       memset(&fac, 0, sizeof(fac));
+       fac.Valid = 1;
+       if (param->threepty.result) {
+               fac.comp = CompReturnResult;
+               fac.u.retResult.invokeId = param->threepty.invoke_id;
+               fac.u.retResult.operationValuePresent = 1;
+               if (param->threepty.begin)
+                       fac.u.retResult.operationValue = Fac_Begin3PTY;
+               if (param->threepty.end)
+                       fac.u.retResult.operationValue = Fac_End3PTY;
+       }
+       if (param->threepty.error) {
+               fac.comp = CompReturnError;
+               fac.u.retError.invokeId = param->threepty.invoke_id;
+               fac.u.retError.errorValue = FacError_Gen_InvalidCallState;
+       }
+       encodeFac(fac_ie, &fac);
+
+       /* sending facility */
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_FACILITY_REQ, DIRECTION_OUT);
+       enc_ie_facility(l3m, fac_ie + 2, fac_ie[1]);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_FACILITY, p_m_d_l3id, l3m);
 }
 
 /* MESSAGE_NOTIFY */
-void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_notify(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       INFORMATION_t *information;
-       NOTIFY_t *notification;
+       l3_msg *l3m;
        int notify;
-       int plan, type = -1, present;
-       msg_t *dmsg;
+       int plan = 0, type = -1, present = 0;
+
+       if (p_m_mISDNport->ifport->nonotify) {
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_REQ, DIRECTION_OUT);
+               add_trace("info", NULL, "blocked by config");
+               end_trace();
+               return;
+       }
 
+//     printf("if = %d\n", param->notifyinfo.notify);
        if (param->notifyinfo.notify>INFO_NOTIFY_NONE)
                notify = param->notifyinfo.notify & 0x7f;
        else
                notify = -1;
-       if (p_state != PORT_STATE_CONNECT)
-       {
-               /* notify only allowed in active state */
-               notify = -1;
-       }
-       if (notify >= 0)
-       {
+       if (notify >= 0) {
                plan = 1;
-               switch (param->notifyinfo.ntype)
-               {
+               switch (param->notifyinfo.ntype) {
+                       case INFO_NTYPE_UNKNOWN:
+                       type = 0;
+                       break;
                        case INFO_NTYPE_INTERNATIONAL:
                        type = 1;
                        break;
@@ -2579,232 +2383,191 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame
                        type = 4;
                        break;
                        default: /* INFO_NTYPE_UNKNOWN */
-                       type = 0;
+                       type = -1;
                        break;
                }
-               switch (param->notifyinfo.present)
-               {
-                       case INFO_PRESENT_NULL: /* no redir at all */
-                       present = -1;
-                       plan = -1;
-                       type = -1;
+               switch (param->notifyinfo.present) {
+                       case INFO_PRESENT_ALLOWED:
+                       present = 0;
                        break;
                        case INFO_PRESENT_RESTRICTED:
                        present = 1;
                        break;
-                       case INFO_PRESENT_NOTAVAIL:
+                       default: /* INFO_PRESENT_NOTAVAIL */
                        present = 2;
                        break;
-                       default: /* INFO_PRESENT_ALLOWED */
-                       present = 0;
-                       break;
                }
        }
 
-       if (notify<0 && !param->notifyinfo.display[0])
-       {
+       if (notify<0 && !param->notifyinfo.display[0]) {
                /* nothing to notify, nothing to display */
                return;
        }
 
-       if (notify >= 0)
-       {
-               if (p_state!=PORT_STATE_CONNECT)
-               {
+       if (notify >= 0) {
+               if (p_state!=PORT_STATE_CONNECT && p_state!=PORT_STATE_IN_PROCEEDING && p_state!=PORT_STATE_IN_ALERTING) {
                        /* queue notification */
                        if (p_m_d_notify_pending)
                                message_free(p_m_d_notify_pending);
                        p_m_d_notify_pending = message_create(ACTIVE_EPOINT(p_epointlist), p_serial, EPOINT_TO_PORT, message_id);
                        memcpy(&p_m_d_notify_pending->param, param, sizeof(union parameter));
-               } else
-               {
+               } else {
                        /* sending notification */
-                       dmsg = create_l3msg(CC_NOTIFY | REQUEST, MT_NOTIFY, p_m_d_l3id, sizeof(NOTIFY_t), p_m_d_ntmode);
-                       notification = (NOTIFY_t *)(dmsg->data + headerlen);
-                       l1l2l3_trace_header(CC_NOTIFY | REQUEST, DIRECTION_OUT);
-                       enc_ie_notify(&notification->NOTIFY, dmsg, notify);
+                       l3m = create_l3msg();
+                       l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_REQ, DIRECTION_OUT);
+                       enc_ie_notify(l3m, notify);
                        /* sending redirection number only in ntmode */
-                       if (type >= 0 && p_m_d_ntmode)
-                               enc_ie_redir_dn(&notification->REDIR_DN, dmsg, type, plan, present, (unsigned char *)param->notifyinfo.id);
-                       if (param->notifyinfo.display[0] && p_m_d_ntmode)
-                               enc_ie_display(&notification->DISPLAY, dmsg, (unsigned char *)param->notifyinfo.display);
+                       if (type >= 0 && (p_m_d_ntmode || p_m_d_tespecial))
+                               enc_ie_redir_dn(l3m, type, plan, present, (unsigned char *)param->notifyinfo.id);
+                       if (param->notifyinfo.display[0] && (p_m_d_ntmode || p_m_d_tespecial))
+                               enc_ie_display(l3m, (unsigned char *)param->notifyinfo.display);
                        end_trace();
-                       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+                       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_NOTIFY, p_m_d_l3id, l3m);
                }
-       } else if (p_m_d_ntmode)
-       {
+       } else if (p_m_d_ntmode || p_m_d_tespecial) {
                /* sending information */
-               dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode);
-               information = (INFORMATION_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT);
-               enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)param->notifyinfo.display);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
+               enc_ie_display(l3m, (unsigned char *)param->notifyinfo.display);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m);
        }
 }
 
 /* MESSAGE_OVERLAP */
-void Pdss1::message_overlap(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_overlap(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       SETUP_ACKNOWLEDGE_t *setup_acknowledge;
-       msg_t *dmsg;
+       l3_msg *l3m;
+
+       /* in case of sending complete, we proceed */
+       if (p_dialinginfo.sending_complete) {
+               PDEBUG(DEBUG_ISDN, "sending proceeding instead of setup_acknowledge, because address is complete.\n");
+               message_proceeding(epoint_id, message_id, param);
+               return;
+       }
 
        /* sending setup_acknowledge */
-       dmsg = create_l3msg(CC_SETUP_ACKNOWLEDGE | REQUEST, MT_SETUP_ACKNOWLEDGE, p_m_d_l3id, sizeof(SETUP_ACKNOWLEDGE_t), p_m_d_ntmode);
-       setup_acknowledge = (SETUP_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_SETUP_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_REQ, DIRECTION_OUT);
        /* channel information */
        if (p_state == PORT_STATE_IN_SETUP)
-               enc_ie_channel_id(&setup_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
        /* progress information */
        if (p_capainfo.bearer_capa==INFO_BC_SPEECH
         || p_capainfo.bearer_capa==INFO_BC_AUDIO
         || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES)
-       if (p_m_mISDNport->is_tones)
-               enc_ie_progress(&setup_acknowledge->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+       if (p_m_mISDNport->tones)
+               enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SETUP_ACKNOWLEDGE, p_m_d_l3id, l3m);
 
        new_state(PORT_STATE_IN_OVERLAP);
 }
 
 /* MESSAGE_PROCEEDING */
-void Pdss1::message_proceeding(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_proceeding(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       CALL_PROCEEDING_t *proceeding;
-       msg_t *dmsg;
+       l3_msg *l3m;
 
        /* sending proceeding */
-       dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
-       proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
        /* channel information */
        if (p_state == PORT_STATE_IN_SETUP)
-               enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
        /* progress information */
        if (p_capainfo.bearer_capa==INFO_BC_SPEECH
         || p_capainfo.bearer_capa==INFO_BC_AUDIO
         || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES)
-       if (p_m_mISDNport->is_tones)
-               enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+       if (p_m_mISDNport->tones)
+               enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
 
        new_state(PORT_STATE_IN_PROCEEDING);
 }
 
 /* MESSAGE_ALERTING */
-void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_alerting(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       ALERTING_t *alerting;
-       msg_t *dmsg;
+       l3_msg *l3m;
 
        /* NT-MODE in setup state we must send PROCEEDING first */
-       if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP)
-       {
-               CALL_PROCEEDING_t *proceeding;
-
+       if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) {
                /* sending proceeding */
-               dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
-               proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
                /* channel information */
-               enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
                /* progress information */
                if (p_capainfo.bearer_capa==INFO_BC_SPEECH
                 || p_capainfo.bearer_capa==INFO_BC_AUDIO
                 || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES)
-               enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+               if (p_m_mISDNport->tones)
+                       enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
                new_state(PORT_STATE_IN_PROCEEDING);
        }
 
        /* sending alerting */
-       dmsg = create_l3msg(CC_ALERTING | REQUEST, MT_ALERTING, p_m_d_l3id, sizeof(ALERTING_t), p_m_d_ntmode);
-       alerting = (ALERTING_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_ALERTING | REQUEST, DIRECTION_OUT);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_ALERTING_REQ, DIRECTION_OUT);
        /* channel information */
        if (p_state == PORT_STATE_IN_SETUP)
-               enc_ie_channel_id(&alerting->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
        /* progress information */
        if (p_capainfo.bearer_capa==INFO_BC_SPEECH
         || p_capainfo.bearer_capa==INFO_BC_AUDIO
         || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES)
-       if (p_m_mISDNport->is_tones)
-               enc_ie_progress(&alerting->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+       if (p_m_mISDNport->tones)
+               enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_ALERTING, p_m_d_l3id, l3m);
 
        new_state(PORT_STATE_IN_ALERTING);
 }
 
 /* MESSAGE_CONNECT */
-void Pdss1::message_connect(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       INFORMATION_t *information;
-       CONNECT_t *connect;
+       l3_msg *l3m;
        int type, plan, present, screen;
-       msg_t *dmsg;
-       class Endpoint *epoint;
+       time_t current_time;
 
        /* NT-MODE in setup state we must send PROCEEDING first */
-       if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP)
-       {
-               CALL_PROCEEDING_t *proceeding;
-
+       if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) {
                /* sending proceeding */
-               dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
-               proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
                /* channel information */
-               enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
-//             /* progress information */
-//             if (p_capainfo.bearer_capa==INFO_BC_SPEECH
-//              || p_capainfo.bearer_capa==INFO_BC_AUDIO
-//              || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES)
-//             enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
                new_state(PORT_STATE_IN_PROCEEDING);
        }
 
        /* copy connected information */
        memcpy(&p_connectinfo, &param->connectinfo, sizeof(p_connectinfo));
+       /* screen outgoing caller id */
+       do_screen(1, p_connectinfo.id, sizeof(p_connectinfo.id), &p_connectinfo.ntype, &p_connectinfo.present, p_m_mISDNport->ifport->interface->name);
 
-       /* only display at connect state */
-       if (p_state == PORT_STATE_CONNECT)
-       if (p_connectinfo.display[0])
-       {
-               /* sending information */
-               dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode);
-               information = (INFORMATION_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT);
-               if (p_m_d_ntmode)
-                       enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_connectinfo.display);
-               end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
-               return;
-       }
+       set_display(p_connectinfo.display);
 
-       if (p_state!=PORT_STATE_IN_SETUP && p_state!=PORT_STATE_IN_OVERLAP && p_state!=PORT_STATE_IN_PROCEEDING && p_state!=PORT_STATE_IN_ALERTING)
-       {
+       if (p_state!=PORT_STATE_IN_SETUP && p_state!=PORT_STATE_IN_OVERLAP && p_state!=PORT_STATE_IN_PROCEEDING && p_state!=PORT_STATE_IN_ALERTING) {
                /* connect command only possible in setup, proceeding or alerting state */
                return;
        }
 
        /* preparing connect message */
-       dmsg = create_l3msg(CC_CONNECT | REQUEST, MT_CONNECT, p_m_d_l3id, sizeof(CONNECT_t), p_m_d_ntmode);
-       connect = (CONNECT_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_CONNECT | REQUEST, DIRECTION_OUT);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_REQ, DIRECTION_OUT);
        /* connect information */
        plan = 1;
-       switch (p_connectinfo.ntype)
-       {
+       switch (p_connectinfo.ntype) {
+               case INFO_NTYPE_UNKNOWN:
+               type = 0x0;
+               break;
                case INFO_NTYPE_INTERNATIONAL:
                type = 0x1;
                break;
@@ -2814,56 +2577,51 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
                case INFO_NTYPE_SUBSCRIBER:
                type = 0x4;
                break;
-               default: /* INFO_NTYPE_UNKNOWN */
-               type = 0x0;
+               default: /* INFO_NTYPE_NOTPRESENT */
+               type = -1;
                break;
        }
-       switch (param->connectinfo.screen)
-       {
+       switch (param->connectinfo.screen) {
                case INFO_SCREEN_USER:
                screen = 0;
                break;
+               case INFO_SCREEN_USER_VERIFIED_PASSED:
+               screen = 1;
+               break;
+               case INFO_SCREEN_USER_VERIFIED_FAILED:
+               screen = 2;
+               break;
                default: /* INFO_SCREE_NETWORK */
                screen = 3;
                break;
        }
-       switch (p_connectinfo.present)
-       {
-               case INFO_PRESENT_NULL: /* no colp at all */
-               present = -1;
-               screen = -1;
-               plan = -1;
-               type = -1;
+       switch (p_connectinfo.present) {
+               case INFO_PRESENT_ALLOWED:
+               present = 0;
                break;
                case INFO_PRESENT_RESTRICTED:
                present = 1;
                break;
-               case INFO_PRESENT_NOTAVAIL:
+               default: /* INFO_PRESENT_NOTAVAIL */
                present = 2;
                break;
-               default: /* INFO_PRESENT_ALLOWED */
-               present = 0;
-               break;
        }
        if (type >= 0)
-               enc_ie_connected_pn(&connect->CONNECT_PN, dmsg, type, plan, present, screen, (unsigned char *)p_connectinfo.id);
+               enc_ie_connected_pn(l3m, type, plan, present, screen, (unsigned char *)p_connectinfo.id);
        /* display */
-       if (p_connectinfo.display[0] && p_m_d_ntmode)
-               enc_ie_display(&connect->DISPLAY, dmsg, (unsigned char *)p_connectinfo.display);
-#ifdef CENTREX
+       if (p_connectinfo.display[0] && (p_m_d_ntmode || p_m_d_tespecial))
+               enc_ie_display(l3m, (unsigned char *)p_connectinfo.display);
        /* nt-mode: CONP (connected name identification presentation) */
-       if (p_connectinfo.name[0] && p_m_d_ntmode)
-               enc_facility_centrex(&connect->FACILITY, dmsg, (unsigned char *)p_connectinfo.name, 0);
-#endif
+//     if (p_connectinfo.name[0] && (p_m_d_ntmode || p_m_d_tespecial))
+//             enc_facility_centrex(&connect->FACILITY, dmsg, (unsigned char *)p_connectinfo.name, 0);
        /* date & time */
-       if (p_m_d_ntmode)
-       {
-               epoint = find_epoint_id(epoint_id);
-               enc_ie_date(&connect->DATE, dmsg, now, p_settings.no_seconds);
+       if (p_m_d_ntmode || p_m_d_tespecial) {
+               time(&current_time);
+               enc_ie_date(l3m, current_time, p_settings.no_seconds);
        }
        end_trace();
        /* finally send message */
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CONNECT, p_m_d_l3id, l3m);
 
        if (p_m_d_ntmode)
                new_state(PORT_STATE_CONNECT);
@@ -2873,207 +2631,187 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
 }
 
 /* MESSAGE_DISCONNECT */
-void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_disconnect(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       DISCONNECT_t *disconnect;
-       RELEASE_COMPLETE_t *release_complete;
-       msg_t *dmsg;
-       struct message *message;
+       l3_msg *l3m;
+       struct lcr_msg *message;
        char *p = NULL;
 
        /* we reject during incoming setup when we have no tones. also if we are in outgoing setup state */
-       if ((p_state==PORT_STATE_IN_SETUP && !p_m_mISDNport->is_tones)
-        || p_state==PORT_STATE_OUT_SETUP)
-       {
+//     if ((p_state==PORT_STATE_IN_SETUP && !p_m_mISDNport->tones)
+if (/*  ||*/ p_state==PORT_STATE_OUT_SETUP) {
                /* sending release to endpoint */
-               while(p_epointlist)
-               {
+               while(p_epointlist) {
                        message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
-                       message->param.disconnectinfo.cause = 16;
-                       message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+                       memcpy(&message->param, param, sizeof(union parameter));
                        message_put(message);
                        /* remove epoint */
                        free_epointlist(p_epointlist);
                }
                /* sending release */
-               dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
-               release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
                /* send cause */
-               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+               enc_ie_cause(l3m, (!p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_REMOTE:param->disconnectinfo.location, param->disconnectinfo.cause);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
                new_state(PORT_STATE_RELEASE);
-               p_m_delete = 1;
+               trigger_work(&p_m_d_delete);
                return;
        }
 
-       /* NT-MODE in setup state we must send PROCEEDING first */
-       if (p_state==PORT_STATE_IN_SETUP)
-       {
-               CALL_PROCEEDING_t *proceeding;
-
+       /* workarround: NT-MODE in setup state we must send PROCEEDING first to make it work */
+       if (p_state==PORT_STATE_IN_SETUP) {
                /* sending proceeding */
-               dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
-               proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
                /* channel information */
-               enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
                /* progress information */
                if (p_capainfo.bearer_capa==INFO_BC_SPEECH
                 || p_capainfo.bearer_capa==INFO_BC_AUDIO
                 || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES)
-                       enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+               if (p_m_mISDNport->tones)
+                       enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
                new_state(PORT_STATE_IN_PROCEEDING);
        }
 
        /* sending disconnect */
-       dmsg = create_l3msg(CC_DISCONNECT | REQUEST, MT_DISCONNECT, p_m_d_l3id, sizeof(DISCONNECT_t), p_m_d_ntmode);
-       disconnect = (DISCONNECT_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_DISCONNECT | REQUEST, DIRECTION_OUT);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_REQ, DIRECTION_OUT);
        /* progress information */
        if (p_capainfo.bearer_capa==INFO_BC_SPEECH
         || p_capainfo.bearer_capa==INFO_BC_AUDIO
         || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES)
-       if (p_m_mISDNport->is_tones)
-               enc_ie_progress(&disconnect->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+       if (p_m_mISDNport->tones)
+               enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8);
        /* send cause */
-       enc_ie_cause(&disconnect->CAUSE, dmsg, (p_m_d_ntmode && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+       enc_ie_cause(l3m, (!p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_REMOTE:param->disconnectinfo.location, param->disconnectinfo.cause);
        /* send display */
        if (param->disconnectinfo.display[0])
                p = param->disconnectinfo.display;
-       if (p) if (*p && p_m_d_ntmode)
-               enc_ie_display(&disconnect->DISPLAY, dmsg, (unsigned char *)p);
+       if (p) if (*p && (p_m_d_ntmode || p_m_d_tespecial))
+               enc_ie_display(l3m, (unsigned char *)p);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_DISCONNECT, p_m_d_l3id, l3m);
        new_state(PORT_STATE_OUT_DISCONNECT);
 }
 
 /* MESSAGE_RELEASE */
-void Pdss1::message_release(unsigned long epoint_id, int message_id, union parameter *param)
+void Pdss1::message_release(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       RELEASE_t *release;
-       RELEASE_COMPLETE_t *release_complete;
-       DISCONNECT_t *disconnect;
-       msg_t *dmsg;
-       class Endpoint *epoint;
+       l3_msg *l3m;
        char *p = NULL;
 
-       /* if we have incoming disconnected, we may release */
-       if (p_state==PORT_STATE_IN_DISCONNECT
-        || p_state==PORT_STATE_OUT_DISCONNECT)
-       {
-               /* sending release */
-               dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, p_m_d_l3id, sizeof(RELEASE_t), p_m_d_ntmode);
-               release = (RELEASE_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_RELEASE | REQUEST, DIRECTION_OUT);
+       /*
+        * if we are on incoming call setup, we may reject by sending a release_complete
+        * also on outgoing call setup, we send a release complete, BUT this is not conform. (i don't know any other way)
+        */
+       if (p_state==PORT_STATE_IN_SETUP
+        || p_state==PORT_STATE_OUT_SETUP) {
+//#warning remove me
+//PDEBUG(DEBUG_LOG, "JOLLY sending release complete %d\n", p_serial);
+               /* sending release complete */
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT);
                /* send cause */
-               enc_ie_cause(&release->CAUSE, dmsg, (p_m_d_ntmode && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
                new_state(PORT_STATE_RELEASE);
                /* remove epoint */
-               remove_endpoint:
                free_epointid(epoint_id);
-               l1l2l3_trace_header(CC_RELEASE_CR | REQUEST, DIRECTION_OUT);
-               add_trace("callref", "new", "0x%x", p_m_d_l3id);
-               end_trace();
-               if (p_m_d_ntmode)
-               {
-                       if ((p_m_d_l3id&0xff00) == 0xff00)
-                               p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0;
-               }
-               p_m_d_l3id = 0;
-               p_m_delete = 1;
+               // wait for callref to be released
                return;
        }
-       /* if we are on outgoing/incoming call setup, we may release complete */
-       if (p_state==PORT_STATE_OUT_SETUP
-        || p_state==PORT_STATE_IN_SETUP
-// NOTE: a bug in mISDNuser (see disconnect_req_out !!!)
-        || p_state==PORT_STATE_OUT_PROCEEDING)
-       {
+       /*
+        * we may only release during incoming disconnect state.
+        * this means that the endpoint doesnt require audio anymore
+        */
+       if (p_state == PORT_STATE_IN_DISCONNECT
+        || p_state == PORT_STATE_OUT_DISCONNECT
+        || param->disconnectinfo.force) {
                /* sending release */
-               dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
-               release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_RELEASE | REQUEST, DIRECTION_OUT);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT);
                /* send cause */
-               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+               enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE, p_m_d_l3id, l3m);
                new_state(PORT_STATE_RELEASE);
-               goto remove_endpoint;
+               /* remove epoint */
+               free_epointid(epoint_id);
+               // wait for callref to be released
+               return;
+
        }
 
+#if 0
+wirklich erst proceeding?:
        /* NT-MODE in setup state we must send PROCEEDING first */
-       if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP)
-       {
+       if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) {
                CALL_PROCEEDING_t *proceeding;
 
                /* sending proceeding */
-               dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
-               proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
-               l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
                /* channel information */
-               enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
                /* progress information */
                if (p_capainfo.bearer_capa==INFO_BC_SPEECH
                 || p_capainfo.bearer_capa==INFO_BC_AUDIO
                 || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES)
-                       enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+               if (p_m_mISDNport->tones)
+                       enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8);
                end_trace();
-               msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
        }
+#endif
 
        /* sending disconnect */
-       dmsg = create_l3msg(CC_DISCONNECT | REQUEST, MT_DISCONNECT, p_m_d_l3id, sizeof(DISCONNECT_t), p_m_d_ntmode);
-       disconnect = (DISCONNECT_t *)(dmsg->data + headerlen);
-       l1l2l3_trace_header(CC_DISCONNECT | REQUEST, DIRECTION_OUT);
+       l3m = create_l3msg();
+       l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_REQ, DIRECTION_OUT);
        /* progress information */
        if (p_capainfo.bearer_capa==INFO_BC_SPEECH
         || p_capainfo.bearer_capa==INFO_BC_AUDIO
         || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES)
-       if (p_m_mISDNport->is_tones)
-               enc_ie_progress(&disconnect->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+       if (p_m_mISDNport->tones)
+               enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8);
        /* send cause */
-       enc_ie_cause(&disconnect->CAUSE, dmsg, (p_m_d_ntmode && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+       enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
        /* send display */
-       epoint = find_epoint_id(epoint_id);
        if (param->disconnectinfo.display[0])
                p = param->disconnectinfo.display;
-       if (p) if (*p && p_m_d_ntmode)
-               enc_ie_display(&disconnect->DISPLAY, dmsg, (unsigned char *)p);
+       if (p) if (*p && (p_m_d_ntmode || p_m_d_tespecial))
+               enc_ie_display(l3m, (unsigned char *)p);
        end_trace();
-       msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
-       new_state(PORT_STATE_RELEASE);
+       p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_DISCONNECT, p_m_d_l3id, l3m);
+       new_state(PORT_STATE_OUT_DISCONNECT);
+       /* remove epoint */
        free_epointid(epoint_id);
-//     p_m_delete = 1;
+       // wait for release and callref to be released
+//#warning remove me
+//PDEBUG(DEBUG_LOG, "JOLLY sending disconnect %d\n", p_serial);
 }
 
 
 /*
  * endpoint sends messages to the port
  */
-int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union parameter *param)
+int Pdss1::message_epoint(unsigned int epoint_id, int message_id, union parameter *param)
 {
-       struct message *message;
-
        if (PmISDN::message_epoint(epoint_id, message_id, param))
                return(1);
 
-       switch(message_id)
-       {
+       switch(message_id) {
                case MESSAGE_INFORMATION: /* overlap dialing */
                if (p_type==PORT_TYPE_DSS1_NT_OUT
                 && p_state!=PORT_STATE_OUT_OVERLAP
                 && p_state!=PORT_STATE_CONNECT
                 && p_state!=PORT_STATE_OUT_DISCONNECT
-                && p_state!=PORT_STATE_IN_DISCONNECT)
-               {
+                && p_state!=PORT_STATE_IN_DISCONNECT) {
                        break;
                }
                if (p_type==PORT_TYPE_DSS1_TE_OUT
@@ -3082,8 +2820,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
                 && p_state!=PORT_STATE_OUT_ALERTING
                 && p_state!=PORT_STATE_CONNECT
                 && p_state!=PORT_STATE_OUT_DISCONNECT
-                && p_state!=PORT_STATE_IN_DISCONNECT)
-               {
+                && p_state!=PORT_STATE_IN_DISCONNECT) {
                        break;
                }
                if ((p_type==PORT_TYPE_DSS1_NT_IN || p_type==PORT_TYPE_DSS1_TE_IN)
@@ -3093,8 +2830,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
                 && p_state!=PORT_STATE_CONNECT
                 && p_state!=PORT_STATE_CONNECT_WAITING
                 && p_state!=PORT_STATE_OUT_DISCONNECT
-                && p_state!=PORT_STATE_IN_DISCONNECT)
-               {
+                && p_state!=PORT_STATE_IN_DISCONNECT) {
                        break;
                }
                message_information(epoint_id, message_id, param);
@@ -3102,44 +2838,13 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
 
                case MESSAGE_SETUP: /* dial-out command received from epoint */
                if (p_state!=PORT_STATE_IDLE
-                && p_state!=PORT_STATE_CONNECT)
-               {
+                && p_state!=PORT_STATE_CONNECT) {
                        PERROR("Pdss1(%s) ignoring setup because isdn port is not in idle state (or connected for sending display info).\n", p_name);
                        break;
                }
                if (p_epointlist && p_state==PORT_STATE_IDLE)
-               {
-                       PERROR("Pdss1(%s): software error: epoint pointer is set in idle state, how bad!! exitting.\n", p_name);
-                       exit(-1);
-               }
-               /* note: pri is a special case, because links must be up for pri */ 
-               if (p_m_mISDNport->l1link || p_m_mISDNport->pri || !p_m_mISDNport->ntmode || p_state!=PORT_STATE_IDLE)
-               {
-                       /* LAYER 1 is up, or we may send */
-                       message_setup(epoint_id, message_id, param);
-               } else {
-                       iframe_t act;
-                       /* LAYER 1 id down, so we queue */
-                       p_m_d_queue = message_create(epoint_id, p_serial, EPOINT_TO_PORT, message_id);
-                       memcpy(&p_m_d_queue->param, param, sizeof(union parameter));
-                       /* attach us */
-                       if (!(epointlist_new(epoint_id)))
-                       {
-                               PERROR("no memory for epointlist\n");
-                               exit(-1);
-                       }
-                       /* activate link */
-                       PDEBUG(DEBUG_ISDN, "the L1 is down, we try to establish the link NT portnum=%d (%s).\n", p_m_mISDNport->portnum, p_name);
-                       act.prim = PH_ACTIVATE | REQUEST; 
-                       act.addr = p_m_mISDNport->upper_id | FLG_MSG_DOWN;
-                       act.dinfo = 0;
-                       act.len = 0;
-                       mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
-                       l1l2l3_trace_header(act.prim, DIRECTION_OUT);
-                       end_trace();
-//                     /* set timeout */
-//                     p_m_mISDNport->l1timeout = now+3;
-               }
+                       FATAL("Pdss1(%s): epoint pointer is set in idle state, how bad!!\n", p_name);
+               message_setup(epoint_id, message_id, param);
                break;
 
                case MESSAGE_NOTIFY: /* display and notifications */
@@ -3150,9 +2855,12 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
                message_facility(epoint_id, message_id, param);
                break;
 
+               case MESSAGE_3PTY: /* begin result message */
+               message_3pty(epoint_id, message_id, param);
+               break;
+
                case MESSAGE_OVERLAP: /* more information is needed */
-               if (p_state!=PORT_STATE_IN_SETUP)
-               {
+               if (p_state!=PORT_STATE_IN_SETUP) {
                        break;
                }
                message_overlap(epoint_id, message_id, param);
@@ -3160,21 +2868,31 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
 
                case MESSAGE_PROCEEDING: /* call of endpoint is proceeding */
                if (p_state!=PORT_STATE_IN_SETUP
-                && p_state!=PORT_STATE_IN_OVERLAP)
-               {
+                && p_state!=PORT_STATE_IN_OVERLAP) {
                        break;
                }
                message_proceeding(epoint_id, message_id, param);
+               if (p_m_d_notify_pending) {
+                       /* send pending notify message during connect */
+                       message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
+                       message_free(p_m_d_notify_pending);
+                       p_m_d_notify_pending = NULL;
+               }
                break;
 
                case MESSAGE_ALERTING: /* call of endpoint is ringing */
                if (p_state!=PORT_STATE_IN_SETUP
                 && p_state!=PORT_STATE_IN_OVERLAP
-                && p_state!=PORT_STATE_IN_PROCEEDING)
-               {
+                && p_state!=PORT_STATE_IN_PROCEEDING) {
                        break;
                }
                message_alerting(epoint_id, message_id, param);
+               if (p_m_d_notify_pending) {
+                       /* send pending notify message during connect */
+                       message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
+                       message_free(p_m_d_notify_pending);
+                       p_m_d_notify_pending = NULL;
+               }
                break;
 
                case MESSAGE_CONNECT: /* call of endpoint is connected */
@@ -3182,11 +2900,16 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
                 && p_state!=PORT_STATE_IN_OVERLAP
                 && p_state!=PORT_STATE_IN_PROCEEDING
                 && p_state!=PORT_STATE_IN_ALERTING
-                && !(p_state==PORT_STATE_CONNECT && p_m_d_ntmode))
-               {
+                && !(p_state==PORT_STATE_CONNECT && p_m_d_ntmode)) {
                        break;
                }
                message_connect(epoint_id, message_id, param);
+               if (p_m_d_notify_pending) {
+                       /* send pending notify message during connect */
+                       message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
+                       message_free(p_m_d_notify_pending);
+                       p_m_d_notify_pending = NULL;
+               }
                break;
 
                case MESSAGE_DISCONNECT: /* call has been disconnected */
@@ -3199,23 +2922,21 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
                 && p_state!=PORT_STATE_OUT_PROCEEDING
                 && p_state!=PORT_STATE_OUT_ALERTING
                 && p_state!=PORT_STATE_CONNECT
-                && p_state!=PORT_STATE_CONNECT_WAITING)
-               {
+                && p_state!=PORT_STATE_CONNECT_WAITING) {
                        break;
                }
                message_disconnect(epoint_id, message_id, param);
                break;
 
                case MESSAGE_RELEASE: /* release isdn port */
-               if (p_state==PORT_STATE_RELEASE)
-               {
+               if (p_state==PORT_STATE_RELEASE) {
                        break;
                }
                message_release(epoint_id, message_id, param);
                break;
 
                default:
-               PERROR("Pdss1(%s) isdn port with (caller id %s) received a wrong message: %d\n", p_name, p_callerinfo.id, message);
+               PERROR("Pdss1(%s) isdn port with (caller id %s) received a wrong message: %d\n", p_name, p_callerinfo.id, message_id);
        }
 
        return(1);
@@ -3226,285 +2947,154 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
 /*
  * data from isdn-stack (layer-3) to pbx (port class)
  */
-/* NOTE: nt mode use mISDNuser_head_t as header */
-int stack2manager_nt(void *dat, void *arg)
+int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
 {
        class Port *port;
        class Pdss1 *pdss1;
-       manager_t *mgr = (manager_t *)dat;
-       msg_t *msg = (msg_t *)arg;
-       mISDNuser_head_t *hh;
-       struct mISDNport *mISDNport;
        char name[32];
 
-       if (!msg || !mgr)
-               return(-EINVAL);
-
-       /* note: nst is the first data feld of mISDNport */
-       mISDNport = (struct mISDNport *)mgr->nst;
+       PDEBUG(DEBUG_ISDN, "cmd(0x%x) pid(0x%x)\n", cmd, pid);
 
-       hh = (mISDNuser_head_t *)msg->data;
-       PDEBUG(DEBUG_ISDN, "prim(0x%x) dinfo(0x%x) msg->len(%d)\n", hh->prim, hh->dinfo, msg->len);
+       if (pid == 0) {
+               PDEBUG(DEBUG_ISDN, "ignoring dummy process from phone.\n");
+               return(0);
+       }
 
        /* find Port object of type ISDN */
        port = port_first;
-       while(port)
-       {
-               if (port->p_type == PORT_TYPE_DSS1_NT_IN || port->p_type == PORT_TYPE_DSS1_NT_OUT)
-               {
+       while(port) {
+               /* are we ISDN ? */
+               if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_DSS1) {
                        pdss1 = (class Pdss1 *)port;
-//PDEBUG(DEBUG_ISDN, "comparing dinfo = 0x%x with l3id 0x%x\n", hh->dinfo, pdss1->p_m_d_l3id);
-                       /* check out correct stack */
-                       if (pdss1->p_m_mISDNport == mISDNport)
-                       /* check out correct id */
-                       if ((hh->dinfo&0xffff0000) == (pdss1->p_m_d_l3id&0xffff0000))
-                       {
-                               /* found port, the message belongs to */
-                               break;
+                       /* check out correct stack and id */
+                       if (pdss1->p_m_mISDNport == mISDNport) {
+                               if (pdss1->p_m_d_l3id & MISDN_PID_CR_FLAG) {
+                                       /* local callref, so match value only */
+                                       if ((pdss1->p_m_d_l3id & MISDN_PID_CRVAL_MASK) == (pid & MISDN_PID_CRVAL_MASK))
+                                               break; // found
+                               } else {
+                                       /* remote callref, ref + channel id */
+                                       if (pdss1->p_m_d_l3id == pid)
+                                               break; // found
+                               }
                        }
                }
                port = port->next;
        }
-       if (port)
-       {
-               /* if process id is master process, but a child disconnects */
-               if ((hh->dinfo&0x0000ff00)!=0x0000ff00 && (pdss1->p_m_d_l3id&0x0000ff00)==0x0000ff00 && hh->prim==(CC_DISCONNECT|INDICATION))
-               {
-                       /* send special indication for child disconnect */
-                       pdss1->disconnect_ind_i(hh->prim, hh->dinfo, msg->data);
-                       free_msg(msg);
+
+       /* aktueller prozess */
+       if (port) {
+               if (cmd == MT_ASSIGN) {
+                       /* stack gives us new layer 3 id (during connect) */
+                       l1l2l3_trace_header(mISDNport, pdss1, L3_NEW_L3ID_IND, DIRECTION_IN);
+                       add_trace("callref", "old", "0x%x", pdss1->p_m_d_l3id);
+                       /* nt-library now gives us a new id via CC_SETUP_CONFIRM */
+                       if ((pdss1->p_m_d_l3id&MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER)
+                               PERROR("    strange setup-procid 0x%x\n", pdss1->p_m_d_l3id);
+                       pdss1->p_m_d_l3id = pid;
+                       if (port->p_state == PORT_STATE_CONNECT)
+                               pdss1->p_m_d_ces = pid >> 16;
+                       add_trace("callref", "new", "0x%x", pdss1->p_m_d_l3id);
+                       end_trace();
                        return(0);
                }
-               /* if process id and layer 3 id matches */
-               if (hh->dinfo == pdss1->p_m_d_l3id)
-               {
-                       pdss1->message_isdn(hh->prim, hh->dinfo, msg->data);
-                       free_msg(msg);
+               /* if process id is master process, but a child disconnects */
+               if (mISDNport->ntmode
+                && (pid & MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER
+                && (pdss1->p_m_d_l3id & MISDN_PID_CRTYPE_MASK) == MISDN_PID_MASTER) {
+                       if (cmd == MT_DISCONNECT
+                        || cmd == MT_RELEASE) {
+                               /* send special indication for child disconnect */
+                               pdss1->disconnect_ind_i(cmd, pid, l3m);
+                               return(0);
+                       }
+                       if (cmd == MT_RELEASE_COMPLETE)
+                               return(0);
+               }
+               /* if we have child pid and got different child pid message, ignore */
+               if (mISDNport->ntmode
+                && (pid & MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER
+                && (pdss1->p_m_d_l3id & MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER
+                && pid != pdss1->p_m_d_l3id)
                        return(0);
-               }
+
+               /* process message */
+               pdss1->message_isdn(cmd, pid, l3m);
+               return(0);
        }
 
        /* d-message */
-       switch(hh->prim)
-       {
-               case MGR_SHORTSTATUS | INDICATION:
-               case MGR_SHORTSTATUS | CONFIRM:
-               switch(hh->dinfo) {
-                       case SSTATUS_L2_ESTABLISHED:
-                       goto ss_estab;
-                       case SSTATUS_L2_RELEASED:
-                       goto ss_rel;
-               }
-               break;
+       switch(cmd) {
+               case MT_SETUP:
+               /* creating port object, transparent until setup with hdlc */
+               SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum);
+               if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, mISDNport->ifport->interface, 0, 0, B_MODE_TRANSPARENT)))
 
-               case DL_ESTABLISH | INDICATION:
-               case DL_ESTABLISH | CONFIRM:
-               ss_estab:
-               l1l2l3_trace_header(prim, DIRECTION_IN);
-               add_trace("tei", NULL, "%d", hh->dinfo);
-               end_trace();
-               if (mISDNport->ptp && hh->dinfo == 0)
-               {
-                       if (mISDNport->l2establish)
-                       {
-                               mISDNport->l2establish = 0;
-                               PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n");
-                       }
-                       mISDNport->l2link = 1;
-                       if (mISDNport->pri);
-                               mISDNport->l1link = 1; /* this is a hack, we also assume L1 to be active */
-               }
+                       FATAL("Cannot create Port instance.\n");
+               pdss1->message_isdn(cmd, pid, l3m);
                break;
 
-               case DL_RELEASE | INDICATION:
-               case DL_RELEASE | CONFIRM:
-               ss_rel:
-               l1l2l3_trace_header(prim, DIRECTION_IN);
-               add_trace("tei", NULL, "%d", hh->dinfo);
-               end_trace();
-               if (mISDNport->ptp && hh->dinfo == 0)
-               {
-                       mISDNport->l2link = 0;
-                       time(&mISDNport->l2establish);
-                       PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
-               }
+               case MT_RESUME:
+               /* creating port object, transparent until setup with hdlc */
+               SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum);
+               if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, mISDNport->ifport->interface, 0, 0, B_MODE_TRANSPARENT)))
+                       FATAL("Cannot create Port instance.\n");
+               pdss1->message_isdn(cmd, pid, l3m);
                break;
 
-               case CC_SETUP | INDICATION:
-               /* creating port object */
-               SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum);
-               if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, 0, 0)))
-               {
-                       RELEASE_COMPLETE_t *release_complete;
-                       msg_t *dmsg;
-
-                       PERROR("FATAL ERROR: cannot create port object.\n");
-                       dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, hh->dinfo, sizeof(RELEASE_COMPLETE_t), mISDNport->ntmode);
-                       release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + mISDN_HEADER_LEN);
-                       enc_ie_cause_standalone(mISDNport->ntmode?&release_complete->CAUSE:NULL, dmsg, (mISDNport->ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
-                       msg_queue_tail(&mISDNport->downqueue, dmsg);
-                       break;
-               }
-               pdss1->message_isdn(hh->prim, hh->dinfo, msg->data);
+               case MT_FREE:
+               PDEBUG(DEBUG_ISDN, "unused call ref released (l3id=0x%x)\n", pid);
                break;
 
-               case CC_RESUME | INDICATION:
-               /* creating port object */
-               SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum);
-               if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL)))
-               {
-                       SUSPEND_REJECT_t *suspend_reject;
-                       msg_t *dmsg;
-
-                       PERROR("FATAL ERROR: cannot create port object.\n");
-                       dmsg = create_l3msg(CC_SUSPEND_REJECT | REQUEST, MT_SUSPEND_REJECT, hh->dinfo, sizeof(SUSPEND_REJECT_t), mISDNport->ntmode);
-                       suspend_reject = (SUSPEND_REJECT_t *)(dmsg->data + mISDN_HEADER_LEN);
-                       enc_ie_cause_standalone(mISDNport->ntmode?&suspend_reject->CAUSE:NULL, dmsg, (mISDNport->ntmode)?1:0, 47);
-                       msg_queue_tail(&mISDNport->downqueue, dmsg);
-                       break;
-               }
-               pdss1->message_isdn(hh->prim, hh->dinfo, msg->data);
+               case MT_RELEASE_COMPLETE:
+               PERROR("must be ignored by stack, not sent to app\n");
                break;
 
-               case CC_RELEASE_CR | INDICATION:
-               PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", hh->dinfo);
+               case MT_FACILITY:
+               // facility als broadcast
                break;
 
-               case CC_DISCONNECT | INDICATION:
+               case MT_L2IDLE:
+               // L2 became idle - we could sent a MT_L2RELEASE if we are the L2 master
+               PDEBUG(DEBUG_ISDN, "Got L2 idle\n");
+               break;
 
-               // fall throug
                default:
-               PERROR("unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", hh->prim, hh->dinfo, msg->len);
-               return(-EINVAL);
-       }
-       free_msg(msg);
-       return(0);
-}
-
-/* NOTE: te mode use iframe_t as header */
-int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg)
-{
-       class Port *port;
-       class Pdss1 *pdss1;
-       iframe_t *frm;
-       char name[32];
-
-       if (!msg || !mISDNport)
-               return(-EINVAL);
-       frm = (iframe_t *)msg->data;
-       PDEBUG(DEBUG_ISDN, "prim(0x%x) dinfo(0x%x) msg->len(%d)\n", frm->prim, frm->dinfo, msg->len);
-
-       /* find Port object of type ISDN */
-       port = port_first;
-       while(port)
-       {
-               if (port->p_type == PORT_TYPE_DSS1_TE_IN || port->p_type == PORT_TYPE_DSS1_TE_OUT)
-               {
-                       pdss1 = (class Pdss1 *)port;
-                       /* check out correct stack */
-                       if (pdss1->p_m_mISDNport == mISDNport)
-                       /* check out correct id */
-                       if (frm->dinfo == pdss1->p_m_d_l3id)
-                       {
-                               /* found port, the message belongs to */
-                               break;
+               PERROR("unhandled message: cmd(0x%x) pid(0x%x)\n", cmd, pid);
+               port = port_first;
+               while(port) {
+                       if (port->p_type == PORT_TYPE_DSS1_NT_IN || port->p_type == PORT_TYPE_DSS1_NT_OUT) {
+                               pdss1 = (class Pdss1 *)port;
+                               /* check out correct stack */
+                               if (pdss1->p_m_mISDNport == mISDNport)
+                               /* check out correct id */
+                               PERROR("unhandled message: pid=%x is not associated with port-dinfo=%x\n", pid, pdss1->p_m_d_l3id);
                        }
+                       port = port->next;
                }
-               port = port->next;
-       }
-       if (port)
-       {
-               pdss1->message_isdn(frm->prim, frm->dinfo, msg->data);
-               free_msg(msg);
-               return(0);
-       }
-
-       /* process new cr (before setup indication) */
-//printf("prim = 0x%x, looking for 0x%x\n",frm->prim, (CC_NEW_CR | INDICATION));
-       if (frm->prim == (CC_NEW_CR | INDICATION))
-       {
-
-               /* creating port object */
-               SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum);
-               if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_TE_IN, mISDNport, name, NULL)))
-               {
-                       RELEASE_COMPLETE_t *release_complete;
-                       msg_t *dmsg;
-
-                       PERROR("FATAL ERROR: cannot create port object.\n");
-                       dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, frm->dinfo, sizeof(RELEASE_COMPLETE_t), mISDNport->ntmode);
-                       release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + mISDN_HEADER_LEN);
-                       enc_ie_cause_standalone(mISDNport->ntmode?&release_complete->CAUSE:NULL, dmsg, (mISDNport->ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
-                       msg_queue_tail(&mISDNport->downqueue, dmsg);
-                       free_msg(msg);
-                       return(0);
-               }
-               /* l3id will be set from dinfo at message_isdn */
-               pdss1->message_isdn(frm->prim, frm->dinfo, msg->data);
-               free_msg(msg);
-               return(0);
-       }
-
-       if (frm->prim == (CC_RELEASE_CR | INDICATION))
-       {
-               PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", frm->dinfo);
-               free_msg(msg);
-               return(0);
+               return(-EINVAL);
        }
-       PERROR("unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", frm->prim, frm->dinfo, msg->len);
-       return(-EINVAL);
+       return(0);
 }
 
-
-/*
- * sending message that were queued during L1 activation
- * or releasing port if link is down
- */
-void setup_queue(struct mISDNport *mISDNport, int link)
+void Pdss1::set_display(const char *text)
 {
-       class Port *port;
-       class Pdss1 *pdss1;
-       struct message *message;
+       l3_msg *l3m;
 
-       if (!mISDNport->ntmode)
+       /* only display at connect state */
+       if (p_state == PORT_STATE_CONNECT)
+       if (text[0]) {
+               /* sending information */
+               l3m = create_l3msg();
+               l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
+               if (p_m_d_ntmode || p_m_d_tespecial)
+                       enc_ie_display(l3m, (unsigned char *)text);
+               end_trace();
+               p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m);
                return;
-
-       /* check all port objects for pending message */
-       port = port_first;
-       while(port)
-       {
-               if ((port->p_type&PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1)
-               {
-                       pdss1 = (class Pdss1 *)port;
-                       if (pdss1->p_m_mISDNport == mISDNport)
-                       {
-                               if (pdss1->p_m_d_queue)
-                               {
-                                       if (link)
-                                       {
-                                               PDEBUG(DEBUG_ISDN, "the L1 became active, so we send queued message for portnum=%d (%s).\n", mISDNport->portnum, pdss1->p_name);
-                                               /* LAYER 1 is up, so we send */
-                                               pdss1->message_setup(pdss1->p_m_d_queue->id_from, pdss1->p_m_d_queue->type, &pdss1->p_m_d_queue->param);
-                                               message_free(pdss1->p_m_d_queue);
-                                               pdss1->p_m_d_queue = NULL;
-                                       } else
-                                       {
-                                               PDEBUG(DEBUG_ISDN, "the L1 became NOT active, so we release port for portnum=%d (%s).\n", mISDNport->portnum, pdss1->p_name);
-                                               message = message_create(pdss1->p_serial, pdss1->p_m_d_queue->id_from, PORT_TO_EPOINT, MESSAGE_RELEASE);
-                                               message->param.disconnectinfo.cause = 27;
-                                               message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
-                                               message_put(message);
-                                               pdss1->new_state(PORT_STATE_RELEASE);
-                                               pdss1->p_m_delete = 1;
-                                       }
-                               }
-                       }
-               }
-               port = port->next;
        }
 }
 
 
 
 
-