socket api work
[lcr.git] / dss1.cpp
index ead7b56..9e7a230 100644 (file)
--- a/dss1.cpp
+++ b/dss1.cpp
@@ -71,8 +71,19 @@ Pdss1::~Pdss1()
 /*
  * create layer 3 message
  */
+#ifdef SOCKET_MISDN
+static struct l3_msg *create_l3msg(void)
+#else
 static msg_t *create_l3msg(int prim, int mt, int dinfo, int size, int ntmode)
+#endif
 {
+#ifdef SOCKET_MISDN
+       struct l3_msg *l3m;
+
+       l3m = alloc_l3_msg();
+       if (l3m)
+               return(l3m);
+#else
        msg_t *dmsg;
        Q931_info_t *qi;
        iframe_t *frm;
@@ -101,11 +112,13 @@ static msg_t *create_l3msg(int prim, int mt, int dinfo, int size, int ntmode)
                        return(dmsg);
                }
        }
+#endif
 
        FATAL("Cannot allocate memory, system overloaded.\n");
        exit(0); // make gcc happy
 }
 
+#ifndef SOCKET_MISDN
 msg_t *create_l2msg(int prim, int dinfo, int size) /* NT only */
 {
        msg_t *dmsg;
@@ -117,6 +130,7 @@ msg_t *create_l2msg(int prim, int dinfo, int size) /* NT only */
        FATAL("Cannot allocate memory, system overloaded.\n");
        exit(0); // make gcc happy
 }
+#endif
 
 /*
  * if we received a first reply to the setup message,
@@ -127,9 +141,13 @@ msg_t *create_l2msg(int prim, int dinfo, int size) /* NT only */
 int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int exclusive)
 {
        int ret;
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
        RELEASE_COMPLETE_t *release_complete;
        msg_t *dmsg;
+#endif
 
        /* correct exclusive to 0, if no explicit channel was given */
        if (exclusive<0 || channel<=0)
@@ -315,12 +333,28 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
        return(0);
 
        channelerror:
+       /*
+        * NOTE: we send MT_RELEASE_COMPLETE to "REJECT" the channel
+        * in response to the setup reply
+        */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+       enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+#else
        enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+#endif
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
        new_state(PORT_STATE_RELEASE);
        p_m_delete = 1;
        return(-34); /* to epoint: no channel available */
@@ -462,8 +496,13 @@ use_channel:
 /* CC_SETUP INDICATION */
 void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        SETUP_t *setup = (SETUP_t *)((unsigned long)data + headerlen);
+#endif
        int calling_type, calling_plan, calling_present, calling_screen;
        int called_type, called_plan;
        int redir_type, redir_plan, redir_present, redir_screen, redir_reason;
@@ -471,7 +510,6 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
        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 useruser[128];
        int useruser_len = 0, useruser_protocol;
@@ -510,18 +548,30 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
        dec_ie_bearer(setup->BEARER, (Q931_info_t *)((unsigned long)data+headerlen), &bearer_coding, &bearer_capability, &bearer_mode, &bearer_rate, &bearer_multi, &bearer_user);
        end_trace();
 
-       /* if blocked, release call */
+       /* if blocked, release call with MT_RELEASE_COMPLETE */
        if (p_m_mISDNport->ifport->block)
        {
                RELEASE_COMPLETE_t *release_complete;
 
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */
+#else
                enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */
+#endif
                add_trace("reason", NULL, "port blocked");
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                new_state(PORT_STATE_RELEASE);
                p_m_delete = 1;
                return;
@@ -715,14 +765,29 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
        if (ret < 0)
        {
                no_channel:
+               /*
+                * NOTE: we send MT_RELEASE_COMPLETE to "REJECT" the channel
+                * in response to the setup
+                */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                RELEASE_COMPLETE_t *release_complete;
-
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+#else
                enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                new_state(PORT_STATE_RELEASE);
                p_m_delete = 1;
                return;
@@ -996,15 +1061,19 @@ 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)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        CONNECT_t *connect = (CONNECT_t *)((unsigned long)data + headerlen);
+       CONNECT_ACKNOWLEDGE_t *connect_acknowledge;
+#endif
        int exclusive, channel;
        int type, plan, present, screen;
        int ret;
-       msg_t *dmsg;
        struct message *message;
        int bchannel_before;
-       CONNECT_ACKNOWLEDGE_t *connect_acknowledge;
 
        if (p_m_d_ntmode)
                p_m_d_ces = connect->ces;
@@ -1079,14 +1148,26 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
        if (p_m_d_ntmode)
        {
                /* send connect acknowledge */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                dmsg = create_l3msg(CC_CONNECT | RESPONSE, MT_CONNECT, dinfo, sizeof(CONNECT_ACKNOWLEDGE_t), p_m_d_ntmode);
                connect_acknowledge = (CONNECT_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_CONNECT | RESPONSE, DIRECTION_OUT);
                /* if we had no bchannel before, we send it now */
                if (!bchannel_before && p_m_b_channel)
+#ifdef SOCKET_MISDN
+                       enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
                        enc_ie_channel_id(&connect_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_CONNECT, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
        }
        
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CONNECT);
@@ -1118,16 +1199,32 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data)
        /* release if remote sends us no tones */
        if (!p_m_mISDNport->earlyb)
        {
-               RELEASE_t *release;
+#ifdef SOCKET_MISDN
+               l3_msg *l3m;
+#else
                msg_t *dmsg;
+               RELEASE_t *release;
+#endif
 
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, dinfo, sizeof(RELEASE_t), p_m_d_ntmode);
                release = (RELEASE_t *)(dmsg->data + headerlen);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */
+#else
                enc_ie_cause(&release->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */
+#endif
                add_trace("reason", NULL, "no remote patterns");
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
                /* sending release to endpoint */
                while(p_epointlist)
@@ -1193,9 +1290,13 @@ void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data
 /* CC_RELEASE INDICATION */
 void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       RELEASE_t *release = (RELEASE_t *)((unsigned long)data + headerlen);
        msg_t *dmsg;
+       RELEASE_t *release = (RELEASE_t *)((unsigned long)data + headerlen);
+#endif
        int location, cause;
        struct message *message;
 
@@ -1225,12 +1326,24 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
                /* sending release complete */
                RELEASE_COMPLETE_t *release_complete;
 
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16);
+#else
                enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
        }
 
        new_state(PORT_STATE_RELEASE);
