moved timeout settings from extenion to interface.conf
[lcr.git] / dss1.cpp
index 452c775..82b09bb 100644 (file)
--- a/dss1.cpp
+++ b/dss1.cpp
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 extern "C" {
-#include <net_l2.h>
+#include <mISDNuser/net_l2.h>
 }
 
 //#define CENTREX
@@ -42,8 +42,8 @@ Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_
        p_m_d_ces = -1;
        p_m_d_queue = NULL;
        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);
 }
@@ -75,7 +75,6 @@ Pdss1::~Pdss1()
  */
 static msg_t *create_l3msg(int prim, int mt, int dinfo, int size, int ntmode)
 {
-       int i = 0;
        msg_t *dmsg;
        Q931_info_t *qi;
        iframe_t *frm;
@@ -83,57 +82,42 @@ static msg_t *create_l3msg(int prim, int mt, int dinfo, int size, int ntmode)
        if (!ntmode)
                size = sizeof(Q931_info_t)+2;
 
-       while(i < 10)
+       if (ntmode)
        {
-               if (ntmode)
+               dmsg = prep_l3data_msg(prim, dinfo, size, 256, NULL);
+               if (dmsg)
                {
-                       dmsg = prep_l3data_msg(prim, dinfo, size, 256, NULL);
-                       if (dmsg)
-                       {
-                               return(dmsg);
-                       }
-               } else
+                       return(dmsg);
+               }
+       } else
+       {
+               dmsg = alloc_msg(size+256+mISDN_HEADER_LEN+DEFAULT_HEADROOM);
+               if (dmsg)
                {
-                       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);
-                       }
+                       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);
                }
-
-               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);
+       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);
+       FATAL("Cannot allocate memory, system overloaded.\n");
+       exit(0); // make gcc happy
 }
 
 /*
@@ -180,7 +164,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                end_trace();
 
                /* activate our exclusive channel */
-               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
        } else
        if (p_m_b_channel)
        {
@@ -201,7 +185,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                        add_trace("connect", "channel", "%d", p_m_b_channel);
                        end_trace();
                        p_m_b_exclusive = 1; // we are done
-                       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+                       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
                        return(0);
                }
 
@@ -228,7 +212,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                end_trace();
 
                /* activate channel given by remote */
-               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
        } else
        if (p_m_b_reserve)
        {
@@ -264,7 +248,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
                end_trace();
 
                /* activate channel given by remote */
-               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
        } else
        {
                /*** we sent 'no channel available' ***/
@@ -293,7 +277,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_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+                       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
                        return(0);
                }
                
@@ -328,7 +312,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_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+               bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
        }
        return(0);
 
@@ -336,7 +320,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
        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(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-       enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+       enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
        end_trace();
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
        new_state(PORT_STATE_RELEASE);
@@ -369,9 +353,9 @@ int Pdss1::hunt_bchannel(int channel, int exclusive)
        }
        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("channel", "reserved", "%d", p_m_mISDNport->b_reserved);
                add_trace("conclusion", NULL, "all channels are reserved");
                end_trace();
                return(-34); // no channel
@@ -501,10 +485,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
        {
                /* 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);
-               }
+                       FATAL("l3-stack gives us a process id 0xff00-0xffff\n");
                l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | INDICATION, DIRECTION_IN);
                if (p_m_d_l3id)
                        add_trace("callref", "old", "0x%x", p_m_d_l3id);
@@ -541,7 +522,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
                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(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */
+               enc_ie_cause(&release_complete->CAUSE, dmsg, (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);
@@ -743,49 +724,29 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
                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(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
                end_trace();
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
                new_state(PORT_STATE_RELEASE);
                p_m_delete = 1;
                return;
        }
-       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+       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;
+               FATAL("No memory for Endpoint instance\n");
+       if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint, 0))) //incomming
+               FATAL("No memory for Endpoint Application instance\n");
+       epointlist_new(epoint->ep_serial);
 
-               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(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-               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);
-       }
        /* 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));
@@ -852,7 +813,7 @@ void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void
        end_trace();
 
        /* process channel */
