X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=dss1.cpp;h=8f23c743db813282a6147f35106b64f022e074b1;hp=095f8ffd8f5ffeff769c495132ac30a961d03ab8;hb=bf3c4d173ad6ecf845de2d9e6d11ab87769d0943;hpb=e9daaa4ef7ee895e6a8610ebb2166cc99c891a4e diff --git a/dss1.cpp b/dss1.cpp index 095f8ff..8f23c74 100644 --- a/dss1.cpp +++ b/dss1.cpp @@ -36,7 +36,7 @@ extern "C" { */ Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive) : PmISDN(type, mISDNport, portname, settings, channel, exclusive) { - p_callerinfo.itype = (mISDNport->ifport->interface->extension)?INFO_ITYPE_ISDN:INFO_ITYPE_ISDN_EXTENSION; + p_callerinfo.itype = (mISDNport->ifport->interface->extension)?INFO_ITYPE_ISDN_EXTENSION:INFO_ITYPE_ISDN; p_m_d_ntmode = mISDNport->ntmode; p_m_d_l3id = 0; p_m_d_ces = -1; @@ -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 } /* @@ -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); @@ -469,7 +453,7 @@ int Pdss1::hunt_bchannel(int channel, int exclusive) } use_channel: add_trace("conclusion", NULL, "channel available"); - add_trace("connect", "channel", "%d", p_m_b_channel); + add_trace("connect", "channel", "%d", channel); end_trace(); return(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); @@ -518,7 +499,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_calling_pn(setup->CALLING_PN, (Q931_info_t *)((unsigned long)data+headerlen), &calling_type, &calling_plan, &calling_present, &calling_screen, (unsigned char *)p_callerinfo.id, sizeof(p_callerinfo.id)); - dec_ie_called_pn(setup->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &called_type, &called_plan, (unsigned char *)p_dialinginfo.number, sizeof(p_dialinginfo.number)); + dec_ie_called_pn(setup->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &called_type, &called_plan, (unsigned char *)p_dialinginfo.id, sizeof(p_dialinginfo.id)); dec_ie_keypad(setup->KEYPAD, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)keypad, sizeof(keypad)); #ifdef CENTREX /* te-mode: CNIP (calling name identification presentation) */ @@ -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); @@ -596,7 +577,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) SCPY(p_callerinfo.interface, p_m_mISDNport->ifport->interface->name); /* dialing information */ - SCAT(p_dialinginfo.number, (char *)keypad); + SCAT(p_dialinginfo.id, (char *)keypad); switch (called_type) { case 0x1: @@ -743,7 +724,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, -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); @@ -754,34 +735,13 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) /* create endpoint */ if (p_epointlist) - { - PERROR("SOFTWARE ERROR: incoming call but already got an endpoint, exitting...\n"); - exit(-1); - } - if (!(epoint = new Endpoint(p_serial, 0))) - { - RELEASE_COMPLETE_t *release_complete; - - dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - 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; - } + FATAL("Incoming call but already got an endpoint.\n"); + if (!(epoint = new Endpoint(p_serial, 0, 0))) + FATAL("No memory for Endpoint instance\n"); if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint))) - { - PERROR("no memory for application\n"); - exit(-1); - } - if (!(epointlist_new(epoint->ep_serial))) - { - PERROR("no memory for epointlist\n"); - exit(-1); - } + FATAL("No memory for Endpoint Application instance\n"); + epointlist_new(epoint->ep_serial); + /* send setup message to endpoit */ message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_SETUP); message->param.setup.isdn_port = p_m_portnum; @@ -808,12 +768,12 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data) struct message *message; l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); - dec_ie_called_pn(information->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, (unsigned char *)p_dialinginfo.number, sizeof(p_dialinginfo.number)); + dec_ie_called_pn(information->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, (unsigned char *)p_dialinginfo.id, sizeof(p_dialinginfo.id)); dec_ie_keypad(information->KEYPAD, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)keypad, sizeof(keypad)); dec_ie_complete(information->COMPLETE, (Q931_info_t *)((unsigned long)data+headerlen), &p_dialinginfo.sending_complete); end_trace(); - SCAT(p_dialinginfo.number, (char *)keypad); + SCAT(p_dialinginfo.id, (char *)keypad); switch (type) { case 0x1: @@ -1118,18 +1078,22 @@ 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); - - /* send connect acknowledge */ - 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); - 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) - enc_ie_channel_id(&connect_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); - end_trace(); - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); + SCPY(p_connectinfo.interface, p_m_mISDNport->ifport->interface->name); + /* only in nt-mode we send connect ack. in te-mode it is done by stack itself or optional */ + if (p_m_d_ntmode) + { + /* send connect acknowledge */ + 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); + 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) + enc_ie_channel_id(&connect_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); + end_trace(); + msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); + } + message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CONNECT); memcpy(&message->param.connectinfo, &p_connectinfo, sizeof(struct connect_info)); message_put(message); @@ -1150,12 +1114,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->is_earlyb) + /* release if remote sends us no tones */ + if (!p_m_mISDNport->earlyb) { RELEASE_t *release; msg_t *dmsg; @@ -1163,7 +1129,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); @@ -1219,33 +1185,11 @@ void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data } 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); @@ -1263,6 +1207,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; @@ -1287,7 +1233,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); } @@ -1296,7 +1242,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; @@ -1307,6 +1253,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; @@ -1425,7 +1373,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); @@ -1489,7 +1437,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); @@ -1554,7 +1502,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); @@ -1634,10 +1582,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); @@ -1681,7 +1626,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,10 +1639,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) /* 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) @@ -1714,16 +1656,9 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) if (!epoint) goto reject; - if (!(epointlist_new(epoint->ep_serial))) - { - PERROR("no memory for epointlist\n"); - exit(-1); - } - if (!(epoint->portlist_new(p_serial, p_type, p_m_mISDNport->is_earlyb))) - { - PERROR("no memory for portlist\n"); - exit(-1); - } + epointlist_new(epoint->ep_serial); + if (!(epoint->portlist_new(p_serial, p_type, p_m_mISDNport->earlyb))) + FATAL("No memory for portlist\n"); message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RESUME); message_put(message); @@ -1781,17 +1716,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: @@ -1931,9 +1867,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) { @@ -2032,12 +1969,17 @@ int Pdss1::handler(void) { int ret; - if ((ret = Port::handler())) +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); } @@ -2056,12 +1998,12 @@ void Pdss1::message_information(unsigned long epoint_id, int message_id, union p INFORMATION_t *information; msg_t *dmsg; - if (param->information.number[0]) /* only if we have something to dial */ + if (param->information.id[0]) /* only if we have something to dial */ { dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode); information = (INFORMATION_t *)(dmsg->data + headerlen); l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT); - enc_ie_called_pn(&information->CALLED_PN, dmsg, 0, 1, (unsigned char *)param->information.number); + enc_ie_called_pn(&information->CALLED_PN, dmsg, 0, 1, (unsigned char *)param->information.id); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); } @@ -2134,13 +2076,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; @@ -2251,9 +2187,9 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet if (type >= 0) enc_ie_calling_pn(&setup->CALLING_PN, dmsg, type, plan, present, screen, (unsigned char *)p_callerinfo.id); /* dialing information */ - if (p_dialinginfo.number[0]) /* only if we have something to dial */ + if (p_dialinginfo.id[0]) /* only if we have something to dial */ { - enc_ie_called_pn(&setup->CALLED_PN, dmsg, 0, 1, (unsigned char *)p_dialinginfo.number); + enc_ie_called_pn(&setup->CALLED_PN, dmsg, 0, 1, (unsigned char *)p_dialinginfo.id); } /* sending complete */ if (p_dialinginfo.sending_complete) @@ -2513,7 +2449,7 @@ void Pdss1::message_overlap(unsigned long epoint_id, int message_id, union param if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) - if (p_m_mISDNport->is_tones) + if (p_m_mISDNport->tones) enc_ie_progress(&setup_acknowledge->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -2539,7 +2475,7 @@ void Pdss1::message_proceeding(unsigned long epoint_id, int message_id, union pa if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) - if (p_m_mISDNport->is_tones) + if (p_m_mISDNport->tones) enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -2586,7 +2522,7 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) - if (p_m_mISDNport->is_tones) + if (p_m_mISDNport->tones) enc_ie_progress(&alerting->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -2735,8 +2671,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->is_tones) - || p_state==PORT_STATE_OUT_SETUP) +// if ((p_state==PORT_STATE_IN_SETUP && !p_m_mISDNport->tones) +if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) { /* sending release to endpoint */ while(p_epointlist) @@ -2753,7 +2689,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); @@ -2761,7 +2697,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; @@ -2790,10 +2726,10 @@ void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union pa if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) - if (p_m_mISDNport->is_tones) + 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; @@ -2815,52 +2751,68 @@ 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) { /* 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) { @@ -2880,6 +2832,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); @@ -2889,10 +2842,10 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) - if (p_m_mISDNport->is_tones) + 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]) @@ -2901,9 +2854,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); } @@ -2960,10 +2916,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) { @@ -2976,10 +2929,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; @@ -3186,19 +3136,8 @@ 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))) - { - 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; @@ -3206,19 +3145,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; @@ -3282,21 +3209,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);