@@ -1361,12 +1474,16 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data)
 /* CC_HOLD INDICATION */
 void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
 {
+       struct message *message;
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
 //     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;
+#endif
 //     class Endpoint *epoint;
 
        l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
@@ -1374,13 +1491,25 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
 
        if (!ACTIVE_EPOINT(p_epointlist) || p_m_hold)
        {
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_HOLD_REJECT | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, p_m_hold?101:31); /* normal unspecified / incompatible state */
+#else
                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 */
+#endif
                add_trace("reason", NULL, "no endpoint");
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_HOLD_REJECT, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
                return;
        }
@@ -1409,24 +1538,36 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
 #endif
 
        /* acknowledge hold */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_HOLD_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_HOLD_ACKNOWLEDGE, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 }
 
 
 /* CC_RETRIEVE INDICATION */
 void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        RETRIEVE_t *retrieve = (RETRIEVE_t *)((unsigned long)data + headerlen);
        RETRIEVE_REJECT_t *retrieve_reject;
        RETRIEVE_ACKNOWLEDGE_t *retrieve_acknowledge;
+#endif
        struct message *message;
        int channel, exclusive, cause;
-       msg_t *dmsg;
        int ret;
 
        l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
@@ -1438,12 +1579,24 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
                cause = 101; /* incompatible state */
                reject:
 
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RETRIEVE_REJECT | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause);
+#else
                enc_ie_cause(&retrieve_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RETRIEVE_REJECT, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
                return;
        }
@@ -1474,26 +1627,42 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
        p_m_timeout = 0;
 
        /* acknowledge retrieve */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_RETRIEVE_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+       enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
        enc_ie_channel_id(&retrieve_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RETRIEVE_ACKNOWLEDGE, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 }
 
 /* CC_SUSPEND INDICATION */
 void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        SUSPEND_t *suspend = (SUSPEND_t *)((unsigned long)data + headerlen);
        SUSPEND_ACKNOWLEDGE_t *suspend_acknowledge;
        SUSPEND_REJECT_t *suspend_reject;