-       ret = received_first_reply_to_setup(prim, exclusive, channel);
+       ret = received_first_reply_to_setup(prim, channel, exclusive);
        if (ret < 0)
        {
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
@@ -889,7 +850,7 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data)
        dec_ie_redir_dn(proceeding->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
        end_trace();
 
-       ret = received_first_reply_to_setup(prim, exclusive, channel);
+       ret = received_first_reply_to_setup(prim, channel, exclusive);
        if (ret < 0)
        {
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
@@ -973,7 +934,7 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data)
        end_trace();
 
        /* process channel */
-       ret = received_first_reply_to_setup(prim, exclusive, channel);
+       ret = received_first_reply_to_setup(prim, channel, exclusive);
        if (ret < 0)
        {
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
@@ -1064,7 +1025,7 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
 
        /* select channel */
        bchannel_before = p_m_b_channel;
-       ret = received_first_reply_to_setup(prim, exclusive, channel);
+       ret = received_first_reply_to_setup(prim, channel, exclusive);
        if (ret < 0)
        {
                message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
@@ -1118,7 +1079,7 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
                break;
        }
        p_connectinfo.isdn_port = p_m_portnum;
-       SCPY(p_connectinfo.interfaces, p_m_mISDNport->ifport->interface->name);
+       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)
@@ -1154,12 +1115,14 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data)
        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);
        end_trace();
+       if (location == LOCATION_PRIVATE_LOCAL)
+               location = LOCATION_PRIVATE_REMOTE;
 
        if (cause < 0)
                cause = 16;
 
-       /* release if we are remote sends us no tones */
-       if (p_m_mISDNport->earlyb)
+       /* release if remote sends us no tones */
+       if (!p_m_mISDNport->earlyb)
        {
                RELEASE_t *release;
                msg_t *dmsg;
@@ -1167,7 +1130,7 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data)
                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(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&release->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */
+               enc_ie_cause(&release->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */
                add_trace("reason", NULL, "no remote patterns");
                end_trace();
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
@@ -1222,36 +1185,14 @@ void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data
                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();
+       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();
 
 }
 
@@ -1267,6 +1208,8 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
        l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
        dec_ie_cause(release->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
        end_trace();
+       if (location == LOCATION_PRIVATE_LOCAL)
+               location = LOCATION_PRIVATE_REMOTE;
 
        if (cause < 0)
                cause = 16;
@@ -1291,7 +1234,7 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
                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(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16);
+               enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16);
                end_trace();
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
        }
@@ -1300,7 +1243,7 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
        p_m_delete = 1;
 }
 
-/* CC_RELEASE_COMPLETE INDICATION */
+/* CC_RELEASE_COMPLETE INDICATION (a reject) */
 void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void *data)
 {
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
@@ -1311,6 +1254,8 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void *
        l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
        dec_ie_cause(release_complete->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
        end_trace();
+       if (location == LOCATION_PRIVATE_LOCAL)
+               location = LOCATION_PRIVATE_REMOTE;
 
        if (cause < 0)
                cause = 16;
@@ -1341,8 +1286,15 @@ void Pdss1::t312_timeout(unsigned long prim, unsigned long dinfo, void *data)
        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;
+               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);
@@ -1359,10 +1311,11 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data)
        NOTIFY_t *notifying = (NOTIFY_t *)((unsigned long)data + headerlen);
        struct message *message;
        int notify, type, plan, present;
+       unsigned char notifyid[sizeof(message->param.notifyinfo.id)];
 
        l1l2l3_trace_header(p_m_mISDNport, this, 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));
+       dec_ie_redir_dn(notifying->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, notifyid, sizeof(notifyid));
        end_trace();
 
        if (!ACTIVE_EPOINT(p_epointlist))