+#endif
        struct message *message;
        class Endpoint *epoint;
        unsigned char callid[8];
        int len;
-       msg_t *dmsg;
        int ret = -31; /* normal, unspecified */
 
        l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
@@ -1503,12 +1672,24 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
        if (!ACTIVE_EPOINT(p_epointlist))
        {
                reject:
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+#else
                enc_ie_cause(&suspend_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SUSPEND_REJECT, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
                return;
        }
@@ -1556,11 +1737,19 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
        }
 
        /* sending SUSPEND_ACKNOWLEDGE */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_SUSPEND_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SUSPEND_ACKNOWLEDGE, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
        new_state(PORT_STATE_RELEASE);
        p_m_delete = 1;
@@ -1569,14 +1758,18 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
 /* CC_RESUME INDICATION */
 void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        RESUME_t *resume = (RESUME_t *)((unsigned long)data + headerlen);
        RESUME_REJECT_t *resume_reject;
        RESUME_ACKNOWLEDGE_t *resume_acknowledge;
+#endif
        unsigned char callid[8];
        int len;
        int channel, exclusive;
-       msg_t *dmsg;
        class Endpoint *epoint;
        struct message *message;
        int ret;
@@ -1627,14 +1820,26 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
        {
                no_channel:
                reject:
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RESUME_REJECT | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+#else
                enc_ie_cause(&resume_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
+#endif
                if (ret == -27)
                        add_trace("reason", NULL, "port blocked");
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RESUME_REJECT, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                new_state(PORT_STATE_RELEASE);
                p_m_delete = 1;
                return;
@@ -1673,12 +1878,24 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
        message_put(message);
 
        /* sending RESUME_ACKNOWLEDGE */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_RESUME_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+       enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
        enc_ie_channel_id(&resume_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RESUME_ACKNOWDGE, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
        new_state(PORT_STATE_CONNECT);
 }
@@ -1996,18 +2213,34 @@ int Pdss1::handler(void)
 /* MESSAGE_INFORMATION */
 void Pdss1::message_information(unsigned long epoint_id, int message_id, union parameter *param)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       INFORMATION_t *information;
        msg_t *dmsg;
+       INFORMATION_t *information;
+#endif
 
        if (param->information.id[0]) /* only if we have something to dial */
        {
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_called_pn(l3m, 0, 1, (unsigned char *)param->information.id);
+#else
                enc_ie_called_pn(&information->CALLED_PN, dmsg, 0, 1, (unsigned char *)param->information.id);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
        }
        new_state(p_state);
 }
@@ -2018,10 +2251,14 @@ int newteid = 0;
 /* MESSAGE_SETUP */
 void Pdss1::message_setup(unsigned long epoint_id, int message_id, union parameter *param)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        INFORMATION_t *information;
        SETUP_t *setup;
-       msg_t *dmsg;
+#endif
        int plan, type, screen, present, reason;
        int capability, mode, rate, coding, user, presentation, interpretation, hlc, exthlc;
        int channel, exclusive;
@@ -2060,13 +2297,25 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                if (p_callerinfo.display[0])
                {
                        /* sending information */
+#ifdef SOCKET_MISDN
+                       l3m = create_l3msg();
+#else
                        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);
+#endif
                        l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
                        if (p_m_d_ntmode)
+#ifdef SOCKET_MISDN
+                               enc_ie_display(l3m, (unsigned char *)p_callerinfo.display);
+#else
                                enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_callerinfo.display);
+#endif
                        end_trace();
+#ifdef SOCKET_MISDN
+                       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m);
+#else
                        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                        return;
                }
        }
@@ -2142,13 +2391,21 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
        end_trace();
 
        /* preparing setup message */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        dmsg = create_l3msg(CC_SETUP | REQUEST, MT_SETUP, p_m_d_l3id, sizeof(SETUP_t), p_m_d_ntmode);
        setup = (SETUP_t *)(dmsg->data + headerlen);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_SETUP | REQUEST, DIRECTION_OUT);
        /* channel information */
        if (channel >= 0) /* it should */
        {
+#ifdef SOCKET_MISDN
+               enc_ie_channel_id(l3m, exclusive, channel);
+#else
                enc_ie_channel_id(&setup->CHANNEL_ID, dmsg, exclusive, channel);
+#endif
        }
        /* caller information */
        plan = 1;
@@ -2189,19 +2446,35 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                break;
        }
        if (type >= 0)
+#ifdef SOCKET_MISDN
+               enc_ie_calling_pn(l3m, type, plan, present, screen, (unsigned char *)p_callerinfo.id);
+#else
                enc_ie_calling_pn(&setup->CALLING_PN, dmsg, type, plan, present, screen, (unsigned char *)p_callerinfo.id);
+#endif
        /* dialing information */
        if (p_dialinginfo.id[0]) /* only if we have something to dial */
        {
+#ifdef SOCKET_MISDN
+               enc_ie_called_pn(l3m, 0, 1, (unsigned char *)p_dialinginfo.id);
+#else
                enc_ie_called_pn(&setup->CALLED_PN, dmsg, 0, 1, (unsigned char *)p_dialinginfo.id);
+#endif
        }
        /* sending complete */
        if (p_dialinginfo.sending_complete)
+#ifdef SOCKET_MISDN
+               enc_ie_complete(l3m, 1);
+#else
                enc_ie_complete(&setup->COMPLETE, dmsg, 1);
+#endif
        /* sending user-user */
        if (param->setup.useruser.len)
        {
+#ifdef SOCKET_MISDN
+               enc_ie_useruser(l3m, param->setup.useruser.protocol, param->setup.useruser.data, param->setup.useruser.len);
+#else
                enc_ie_useruser(&setup->USER_USER, dmsg, param->setup.useruser.protocol, param->setup.useruser.data, param->setup.useruser.len);
+#endif
        }
        /* redirecting number */
        plan = 1;
@@ -2271,7 +2544,11 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
        }
        /* sending redirecting number only in ntmode */
        if (type >= 0 && p_m_d_ntmode)
+#ifdef SOCKET_MISDN
+               enc_ie_redir_nr(l3m, type, plan, present, screen, reason, (unsigned char *)p_redirinfo.id);
+#else
                enc_ie_redir_nr(&setup->REDIR_NR, dmsg, type, plan, present, screen, reason, (unsigned char *)p_redirinfo.id);
+#endif
        /* bearer capability */
 //printf("hlc=%d\n",p_capainfo.hlc);
        coding = 0;
@@ -2287,7 +2564,11 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                user = p_capainfo.bearer_info1 & 0x7f;
                break;
        }
+#ifdef SOCKET_MISDN
+       enc_ie_bearer(l3m, coding, capability, mode, rate, -1, user);
+#else
        enc_ie_bearer(&setup->BEARER, dmsg, coding, capability, mode, rate, -1, user);
+#endif
        /* hlc */
        if (p_capainfo.hlc)
        {
@@ -2298,19 +2579,31 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
                exthlc = -1;
                if (p_capainfo.exthlc)
                        exthlc = p_capainfo.exthlc & 0x7f;
+#ifdef SOCKET_MISDN
+               enc_ie_hlc(l3m, coding, interpretation, presentation, hlc, exthlc);
+#else
                enc_ie_hlc(&setup->HLC, dmsg, coding, interpretation, presentation, hlc, exthlc);
+#endif
        }
 
        /* display */
        if (p_callerinfo.display[0] && p_m_d_ntmode)
+#ifdef SOCKET_MISDN
+               enc_ie_display(l3m, (unsigned char *)p_callerinfo.display);
+#else
                enc_ie_display(&setup->DISPLAY, dmsg, (unsigned char *)p_callerinfo.display);
+#endif
        /* 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);
        end_trace();
 
        /* send setup message now */
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SETUP, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
        new_state(PORT_STATE_OUT_SETUP);
 }
@@ -2318,32 +2611,52 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
 /* MESSAGE_FACILITY */
 void Pdss1::message_facility(unsigned long epoint_id, int message_id, union parameter *param)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       FACILITY_t *facility;
        msg_t *dmsg;
+       FACILITY_t *facility;
+#endif
 
        /* facility will not be sent to external lines */
        if (!p_m_d_ntmode)
                return;
 
        /* sending facility */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_FACILITY | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+       enc_ie_facility(l3m, (unsigned char *)param->facilityinfo.data, param->facilityinfo.len);