@@ -1373,6 +1326,7 @@ 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)
        {
@@ -1429,7 +1383,7 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
                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(p_m_mISDNport, this, 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 */
+               enc_ie_cause(&hold_reject->CAUSE, dmsg, (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);
@@ -1493,7 +1447,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
                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(p_m_mISDNport, this, CC_RETRIEVE_REJECT | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&retrieve_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause);
+               enc_ie_cause(&retrieve_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause);
                end_trace();
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
 
@@ -1519,7 +1473,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
                cause = -ret;
                goto reject;
        }
-       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
 
        /* set hold state */
        p_m_hold = 0;
@@ -1558,7 +1512,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
                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(p_m_mISDNport, this, CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&suspend_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+               enc_ie_cause(&suspend_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
                end_trace();
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
 
@@ -1638,10 +1592,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
        {
                /* 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);
-               }
+                       FATAL("l3-stack gives us a process id 0xff00-0xffff\n");
                l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | INDICATION, DIRECTION_IN);
                if (p_m_d_l3id)
                        add_trace("callref", "old", "0x%x", p_m_d_l3id);
@@ -1685,7 +1636,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
                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(p_m_mISDNport, this, CC_RESUME_REJECT | REQUEST, DIRECTION_OUT);
-               enc_ie_cause(&resume_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+               enc_ie_cause(&resume_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
                if (ret == -27)
                        add_trace("reason", NULL, "port blocked");
                end_trace();
@@ -1694,14 +1645,11 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
                p_m_delete = 1;
                return;
        }
-       bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+       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)
@@ -1718,16 +1666,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);
-       }
+       epointlist_new(epoint->ep_serial);
        if (!(epoint->portlist_new(p_serial, p_type, p_m_mISDNport->earlyb)))
-       {
-               PERROR("no memory for portlist\n");
-               exit(-1);
-       }
+               FATAL("No memory for portlist\n");
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RESUME);
        message_put(message);
 
@@ -1785,17 +1726,18 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
        switch (prim)
        {
                case CC_TIMEOUT | INDICATION:
-               l1l2l3_trace_header(p_m_mISDNport, this, 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));
                }
-               if (timer_hex)
-                       add_trace("timer", NULL, "%x", timer_hex);
-               end_trace();
                if (timer_hex==0x312 && p_m_d_ntmode)
+               {
+                       l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+                       add_trace("timer", NULL, "%x", timer_hex);
+                       end_trace();
                        t312_timeout(prim, dinfo, data);
+               }
                break;
 
                case CC_SETUP | INDICATION:
@@ -1935,9 +1877,10 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
                }
                p_m_d_l3id = 0;
                p_m_delete = 1;
+//#warning remove me
+//PDEBUG(DEBUG_LOG, "JOLLY release cr %d\n", p_serial);
                /* 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)
                {
@@ -1983,45 +1926,43 @@ void Pdss1::new_state(int state)
        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)
        {
-               if (state == PORT_STATE_IN_OVERLAP)
+               p_m_timeout = p_m_mISDNport->ifport->tout_dialing;
+               time(&p_m_timer);
+       }
+       if (state != p_state)
+       {
+               if (state == PORT_STATE_IN_SETUP
+                || state == PORT_STATE_OUT_SETUP
+                || state == PORT_STATE_IN_OVERLAP
+                || state == PORT_STATE_OUT_OVERLAP)
                {
-                       p_m_timeout = p_settings.tout_dialing;
+                       p_m_timeout = p_m_mISDNport->ifport->tout_setup;
                        time(&p_m_timer);
                }
-               if (state != p_state)
+               if (state == PORT_STATE_IN_PROCEEDING
+                || state == PORT_STATE_OUT_PROCEEDING)
                {
-                       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);
-                       }
+                       p_m_timeout = p_m_mISDNport->ifport->tout_proceeding;
+                       time(&p_m_timer);
+               }
+               if (state == PORT_STATE_IN_ALERTING
+                || state == PORT_STATE_OUT_ALERTING)
+               {
+                       p_m_timeout = p_m_mISDNport->ifport->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_m_mISDNport->ifport->tout_disconnect;
+                       time(&p_m_timer);
                }
        }
        
@@ -2036,12 +1977,17 @@ int Pdss1::handler(void)
 {
        int ret;
 
+//if (p_m_delete && p_m_d_l3id==0)
+//     printf("ping! %d", p_serial);
        if ((ret = PmISDN::handler()))
                return(ret);
 
        /* handle destruction */
        if (p_m_delete && p_m_d_l3id==0)
        {
+//#warning remove 
+//PDEBUG(DEBUG_LOG, "JOLLY destroy object %d\n", p_serial);
+
                delete this;
                return(-1);
        }
@@ -2108,6 +2054,8 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
        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);
 
        /* only display at connect state: this case happens if endpoint is in connected mode */
        if (p_state==PORT_STATE_CONNECT)
@@ -2138,13 +2086,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                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;
@@ -2631,6 +2573,8 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
 
        /* 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);
 
        /* only display at connect state */
        if (p_state == PORT_STATE_CONNECT)
@@ -2739,8 +2683,8 @@ void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union pa
        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->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)
@@ -2757,7 +2701,7 @@ void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union pa
                release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, 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(&release_complete->CAUSE, dmsg, (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);
                new_state(PORT_STATE_RELEASE);
@@ -2765,7 +2709,7 @@ void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union pa
                return;
        }
 
-       /* NT-MODE in setup state we must send PROCEEDING first */
+       /* workarround: NT-MODE in setup state we must send PROCEEDING first to make it work */
        if (p_state==PORT_STATE_IN_SETUP)
        {
                CALL_PROCEEDING_t *proceeding;
@@ -2797,7 +2741,7 @@ void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union pa
        if (p_m_mISDNport->tones)
                enc_ie_progress(&disconnect->PROGRESS, dmsg, 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(&disconnect->CAUSE, dmsg, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
        /* send display */
        if (param->disconnectinfo.display[0])
                p = param->disconnectinfo.display;
@@ -2819,52 +2763,69 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param
        class Endpoint *epoint;
        char *p = NULL;
 
-       /* if we have incoming disconnected, we may release */
-       if (p_state==PORT_STATE_IN_DISCONNECT
-        || p_state==PORT_STATE_OUT_DISCONNECT)
+       /*
+        * we may only release during incomming disconnect state.
+        * this means that the endpoint doesnt require audio anymore
+        */
+       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(p_m_mISDNport, this, CC_RELEASE | REQUEST, 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(&release->CAUSE, dmsg, (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);
                new_state(PORT_STATE_RELEASE);
                /* remove epoint */
-               remove_endpoint:
                free_epointid(epoint_id);
-               l1l2l3_trace_header(p_m_mISDNport, this, 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)
+       /*
+        * 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)
+// // NOTE: a bug in mISDNuser (see disconnect_req_out !!!)
+//      || p_state==PORT_STATE_OUT_DISCO)
        {
-               /* sending release */
+//#warning remove me
+//PDEBUG(DEBUG_LOG, "JOLLY sending release complete %d\n", p_serial);
+               /* sending release complete */
                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(p_m_mISDNport, this, CC_RELEASE | REQUEST, 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(&release_complete->CAUSE, dmsg, (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);
                new_state(PORT_STATE_RELEASE);
-               goto remove_endpoint;
+               /* remove epoint */
+               free_epointid(epoint_id);
+#if 0
+               /* remove process */
+               l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_CR | REQUEST, DIRECTION_OUT);
+               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;
+#endif
+               // 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)
        {
@@ -2884,6 +2845,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param
                end_trace();
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
        }
+#endif
 
        /* sending disconnect */
        dmsg = create_l3msg(CC_DISCONNECT | REQUEST, MT_DISCONNECT, p_m_d_l3id, sizeof(DISCONNECT_t), p_m_d_ntmode);
@@ -2896,7 +2858,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param
        if (p_m_mISDNport->tones)
                enc_ie_progress(&disconnect->PROGRESS, dmsg, 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(&disconnect->CAUSE, dmsg, (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])
@@ -2905,9 +2867,12 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param
                enc_ie_display(&disconnect->DISPLAY, dmsg, (unsigned char *)p);
        end_trace();
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
-       new_state(PORT_STATE_RELEASE);
+       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);
 }
 
 
@@ -2964,10 +2929,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
                        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);
-               }
+                       FATAL("Pdss1(%s): epoint pointer is set in idle state, how bad!!\n", p_name);
                /* 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)
                {
@@ -2980,10 +2942,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
                        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);
-                       }
+                               FATAL("No memory for epointlist\n");
                        /* 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; 
@@ -3113,21 +3072,40 @@ int stack2manager_nt(void *dat, void *arg)
                        /* check out correct stack */
                        if (pdss1->p_m_mISDNport == mISDNport)
                        /* check out correct id */
-                       if ((hh->dinfo&0xffff0000) == (pdss1->p_m_d_l3id&0xffff0000))
+                       if ((pdss1->p_m_d_l3id&0x0000ff00) != 0x000ff00)
                        {
-                               /* found port, the message belongs to */
-                               break;
+                               /* a single process */
+                               if (hh->dinfo == pdss1->p_m_d_l3id)
+                               {
+                                       /* found port, the message belongs to */
+                                       break;
+                               }
+                       } else
+                       {
+                               /* a broadcast process */
+                               if ((hh->dinfo&0xffff0000) == (pdss1->p_m_d_l3id&0xffff0000))
+                               {
+                                       /* found port, the message belongs to */
+                                       break;
+                               }
                        }
                }
                port = port->next;
        }
        if (port)
        {
+//printf("%x %x\n", hh->dinfo, pdss1->p_m_d_l3id);
                /* 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))
+               if ((hh->dinfo&0x0000ff00)!=0x0000ff00 && (pdss1->p_m_d_l3id&0x0000ff00)==0x0000ff00)
                {
-                       /* send special indication for child disconnect */
-                       pdss1->disconnect_ind_i(hh->prim, hh->dinfo, msg->data);
+                       if (hh->prim == (CC_DISCONNECT|INDICATION))
+                       {
+                               /* send special indication for child disconnect */
+                               pdss1->disconnect_ind_i(hh->prim, hh->dinfo, msg->data);
+                               free_msg(msg);
+                               return(0);
+                       }
+                       // ignoring other messages from child processes
                        free_msg(msg);
                        return(0);
                }
@@ -3184,25 +3162,17 @@ int stack2manager_nt(void *dat, void *arg)
                        time(&mISDNport->l2establish);
                        PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
                }
+//#warning debugging usleep crash
+//             printf("JOLLY release port %d\n", mISDNport->portnum);
+               usleep(1);
                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);
-                       l1l2l3_trace_header(mISDNport, NULL, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-                       enc_ie_cause_standalone(mISDNport->ntmode?&release_complete->CAUSE:NULL, dmsg, (mISDNport->ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
-                       end_trace();
-                       msg_queue_tail(&mISDNport->downqueue, dmsg);
-                       break;
-               }
+                       FATAL("Cannot create Port instance.\n");
                pdss1->message_isdn(hh->prim, hh->dinfo, msg->data);
                break;
 
@@ -3210,19 +3180,7 @@ int stack2manager_nt(void *dat, void *arg)
                /* 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)))
-               {
-                       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);
-                       l1l2l3_trace_header(mISDNport, NULL, CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT);
-                       enc_ie_cause_standalone(mISDNport->ntmode?&suspend_reject->CAUSE:NULL, dmsg, (mISDNport->ntmode)?1:0, 47);
-                       end_trace();
-                       msg_queue_tail(&mISDNport->downqueue, dmsg);
-                       break;
-               }
+                       FATAL("Cannot create Port instance.\n");
                pdss1->message_isdn(hh->prim, hh->dinfo, msg->data);
                break;
 
@@ -3230,11 +3188,28 @@ int stack2manager_nt(void *dat, void *arg)
                PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", hh->dinfo);
                break;
 
-               case CC_DISCONNECT | INDICATION:
+               case CC_RELEASE_COMPLETE | INDICATION:
+               break;
+
+               case CC_FACILITY | INDICATION:
+               break;
 
-               // fall throug
                default:
                PERROR("unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", hh->prim, hh->dinfo, msg->len);
+               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;
+       //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 */
+                               PERROR("unhandled message: dinfo=%x is not associated with port-dinfo=%x\n",hh->dinfo,pdss1->p_m_d_l3id);
+                       }
+                       port = port->next;
+               }
                return(-EINVAL);
        }
        free_msg(msg);
@@ -3286,21 +3261,8 @@ int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg)
 
                /* 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, frm->dinfo, sizeof(RELEASE_COMPLETE_t), mISDNport->ntmode);
-                       release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + mISDN_HEADER_LEN);
-                       l1l2l3_trace_header(mISDNport, NULL, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-                       enc_ie_cause_standalone(mISDNport->ntmode?&release_complete->CAUSE:NULL, dmsg, (mISDNport->ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
-                       end_trace();
-                       msg_queue_tail(&mISDNport->downqueue, dmsg);
-                       free_msg(msg);
-                       return(0);
-               }
+               if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_TE_IN, mISDNport, name, NULL, 0, 0)))
+                       FATAL("Cannot create Port instance.\n");
                /* l3id will be set from dinfo at message_isdn */
                pdss1->message_isdn(frm->prim, frm->dinfo, msg->data);
                free_msg(msg);