+#else
        enc_ie_facility(&facility->FACILITY, dmsg, (unsigned char *)param->facilityinfo.data, param->facilityinfo.len);
+#endif
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_FACILITY, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 }
 
 /* MESSAGE_NOTIFY */
 void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parameter *param)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        INFORMATION_t *information;
        NOTIFY_t *notification;
+#endif
        int notify;
        int plan, type = -1, present;
-       msg_t *dmsg;
 
        if (param->notifyinfo.notify>INFO_NOTIFY_NONE)
                notify = param->notifyinfo.notify & 0x7f;
@@ -2409,52 +2722,104 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame
                } else
                {
                        /* sending notification */
+#ifdef SOCKET_MISDN
+                       l3m = create_l3msg();
+#else
                        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);
+#endif
                        l1l2l3_trace_header(p_m_mISDNport, this, CC_NOTIFY | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+                       enc_ie_notify(l3m, notify);
+#else
                        enc_ie_notify(&notification->NOTIFY, dmsg, notify);
+#endif
                        /* sending redirection number only in ntmode */
                        if (type >= 0 && p_m_d_ntmode)
+#ifdef SOCKET_MISDN
+                               enc_ie_redir_dn(l3m, type, plan, present, (unsigned char *)param->notifyinfo.id);
+#else
                                enc_ie_redir_dn(&notification->REDIR_DN, dmsg, type, plan, present, (unsigned char *)param->notifyinfo.id);
+#endif
                        if (param->notifyinfo.display[0] && p_m_d_ntmode)
+#ifdef SOCKET_MISDN
+                               enc_ie_display(l3m, (unsigned char *)param->notifyinfo.display);
+#else
                                enc_ie_display(&notification->DISPLAY, dmsg, (unsigned char *)param->notifyinfo.display);
+#endif
                        end_trace();
+#ifdef SOCKET_MISDN
+                       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_NOTIFICATION, l3m);
+#else
                        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                }
        } else if (p_m_d_ntmode)
        {
                /* sending information */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+               enc_ie_display(l3m, (unsigned char *)param->notifyinfo.display);
+#else
                enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)param->notifyinfo.display);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
        }
 }
 
 /* MESSAGE_OVERLAP */
 void Pdss1::message_overlap(unsigned long epoint_id, int message_id, union parameter *param)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       SETUP_ACKNOWLEDGE_t *setup_acknowledge;
        msg_t *dmsg;
+       SETUP_ACKNOWLEDGE_t *setup_acknowledge;
+#endif
 
        /* sending setup_acknowledge */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_SETUP_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
        /* channel information */
        if (p_state == PORT_STATE_IN_SETUP)
+#ifdef SOCKET_MISDN
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
                enc_ie_channel_id(&setup_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
        /* 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->tones)
+#ifdef SOCKET_MISDN
+               enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8);
+#else
                enc_ie_progress(&setup_acknowledge->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+#endif
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SETUP_ACKNOWLEDGE, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
        new_state(PORT_STATE_IN_OVERLAP);
 }
@@ -2462,25 +2827,45 @@ void Pdss1::message_overlap(unsigned long epoint_id, int message_id, union param
 /* MESSAGE_PROCEEDING */
 void Pdss1::message_proceeding(unsigned long epoint_id, int message_id, union parameter *param)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       CALL_PROCEEDING_t *proceeding;
        msg_t *dmsg;
+       CALL_PROCEEDING_t *proceeding;
+#endif
 
        /* sending proceeding */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
        /* channel information */
        if (p_state == PORT_STATE_IN_SETUP)
+#ifdef SOCKET_MISDN
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
                enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
        /* 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->tones)
+#ifdef SOCKET_MISDN
+               enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8);
+#else
                enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+#endif
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
        new_state(PORT_STATE_IN_PROCEEDING);
 }
@@ -2488,9 +2873,13 @@ void Pdss1::message_proceeding(unsigned long epoint_id, int message_id, union pa
 /* MESSAGE_ALERTING */
 void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union parameter *param)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
-       ALERTING_t *alerting;
        msg_t *dmsg;
+       ALERTING_t *alerting;
+#endif
 
        /* NT-MODE in setup state we must send PROCEEDING first */
        if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP)
@@ -2498,36 +2887,68 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para
                CALL_PROCEEDING_t *proceeding;
 
                /* sending proceeding */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
                /* channel information */
+#ifdef SOCKET_MISDN
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
                enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
                /* 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)
+#ifdef SOCKET_MISDN
+               enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8);
+#else
                enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                new_state(PORT_STATE_IN_PROCEEDING);
        }
 
        /* sending alerting */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_ALERTING | REQUEST, DIRECTION_OUT);
        /* channel information */
        if (p_state == PORT_STATE_IN_SETUP)
+#ifdef SOCKET_MISDN
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
                enc_ie_channel_id(&alerting->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
        /* 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->tones)
+#ifdef SOCKET_MISDN
+               enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8);
+#else
                enc_ie_progress(&alerting->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+#endif
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_ALERTING, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
        new_state(PORT_STATE_IN_ALERTING);
 }
@@ -2535,11 +2956,15 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para
 /* MESSAGE_CONNECT */
 void Pdss1::message_connect(unsigned long epoint_id, int message_id, union parameter *param)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        INFORMATION_t *information;
        CONNECT_t *connect;
+#endif
        int type, plan, present, screen;
-       msg_t *dmsg;
        class Endpoint *epoint;
 
        /* NT-MODE in setup state we must send PROCEEDING first */
@@ -2548,18 +2973,34 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
                CALL_PROCEEDING_t *proceeding;
 
                /* sending proceeding */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
                /* channel information */
+#ifdef SOCKET_MISDN
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
                enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
 //             /* 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)
+#ifdef SOCKET_MISDN
+//             enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8);
+#else
 //             enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                new_state(PORT_STATE_IN_PROCEEDING);
        }
 
@@ -2573,13 +3014,25 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
        if (p_connectinfo.display[0])
        {
                /* sending information */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
                if (p_m_d_ntmode)
+#ifdef SOCKET_MISDN
+                       enc_ie_display(l3m, (unsigned char *)p_connectinfo.display);
+#else
                        enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_connectinfo.display);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                return;
        }
 
@@ -2590,8 +3043,12 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
        }
 
        /* preparing connect message */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_CONNECT | REQUEST, DIRECTION_OUT);
        /* connect information */
        plan = 1;
@@ -2638,10 +3095,18 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
                break;
        }
        if (type >= 0)
+#ifdef SOCKET_MISDN
+               enc_ie_connected_pn(l3m, type, plan, present, screen, (unsigned char *)p_connectinfo.id);
+#else
                enc_ie_connected_pn(&connect->CONNECT_PN, dmsg, type, plan, present, screen, (unsigned char *)p_connectinfo.id);
+#endif
        /* display */
        if (p_connectinfo.display[0] && p_m_d_ntmode)
+#ifdef SOCKET_MISDN
+               enc_ie_display(l3m, (unsigned char *)p_connectinfo.display);
+#else
                enc_ie_display(&connect->DISPLAY, dmsg, (unsigned char *)p_connectinfo.display);
+#endif
        /* 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);
@@ -2649,11 +3114,19 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
        if (p_m_d_ntmode)
        {
                epoint = find_epoint_id(epoint_id);
+#ifdef SOCKET_MISDN
+               enc_ie_date(l3m, now, p_settings.no_seconds);
+#else
                enc_ie_date(&connect->DATE, dmsg, now, p_settings.no_seconds);
+#endif
        }
        end_trace();
        /* finally send message */
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_CONNECT, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
 
        if (p_m_d_ntmode)
                new_state(PORT_STATE_CONNECT);
@@ -2665,10 +3138,14 @@ 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)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        DISCONNECT_t *disconnect;
        RELEASE_COMPLETE_t *release_complete;
-       msg_t *dmsg;
+#endif
        struct message *message;
        char *p = NULL;
 
@@ -2687,13 +3164,25 @@ if (/*   ||*/ p_state==PORT_STATE_OUT_SETUP)
                        free_epointlist(p_epointlist);
                }
                /* sending release */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
                /* send cause */
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+#else
                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);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                new_state(PORT_STATE_RELEASE);
                p_m_delete = 1;
                return;
@@ -2705,51 +3194,91 @@ if (/*   ||*/ p_state==PORT_STATE_OUT_SETUP)
                CALL_PROCEEDING_t *proceeding;
 
                /* sending proceeding */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
                /* channel information */
+#ifdef SOCKET_MISDN
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
                enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
                /* 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)
+#ifdef SOCKET_MISDN
+                       enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8);
+#else
                        enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                new_state(PORT_STATE_IN_PROCEEDING);
        }
 
        /* sending disconnect */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_DISCONNECT | REQUEST, 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->tones)
+#ifdef SOCKET_MISDN
+               enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8);
+#else
                enc_ie_progress(&disconnect->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+#endif
        /* send cause */
+#ifdef SOCKET_MISDN
+       enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+#else
        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);
+#endif
        /* send display */
        if (param->disconnectinfo.display[0])
                p = param->disconnectinfo.display;
        if (p) if (*p && p_m_d_ntmode)
+#ifdef SOCKET_MISDN
+               enc_ie_display(l3m, (unsigned char *)p);
+#else
                enc_ie_display(&disconnect->DISPLAY, dmsg, (unsigned char *)p);
+#endif
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_DISCONNECT, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
        new_state(PORT_STATE_OUT_DISCONNECT);
 }
 
 /* MESSAGE_RELEASE */
 void Pdss1::message_release(unsigned long epoint_id, int message_id, union parameter *param)
 {
+#ifdef SOCKET_MISDN
+       l3_msg *l3m;
+#else
        int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
+       msg_t *dmsg;
        RELEASE_t *release;
        RELEASE_COMPLETE_t *release_complete;
        DISCONNECT_t *disconnect;
-       msg_t *dmsg;
+#endif
        class Endpoint *epoint;
        char *p = NULL;
 
@@ -2761,13 +3290,25 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param
         || p_state == PORT_STATE_OUT_DISCONNECT)
        {
                /* sending release */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
                /* send cause */
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+#else
                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);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                new_state(PORT_STATE_RELEASE);
                /* remove epoint */
                free_epointid(epoint_id);
@@ -2787,13 +3328,25 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param
 //#warning remove me
 //PDEBUG(DEBUG_LOG, "JOLLY sending release complete %d\n", p_serial);
                /* sending release complete */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
                /* send cause */
+#ifdef SOCKET_MISDN
+               enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+#else
                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);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
                new_state(PORT_STATE_RELEASE);
                /* remove epoint */
                free_epointid(epoint_id);
@@ -2822,41 +3375,77 @@ wirklich erst proceeding?:
                CALL_PROCEEDING_t *proceeding;
 
                /* sending proceeding */
+#ifdef SOCKET_MISDN
+               l3m = create_l3msg();
+#else
                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);
+#endif
                l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
                /* channel information */
+#ifdef SOCKET_MISDN
+               enc_ie_channel_id(l3m, 1, p_m_b_channel);
+#else
                enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
+#endif
                /* 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)
+#ifdef SOCKET_MISDN
+                       enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8);
+#else
                        enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+#endif
                end_trace();
+#ifdef SOCKET_MISDN
+               p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+#else
                msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
        }
 #endif
 
        /* sending disconnect */
+#ifdef SOCKET_MISDN
+       l3m = create_l3msg();
+#else
        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);
+#endif
        l1l2l3_trace_header(p_m_mISDNport, this, CC_DISCONNECT | REQUEST, 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->tones)
+#ifdef SOCKET_MISDN
+               enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8);
+#else
                enc_ie_progress(&disconnect->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8);
+#endif
        /* send cause */
+#ifdef SOCKET_MISDN
+       enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
+#else
        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);
+#endif
        /* 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)
+#ifdef SOCKET_MISDN
+               enc_ie_display(l3m, (unsigned char *)p);
+#else
                enc_ie_display(&disconnect->DISPLAY, dmsg, (unsigned char *)p);
+#endif
        end_trace();
+#ifdef SOCKET_MISDN
+       p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_DISCONNECT, l3m);
+#else
        msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
+#endif
        new_state(PORT_STATE_OUT_DISCONNECT);
        /* remove epoint */
        free_epointid(epoint_id);