X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=dss1.cpp;h=8f23c743db813282a6147f35106b64f022e074b1;hp=cbb622dddf3f42eea21ad2d1aed4ef171ad84880;hb=bf3c4d173ad6ecf845de2d9e6d11ab87769d0943;hpb=7dc10dcae129d2ef7f40a455aba45179eb68d1d8 diff --git a/dss1.cpp b/dss1.cpp index cbb622d..8f23c74 100644 --- a/dss1.cpp +++ b/dss1.cpp @@ -34,9 +34,9 @@ extern "C" { /* * constructor */ -Pdss1::Pdss1(int type, mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive) : PmISDN(type, mISDNport, portname, settings, channel, exclusive) +Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, 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,179 +82,44 @@ 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) - { - dmsg = prep_l3data_msg(prim, dinfo, size, 256, NULL); - if (dmsg) - { - return(dmsg); - } - } else - { - dmsg = alloc_msg(size+256+mISDN_HEADER_LEN+DEFAULT_HEADROOM); - if (dmsg) - { - memset(msg_put(dmsg,size+mISDN_HEADER_LEN), 0, size+mISDN_HEADER_LEN); - frm = (iframe_t *)dmsg->data; - frm->prim = prim; - frm->dinfo = dinfo; - qi = (Q931_info_t *)(dmsg->data + mISDN_HEADER_LEN); - qi->type = mt; - return(dmsg); - } - } - - if (!i) - PERROR("cannot allocate memory, trying again...\n"); - i++; - usleep(50000); - } - PERROR("cannot allocate memory, system overloaded.\n"); - exit(-1); -} - -msg_t *create_l2msg(int prim, int dinfo, int size) /* NT only */ -{ - int i = 0; - msg_t *dmsg; - - while(i < 10) + if (ntmode) { dmsg = prep_l3data_msg(prim, dinfo, size, 256, NULL); if (dmsg) - return(dmsg); - - if (!i) - PERROR("cannot allocate memory, trying again...\n"); - i++; - usleep(50000); - } - PERROR("cannot allocate memory, system overloaded.\n"); - exit(-1); -} - -/* isdn messaging */ -static struct isdn_message { - char *name; - unsigned long value; -} isdn_message[] = { - {"TIMEOUT", CC_TIMEOUT}, - {"SETUP", CC_SETUP}, - {"SETUP_ACK", CC_SETUP_ACKNOWLEDGE}, - {"PROCEEDING", CC_PROCEEDING}, - {"ALERTING", CC_ALERTING}, - {"CONNECT", CC_CONNECT}, - {"CONNECT RES", CC_CONNECT}, - {"CONNECT_ACK", CC_CONNECT_ACKNOWLEDGE}, - {"DISCONNECT", CC_DISCONNECT}, - {"RELEASE", CC_RELEASE}, - {"RELEASE_COMP", CC_RELEASE_COMPLETE}, - {"INFORMATION", CC_INFORMATION}, - {"PROGRESS", CC_PROGRESS}, - {"NOTIFY", CC_NOTIFY}, - {"SUSPEND", CC_SUSPEND}, - {"SUSPEND_ACK", CC_SUSPEND_ACKNOWLEDGE}, - {"SUSPEND_REJ", CC_SUSPEND_REJECT}, - {"RESUME", CC_RESUME}, - {"RESUME_ACK", CC_RESUME_ACKNOWLEDGE}, - {"RESUME_REJ", CC_RESUME_REJECT}, - {"HOLD", CC_HOLD}, - {"HOLD_ACK", CC_HOLD_ACKNOWLEDGE}, - {"HOLD_REJ", CC_HOLD_REJECT}, - {"RETRIEVE", CC_RETRIEVE}, - {"RETRIEVE_ACK", CC_RETRIEVE_ACKNOWLEDGE}, - {"RETRIEVE_REJ", CC_RETRIEVE_REJECT}, - {"FACILITY", CC_FACILITY}, - {"STATUS", CC_STATUS}, - {"RESTART", CC_RESTART}, - {"RELEASE_CR", CC_RELEASE_CR}, - {"NEW_CR", CC_NEW_CR}, - {"DL_ESTABLSIH", DL_ESTABLSIH}, - {"DL_RELEASE", DL_RELEASE}, - {"PH_ACTICATIE", PH_ACTICATIE}, - {"PH_DEACTICATIE", PH_DEACTICATIE}, - - {NULL, 0}, -}; - -static char *isdn_prim[4] = { - " REQUEST", - " CONFIRM", - " INDICATION", - " RESPONSE", -}; - - -/* - * isdn trace header - */ -void Pdss1::l1l2l3_trace_header(unsigned long prim, int direction_out) -{ - int i; - char msgtext[64] = "<>"; - - /* select message and primitive text */ - i = 0; - while(isdn_message[i].name) - { - if (isdn_message[i].value == (prim&0xffffff00)) { - SCPY(msgtext, isdn_message[i].name); - break; + return(dmsg); } - i++; - } - SCAT(msgtext, isdn_prim[prim&0x00000003]); - - /* add direction */ - if (direction && (prim&0xffffff00)!=CC_NEW_CR && (prim&0xffffff00)!=CC_RELEASE_CR) + } else { - if (p_m_ntmode) - { - if (direction == DIRECTION_OUT) - SCAT(msgtext, " N->U"); - else - SCAT(msgtext, " N<-U"); - } else + dmsg = alloc_msg(size+256+mISDN_HEADER_LEN+DEFAULT_HEADROOM); + if (dmsg) { - if (direction == DIRECTION_OUT) - SCAT(msgtext, " U->N"); - else - SCAT(msgtext, " U<-N"); + 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); } } - /* init trace with given values */ - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - direction, - CATEGORY_L3, - p_serial, - msgtext); + FATAL("Cannot allocate memory, system overloaded.\n"); + exit(0); // make gcc happy } - -void Pdss1::chan_trace_header(char *msgtext) +msg_t *create_l2msg(int prim, int dinfo, int size) /* NT only */ { - int i; + msg_t *dmsg; + dmsg = prep_l3data_msg(prim, dinfo, size, 256, NULL); + if (dmsg) + return(dmsg); - /* init trace with given values */ - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - 0, - CATEGORY_L3, - p_serial, - msgtext); + FATAL("Cannot allocate memory, system overloaded.\n"); + exit(0); // make gcc happy } - /* * if we received a first reply to the setup message, * we will check if we have now channel information @@ -282,7 +146,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex if (p_state != PORT_STATE_OUT_SETUP) return(0); - chan_trace_header("CHANNEL SELECTION (first reply to setup)"); + chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE); add_trace("channel", "request", "%d (forced)", p_m_b_channel); add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel); @@ -300,7 +164,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex end_trace(); /* activate our exclusive channel */ - bchannel_activate(p_m_mISDNport, p_m_b_index); + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE); } else if (p_m_b_channel) { @@ -310,7 +174,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex if (p_state != PORT_STATE_OUT_SETUP) return(0); - chan_trace_header("CHANNEL SELECTION (first reply to setup)"); + chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE); add_trace("channel", "request", "%d (suggest)", p_m_b_channel); add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel); @@ -321,7 +185,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex add_trace("connect", "channel", "%d", p_m_b_channel); end_trace(); p_m_b_exclusive = 1; // we are done - bchannel_activate(p_m_mISDNport, p_m_b_index); + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE); return(0); } @@ -348,7 +212,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex end_trace(); /* activate channel given by remote */ - bchannel_activate(p_m_mISDNport, p_m_b_index); + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE); } else if (p_m_b_reserve) { @@ -358,7 +222,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex if (p_state != PORT_STATE_OUT_SETUP) return(0); - chan_trace_header("CHANNEL SELECTION (first reply to setup)"); + chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE); add_trace("channel", "request", "any"); add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel); /* if no channel was replied */ @@ -384,7 +248,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex end_trace(); /* activate channel given by remote */ - bchannel_activate(p_m_mISDNport, p_m_b_index); + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE); } else { /*** we sent 'no channel available' ***/ @@ -392,7 +256,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex /* if not the first reply, but a connect, we are forced */ if (prim==(CC_CONNECT | INDICATION) && p_state!=PORT_STATE_OUT_SETUP) { - chan_trace_header("CHANNEL SELECTION (connect)"); + chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (connect)", DIRECTION_NONE); add_trace("channel", "request", "no-channel"); add_trace("channel", "reply", (channel>=0)?"%d%s":"(none)", channel, exclusive?" (forced)":""); if (channel > 0) @@ -413,7 +277,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex p_m_b_exclusive = 1; // we are done /* activate channel given by remote */ - bchannel_activate(p_m_mISDNport, p_m_b_index); + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE); return(0); } @@ -421,7 +285,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex if (p_state != PORT_STATE_OUT_SETUP) return(0); - chan_trace_header("CHANNEL SELECTION (first reply to setup)"); + chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE); add_trace("channel", "request", "no-channel"); add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel); /* if first reply has no channel, we are done */ @@ -448,16 +312,15 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex p_m_b_exclusive = 1; // we are done /* activate channel given by remote */ - bchannel_activate(p_m_mISDNport, p_m_b_index); + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE); } return(0); channelerror: dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); - release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); + l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); + 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); @@ -467,6 +330,135 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex /* + * hunt bchannel for incomming setup or retrieve or resume + */ +int Pdss1::hunt_bchannel(int channel, int exclusive) +{ + struct select_channel *selchannel; + struct interface_port *ifport = p_m_mISDNport->ifport; + int i; + + chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (setup)", DIRECTION_NONE); + if (exclusive<0) + exclusive = 0; + if (channel == CHANNEL_NO) + add_trace("channel", "request", "no-channel"); + else + add_trace("channel", "request", (channel>0)?"%d%s":"any", channel, exclusive?" (forced)":""); + if (channel==CHANNEL_NO && p_type==PORT_TYPE_DSS1_TE_IN) + { + add_trace("conclusion", NULL, "incoming call-waiting not supported for TE-mode"); + end_trace(); + return(-6); // channel unacceptable + } + if (channel <= 0) /* not given, no channel, whatever.. */ + channel = CHANNEL_ANY; /* any channel */ + if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) // of out chan.. + { + add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved); + add_trace("conclusion", NULL, "all channels are reserved"); + end_trace(); + return(-34); // no channel + } + if (channel == CHANNEL_ANY) + goto get_from_list; + if (channel > 0) + { + /* check for given channel in selection list */ + selchannel = ifport->in_channel; + while(selchannel) + { + if (selchannel->channel == channel || selchannel->channel == CHANNEL_FREE) + break; + selchannel = selchannel->next; + } + if (!selchannel) + channel = 0; + + /* exclusive channel requests must be in the list */ + if (exclusive) + { + if (!channel) + { + add_trace("conclusion", NULL, "exclusively requested channel not in list"); + end_trace(); + return(-6); // channel unacceptable + } + i = selchannel->channel-1-(selchannel->channel>=17); + if (p_m_mISDNport->b_port[i] == NULL) + goto use_channel; + add_trace("conclusion", NULL, "exclusively requested channel is busy"); + end_trace(); + return(-6); // channel unacceptable + } + + /* requested channels in list will be used */ + if (channel) + { + i = selchannel->channel-1-(selchannel->channel>=17); + if (p_m_mISDNport->b_port[i] == NULL) + goto use_channel; + } + + /* if channel is not available or not in list, it must be searched */ + get_from_list: + /* check for first free channel in list */ + channel = 0; + selchannel = ifport->in_channel; + while(selchannel) + { + switch(selchannel->channel) + { + case CHANNEL_FREE: /* free channel */ + add_trace("hunting", "channel", "free"); + if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) + break; /* all channel in use or reserverd */ + /* find channel */ + i = 0; + while(i < p_m_mISDNport->b_num) + { + if (p_m_mISDNport->b_port[i] == NULL) + { + channel = i+1+(i>=15); + break; + } + i++; + } + break; + + default: + add_trace("hunting", "channel", "%d", selchannel->channel); + if (selchannel->channel<1 || selchannel->channel==16) + break; /* invalid channels */ + i = selchannel->channel-1-(selchannel->channel>=17); + if (i >= p_m_mISDNport->b_num) + break; /* channel not in port */ + if (p_m_mISDNport->b_port[i] == NULL) + { + channel = selchannel->channel; + break; + } + break; + } + if (channel) + break; /* found channel */ + selchannel = selchannel->next; + } + if (!channel) + { + add_trace("conclusion", NULL, "no channel available"); + end_trace(); + return(-6); // channel unacceptable + } + } +use_channel: + add_trace("conclusion", NULL, "channel available"); + add_trace("connect", "channel", "%d", channel); + end_trace(); + return(channel); +} + +/* * handles all indications */ /* CC_SETUP INDICATION */ @@ -474,8 +466,11 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) { int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; SETUP_t *setup = (SETUP_t *)((unsigned long)data + headerlen); - int type, plan, present, screen, reason; - int coding, capability, mode, rate, multi, user, presentation, interpretation, hlc, exthlc; + int calling_type, calling_plan, calling_present, calling_screen; + int called_type, called_plan; + int redir_type, redir_plan, redir_present, redir_screen, redir_reason; + int hlc_coding, hlc_presentation, hlc_interpretation, hlc_hlc, hlc_exthlc; + int bearer_coding, bearer_capability, bearer_mode, bearer_rate, bearer_multi, bearer_user; int exclusive, channel; int ret; msg_t *dmsg; @@ -490,11 +485,8 @@ 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); - } - l1l2l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN); + 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); add_trace("callref", "new", "0x%x", dinfo); @@ -505,9 +497,9 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_m_d_ces = setup->ces; } - l1l2l3_trace_header(prim, DIRECTION_IN); + 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) */ @@ -518,8 +510,8 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) dec_ie_complete(setup->COMPLETE, (Q931_info_t *)((unsigned long)data+headerlen), &p_dialinginfo.sending_complete); dec_ie_redir_nr(setup->REDIR_NR, (Q931_info_t *)((unsigned long)data+headerlen), &redir_type, &redir_plan, &redir_present, &redir_screen, &redir_reason, (unsigned char *)p_redirinfo.id, sizeof(p_redirinfo.id)); dec_ie_channel_id(setup->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel); - dec_ie_hlc(setup->HLC, (Q931_info_t *)((unsigned long)data+headerlen), &hlc_coding, &interpretation, &presentation, &hlc, &exthlc); - dec_ie_bearer(setup->BEARER, (Q931_info_t *)((unsigned long)data+headerlen), &bearer_coding, &capability, &mode, &rate, &multi, &user); + dec_ie_hlc(setup->HLC, (Q931_info_t *)((unsigned long)data+headerlen), &hlc_coding, &hlc_interpretation, &hlc_presentation, &hlc_hlc, &hlc_exthlc); + 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 */ @@ -527,11 +519,10 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) { RELEASE_COMPLETE_t *release_complete; - printlog("--- port#%d is blocked.\n", mISDNport->ifport->portnum); dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */ + l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); + 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); @@ -541,7 +532,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) } /* caller info */ - switch (present) + switch (calling_present) { case 1: p_callerinfo.present = INFO_PRESENT_RESTRICTED; @@ -553,7 +544,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_callerinfo.present = INFO_PRESENT_ALLOWED; break; } - switch (screen) + switch (calling_screen) { case 0: p_callerinfo.screen = INFO_SCREEN_USER; @@ -562,7 +553,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_callerinfo.screen = INFO_SCREEN_NETWORK; break; } - switch (type) + switch (calling_type) { case -1: p_callerinfo.ntype = INFO_NTYPE_UNKNOWN; @@ -586,8 +577,8 @@ 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); - switch (type) + SCAT(p_dialinginfo.id, (char *)keypad); + switch (called_type) { case 0x1: p_dialinginfo.ntype = INFO_NTYPE_INTERNATIONAL; @@ -602,7 +593,9 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_dialinginfo.ntype = INFO_NTYPE_UNKNOWN; break; } - switch (present) + + /* redir info */ + switch (redir_present) { case 1: p_redirinfo.present = INFO_PRESENT_RESTRICTED; @@ -614,7 +607,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_redirinfo.present = INFO_PRESENT_ALLOWED; break; } - switch (screen) + switch (redir_screen) { case 0: p_redirinfo.screen = INFO_SCREEN_USER; @@ -623,7 +616,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_redirinfo.screen = INFO_SCREEN_NETWORK; break; } - switch (reason) + switch (redir_reason) { case 1: p_redirinfo.reason = INFO_REDIR_BUSY; @@ -644,7 +637,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_redirinfo.reason = INFO_REDIR_UNKNOWN; break; } - switch (type) + switch (redir_type) { case -1: p_redirinfo.ntype = INFO_NTYPE_UNKNOWN; @@ -667,17 +660,17 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_redirinfo.isdn_port = p_m_portnum; /* bearer capability */ - switch (capability) + switch (bearer_capability) { case -1: p_capainfo.bearer_capa = INFO_BC_AUDIO; - user = (options.law=='a')?3:2; + bearer_user = (options.law=='a')?3:2; break; default: - p_capainfo.bearer_capa = capability; + p_capainfo.bearer_capa = bearer_capability; break; } - switch (mode) + switch (bearer_mode) { case 2: p_capainfo.bearer_mode = INFO_BMODE_PACKET; @@ -686,211 +679,69 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_capainfo.bearer_mode = INFO_BMODE_CIRCUIT; break; } - switch (user) + switch (bearer_user) { case -1: p_capainfo.bearer_info1 = INFO_INFO1_NONE; break; default: - p_capainfo.bearer_info1 = user + 0x80; + p_capainfo.bearer_info1 = bearer_user + 0x80; break; } /* hlc */ - switch (hlc) + switch (hlc_hlc) { case -1: p_capainfo.hlc = INFO_HLC_NONE; break; default: - p_capainfo.hlc = hlc + 0x80; + p_capainfo.hlc = hlc_hlc + 0x80; break; } - switch (exthlc) + switch (hlc_exthlc) { case -1: p_capainfo.exthlc = INFO_HLC_NONE; break; default: - p_capainfo.exthlc = exthlc + 0x80; + p_capainfo.exthlc = hlc_exthlc + 0x80; break; } - /* process channel */ - chan_trace_header("CHANNEL SELECTION (setup)"); - if (exclusive<0) - exclusive = 0; - if (channel == CHANNEL_NO) - add_trace("channel", "request", "no-channel"); - else - add_trace("channel", "request", (channel>0)?"%d%s":"any", channel, exclusive?" (forced)":""); - if (channel==CHANNEL_NO && p_type==PORT_TYPE_DSS1_TE_IN) - { - add_trace("conclusion", NULL, "incoming call-waiting not supported for TE-mode"); - end_trace(); - ret = -6; // channel unacceptable - goto no_channel; - } - if (channel <= 0) /* not given, no channel, whatever.. */ - channel = CHANNEL_ANY; /* any channel */ - if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) // of out chan.. - { - add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved); - add_trace("conclusion", NULL, "all channels are reserved"); - end_trace(); - ret = -34; // no channel + /* hunt channel */ + ret = channel = hunt_bchannel(channel, exclusive); + if (ret < 0) goto no_channel; - } - if (channel == CHANNEL_ANY) - goto get_from_list; - if (channel > 0) - { - /* check for given channel in selection list */ - selchannel = ifport->channel_in; - while(selchannel) - { - if (selchannel->channel == channel || selchannel->channel == CHANNEL_FREE) - break; - selchannel = selchannel->next; - } - if (!selchannel) - channel = 0; - - /* exclusive channel requests must be in the list */ - if (exclusive) - { - if (!channel) - { - add_trace("conclusion", NULL, "exclusively requested channel not in list"); - end_trace(); - ret = 6; // unacceptable - goto no_channel; - } - i = selchannel->channel-1-(selchannel->channel>=17); - if (mISDNport->b_port[i] == NULL) - goto use_channel; - add_trace("conclusion", NULL, "exclusively requested channel is busy"); - end_trace(); - ret = 6; // unacceptable - goto no_channel; - } - - /* requested channels in list will be used */ - if (channel) - { - i = selchannel->channel-1-(selchannel->channel>=17); - if (mISDNport->b_port[i] == NULL) - goto use_channel; - } - - /* if channel is not available or not in list, it must be searched */ - get_from_list: - /* check for first free channel in list */ - channel = 0; - selchannel = ifport->channel_in; - while(selchannel) - { - switch(selchannel->channel) - { - case CHANNEL_FREE: /* free channel */ - add_trace("hunting", "channel", "free"); - if (mISDNport->b_inuse >= mISDNport->b_num) - break; /* all channel in use or reserverd */ - /* find channel */ - i = 0; - while(i < mISDNport->b_num) - { - if (mISDNport->b_port[i] == NULL) - { - channel = i+1+(i>=15); - break; - } - i++; - } - break; - - default: - add_trace("hunting", "channel", "%d", selchannel->channel); - if (selchannel->channel<1 || selchannel->channel==16) - break; /* invalid channels */ - i = selchannel->channel-1-(selchannel->channel>=17); - if (i >= mISDNport->b_num) - break; /* channel not in port */ - if (mISDNport->b_port[i] == NULL) - { - channel = selchannel->channel; - break; - } - break; - } - if (channel) - break; /* found channel */ - selchannel = selchannel->next; - } - if (!channel) - { - add_trace("conclusion", NULL, "no channel available"); - end_trace(); - ret = 6; // unacceptable - goto no_channel; - } - } /* open channel */ - use_channel: ret = seize_bchannel(channel, 1); if (ret < 0) { - add_trace("conclusion", NULL, "channel not available"); - end_trace(); no_channel: RELEASE_COMPLETE_t *release_complete; dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); + l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); + enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); new_state(PORT_STATE_RELEASE); p_m_delete = 1; return; } - add_trace("conclusion", NULL, "channel available"); - add_trace("connect", "channel", "%d", p_m_b_channel); - end_trace(); - bchannel_activate(p_m_mISDNport, p_m_b_index); + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE); /* 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); - l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); - release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 41); /* temporary failure */ - end_trace(); - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); - new_state(PORT_STATE_RELEASE); - p_m_delete = 1; - return; - } + 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; @@ -916,13 +767,13 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data) unsigned char keypad[32] = ""; struct message *message; - l1l2l3_trace_header(prim, DIRECTION_IN); - dec_ie_called_pn(information->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, (unsigned char *)p_dialinginfo.number, sizeof(p_dialinginfo.number)); + 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.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: @@ -955,7 +806,7 @@ void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void int ret; struct message *message; - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_channel_id(setup_acknowledge->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel); dec_ie_progress(setup_acknowledge->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &location, &progress); end_trace(); @@ -991,7 +842,7 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) int notify = -1, type, plan, present; char redir[32]; - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_channel_id(proceeding->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel); dec_ie_progress(proceeding->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &location, &progress); dec_ie_notify(NULL/*proceeding->NOTIFY*/, (Q931_info_t *)((unsigned long)data+headerlen), ¬ify); @@ -1074,7 +925,7 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) int notify = -1, type, plan, present; char redir[32]; - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_channel_id(alerting->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel); dec_ie_progress(alerting->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &location, &progress); dec_ie_notify(NULL/*alerting->NOTIFY*/, (Q931_info_t *)((unsigned long)data+headerlen), ¬ify); @@ -1161,7 +1012,7 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) if (p_m_d_ntmode) p_m_d_ces = connect->ces; - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_channel_id(connect->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel); dec_ie_connected_pn(connect->CONNECT_PN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, &screen, (unsigned char *)p_connectinfo.id, sizeof(p_connectinfo.id)); #ifdef CENTREX @@ -1227,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_connectingo.interface, p_m_mISDNport->ifport->interface->name); - - /* send connect acknowledge */ - dmsg = create_l3msg(CC_CONNECT | RESPONSE, MT_CONNECT, dinfo, sizeof(CONNECT_ACKNOWLEDGE_t), p_m_d_ntmode); - l1l2l3_trace_header(CC_CONNECT | RESPONSE, DIRECTION_OUT); - connect_acknowledge = (CONNECT_ACKNOWLEDGE_t *)(dmsg->data + headerlen); - /* if we had no bchannel before, we send it now */ - if (!bchannel_before && p_m_b_channel) - enc_ie_channel_id(&connect_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); - end_trace(); - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); + SCPY(p_connectinfo.interface, p_m_mISDNport->ifport->interface->name); + /* only in nt-mode we send connect ack. in te-mode it is done by stack itself or optional */ + if (p_m_d_ntmode) + { + /* send connect acknowledge */ + 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); @@ -1255,24 +1110,26 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data) int coding, proglocation, progress; struct message *message; - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_progress(disconnect->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &proglocation, &progress); dec_ie_cause(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); 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; dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, dinfo, sizeof(RELEASE_t), p_m_d_ntmode); release = (RELEASE_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_RELEASE | REQUEST, DIRECTION_OUT); - enc_ie_cause(&release->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */ + l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT); + 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); @@ -1320,7 +1177,7 @@ void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data int location, cause; /* cause */ - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); if (p_m_d_collect_cause > 0) { add_trace("old-cause", "location", "%d", p_m_d_collect_location); @@ -1328,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); @@ -1369,9 +1204,11 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data) int location, cause; struct message *message; - l1l2l3_trace_header(prim, DIRECTION_IN); + 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; @@ -1395,8 +1232,8 @@ 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(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); + l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); + 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); } @@ -1405,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; @@ -1413,9 +1250,11 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void * int location, cause; struct message *message; - l1l2l3_trace_header(prim, DIRECTION_IN); + 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; @@ -1465,7 +1304,7 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data) struct message *message; int notify, type, plan, present; - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_notify(notifying->NOTIFY, (Q931_info_t *)((unsigned long)data+headerlen), ¬ify); dec_ie_redir_dn(notifying->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)message->param.notifyinfo.id, sizeof(message->param.notifyinfo.id)); end_trace(); @@ -1526,15 +1365,15 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data) msg_t *dmsg; // class Endpoint *epoint; - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); end_trace(); if (!ACTIVE_EPOINT(p_epointlist) || p_m_hold) { dmsg = create_l3msg(CC_HOLD_REJECT | REQUEST, MT_HOLD_REJECT, dinfo, sizeof(HOLD_REJECT_t), p_m_d_ntmode); hold_reject = (HOLD_REJECT_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_HOLD_REJECT | REQUEST, DIRECTION_OUT); - enc_ie_cause(&hold_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, p_m_hold?101:31); /* normal unspecified / incompatible state */ + l1l2l3_trace_header(p_m_mISDNport, this, CC_HOLD_REJECT | REQUEST, DIRECTION_OUT); + 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); @@ -1549,11 +1388,10 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data) message_put(message); /* deactivate bchannel */ - chan_trace_header("CHANNEL RELEASE (hold)"); + chan_trace_header(p_m_mISDNport, this, "CHANNEL RELEASE (hold)", DIRECTION_NONE); add_trace("disconnect", "channel", "%d", p_m_b_channel); end_trace(); - free_bchannel(); -prüfen, ob bei allen alloc_bchannel/free_bchannel ein trace erfolgt + drop_bchannel(); /* set hold state */ p_m_hold = 1; @@ -1569,7 +1407,7 @@ pr /* acknowledge hold */ dmsg = create_l3msg(CC_HOLD_ACKNOWLEDGE | REQUEST, MT_HOLD_ACKNOWLEDGE, dinfo, sizeof(HOLD_ACKNOWLEDGE_t), p_m_d_ntmode); hold_acknowledge = (HOLD_ACKNOWLEDGE_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_HOLD_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_HOLD_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); } @@ -1587,7 +1425,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) msg_t *dmsg; int ret; - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_channel_id(retrieve->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel); end_trace(); @@ -1598,8 +1436,8 @@ 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(CC_RETRIEVE_REJECT | REQUEST, DIRECTION_OUT); - enc_ie_cause(&retrieve_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause); + l1l2l3_trace_header(p_m_mISDNport, this, CC_RETRIEVE_REJECT | REQUEST, DIRECTION_OUT); + 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); @@ -1612,63 +1450,21 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) message->param.notifyinfo.local = 1; /* call is retrieved by supplementary service */ message_put(message); + /* hunt channel */ + ret = channel = hunt_bchannel(channel, exclusive); + if (ret < 0) + goto no_channel; - -mach den channel-kram, wie beim setup - - - - - - - - - - /* channel_id */ - chan_trace_header("CHANNEL RELEASE (retrieve)"); - if (exclusive<0) - exclusive = 0; -alle channels richtig convertieren - if (channel < 0) - channel = -1; /* any channel */ - if (channel == ANY_CHANNEL) - channel = -1; /* any channel */ - if (channel == CHANNEL_NO) - add_trace("channel", "request", "no-channel"); - else - add_trace("channel", "request", (channel>0)?"%d%s":"any", channel, exclusive?" (forced)":""); - /* debug */ - if (channel==CHANNEL_NO && (p_type==PORT_TYPE_DSS1_TE_IN||p_type==PORT_TYPE_DSS1_TE_OUT)) - { - add_trace("conclusion", NULL, "incoming call-waiting not supported for TE-mode"); - end_trace(); - cause = 6; - goto reject; - } /* open channel */ - ret = alloc_bchannel(channel, exclusive); + ret = seize_bchannel(channel, 1); if (ret < 0) { - PDEBUG(DEBUG_BCHANNEL, "- channel is not available (cause=%d), so we send a retrieve_reject.\n", -ret); + no_channel: cause = -ret; goto reject; } + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE); - - - - - - - - - - - - - - - /* set hold state */ p_m_hold = 0; p_m_timeout = 0; @@ -1676,7 +1472,7 @@ alle channels richtig convertieren /* acknowledge retrieve */ dmsg = create_l3msg(CC_RETRIEVE_ACKNOWLEDGE | REQUEST, MT_RETRIEVE_ACKNOWLEDGE, dinfo, sizeof(RETRIEVE_ACKNOWLEDGE_t), p_m_d_ntmode); retrieve_acknowledge = (RETRIEVE_ACKNOWLEDGE_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_RETRIEVE_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_RETRIEVE_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); enc_ie_channel_id(&retrieve_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -1696,7 +1492,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) msg_t *dmsg; int ret = -31; /* normal, unspecified */ - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_call_id(suspend->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len); end_trace(); @@ -1705,8 +1501,8 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) reject: dmsg = create_l3msg(CC_SUSPEND_REJECT | REQUEST, MT_SUSPEND_REJECT, dinfo, sizeof(SUSPEND_REJECT_t), p_m_d_ntmode); suspend_reject = (SUSPEND_REJECT_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT); - enc_ie_cause(&suspend_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); + l1l2l3_trace_header(p_m_mISDNport, this, CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT); + 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); @@ -1739,10 +1535,10 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) message_put(message); /* deactivate bchannel */ - chan_trace_header("CHANNEL RELEASE (suspend)"); + chan_trace_header(p_m_mISDNport, this, "CHANNEL RELEASE (suspend)", DIRECTION_NONE); add_trace("disconnect", "channel", "%d", p_m_b_channel); end_trace(); - free_bchannel(); + drop_bchannel(); /* sending suspend to endpoint */ while (p_epointlist) @@ -1758,7 +1554,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) /* sending SUSPEND_ACKNOWLEDGE */ dmsg = create_l3msg(CC_SUSPEND_ACKNOWLEDGE | REQUEST, MT_SUSPEND_ACKNOWLEDGE, dinfo, sizeof(SUSPEND_ACKNOWLEDGE_t), p_m_d_ntmode); suspend_acknowledge = (SUSPEND_ACKNOWLEDGE_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_SUSPEND_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_SUSPEND_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -1786,11 +1582,8 @@ 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); - } - l1l2l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN); + 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); add_trace("callref", "new", "0x%x", dinfo); @@ -1798,19 +1591,16 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) if (p_m_d_l3id&(~0xff) == 0xff00) p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0; p_m_d_l3id = dinfo; - p_m_d_ces = setup->ces; + p_m_d_ces = resume->ces; } - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_call_id(resume->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len); end_trace(); /* if blocked, release call */ if (p_m_mISDNport->ifport->block) { - RELEASE_COMPLETE_t *release_complete; - - printlog("--- port#%d is blocked.\n", mISDNport->ifport->portnum); ret = -27; goto reject; } @@ -1818,19 +1608,25 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) /* call id */ if (len<0) len = 0; - /* channel_id */ + /* channel_id (no channel is possible in message) */ exclusive = 0; channel = -1; /* any channel */ /* hunt channel */ - ret = hunt_bchannel(channel, exclusive); + ret = channel = hunt_bchannel(channel, exclusive); + if (ret < 0) + goto no_channel; + + /* open channel */ + ret = seize_bchannel(channel, 1); if (ret < 0) { + no_channel: reject: dmsg = create_l3msg(CC_RESUME_REJECT | REQUEST, MT_RESUME_REJECT, dinfo, sizeof(RESUME_REJECT_t), p_m_d_ntmode); resume_reject = (RESUME_REJECT_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_RESUME_REJECT | REQUEST, DIRECTION_OUT); - enc_ie_cause(&resume_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); + l1l2l3_trace_header(p_m_mISDNport, this, CC_RESUME_REJECT | REQUEST, DIRECTION_OUT); + 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(); @@ -1839,13 +1635,11 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) p_m_delete = 1; return; } + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE); /* 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) @@ -1862,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); @@ -1884,7 +1671,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) /* sending RESUME_ACKNOWLEDGE */ dmsg = create_l3msg(CC_RESUME_ACKNOWLEDGE | REQUEST, MT_RESUME_ACKNOWLEDGE, dinfo, sizeof(RESUME_ACKNOWLEDGE_t), p_m_d_ntmode); resume_acknowledge = (RESUME_ACKNOWLEDGE_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_RESUME_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_RESUME_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); enc_ie_channel_id(&resume_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -1902,7 +1689,7 @@ void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data) int facil_len; struct message *message; - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); dec_ie_facility(facility->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), facil, &facil_len); end_trace(); @@ -1923,24 +1710,24 @@ void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data) */ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) { - int i; int new_l3id; int timer_hex=0; switch (prim) { case CC_TIMEOUT | INDICATION: - l1l2l3_trace_header(prim, DIRECTION_IN); if (p_m_d_ntmode) { int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; timer_hex = *((int *)(((char *)data)+headerlen)); } - 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: @@ -1952,7 +1739,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) case CC_SETUP | CONFIRM: if (p_m_d_ntmode) { - l1l2l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | INDICATION, DIRECTION_IN); add_trace("callref", "old", "0x%x", p_m_d_l3id); /* nt-library now gives us a new id via CC_SETUP_CONFIRM */ if ((p_m_d_l3id&0xff00) != 0xff00) @@ -1961,7 +1748,6 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) add_trace("callref", "new", "0x%x", p_m_d_l3id); end_trace(); } - end_trace; break; case CC_INFORMATION | INDICATION: @@ -2071,7 +1857,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) break; case CC_RELEASE_CR | INDICATION: - l1l2l3_trace_header(CC_RELEASE_CR | INDICATION, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_CR | INDICATION, DIRECTION_IN); add_trace("callref", NULL, "0x%x", p_m_d_l3id); end_trace(); if (p_m_d_ntmode) @@ -2081,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) { @@ -2100,7 +1887,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) break; case CC_NEW_CR | INDICATION: - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); if (p_m_d_l3id) add_trace("callref", "old", "0x%x", p_m_d_l3id); if (p_m_d_ntmode) @@ -2118,7 +1905,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) break; default: - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); add_trace("unhandled", "prim", "0x%x", prim); end_trace(); } @@ -2182,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); } @@ -2206,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); - l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT); information = (INFORMATION_t *)(dmsg->data + headerlen); - enc_ie_called_pn(&information->CALLED_PN, dmsg, 0, 1, (unsigned char *)param->information.number); + 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.id); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); } @@ -2237,6 +2029,8 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet /* release if port is blocked */ if (p_m_mISDNport->ifport->block) { + struct message *message; + message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = 27; // temp. unavail. message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; @@ -2264,7 +2058,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet /* sending information */ dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode); information = (INFORMATION_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT); if (p_m_d_ntmode) enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_callerinfo.display); end_trace(); @@ -2282,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; @@ -2303,7 +2091,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet channel = CHANNEL_NO; /* creating l3id */ - l1l2l3_trace_header(CC_NEW_CR | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | REQUEST, DIRECTION_OUT); if (p_m_d_ntmode) { i = 0; @@ -2351,8 +2139,8 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet /* preparing setup message */ dmsg = create_l3msg(CC_SETUP | REQUEST, MT_SETUP, p_m_d_l3id, sizeof(SETUP_t), p_m_d_ntmode); - l1l2l3_trace_header(CC_SETUP | REQUEST, DIRECTION_OUT); setup = (SETUP_t *)(dmsg->data + headerlen); + l1l2l3_trace_header(p_m_mISDNport, this, CC_SETUP | REQUEST, DIRECTION_OUT); /* channel information */ if (channel >= 0) /* it should */ { @@ -2399,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) @@ -2539,7 +2327,7 @@ void Pdss1::message_facility(unsigned long epoint_id, int message_id, union para /* sending facility */ dmsg = create_l3msg(CC_FACILITY | REQUEST, MT_FACILITY, p_m_d_l3id, sizeof(FACILITY_t), p_m_d_ntmode); facility = (FACILITY_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_FACILITY | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_FACILITY | REQUEST, DIRECTION_OUT); enc_ie_facility(&facility->FACILITY, dmsg, (unsigned char *)param->facilityinfo.data, param->facilityinfo.len); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -2621,7 +2409,7 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame /* sending notification */ dmsg = create_l3msg(CC_NOTIFY | REQUEST, MT_NOTIFY, p_m_d_l3id, sizeof(NOTIFY_t), p_m_d_ntmode); notification = (NOTIFY_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_NOTIFY | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_NOTIFY | REQUEST, DIRECTION_OUT); enc_ie_notify(¬ification->NOTIFY, dmsg, notify); /* sending redirection number only in ntmode */ if (type >= 0 && p_m_d_ntmode) @@ -2636,7 +2424,7 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame /* sending information */ dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode); information = (INFORMATION_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT); enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)param->notifyinfo.display); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -2653,7 +2441,7 @@ void Pdss1::message_overlap(unsigned long epoint_id, int message_id, union param /* sending setup_acknowledge */ dmsg = create_l3msg(CC_SETUP_ACKNOWLEDGE | REQUEST, MT_SETUP_ACKNOWLEDGE, p_m_d_l3id, sizeof(SETUP_ACKNOWLEDGE_t), p_m_d_ntmode); setup_acknowledge = (SETUP_ACKNOWLEDGE_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_SETUP_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_SETUP_ACKNOWLEDGE | REQUEST, DIRECTION_OUT); /* channel information */ if (p_state == PORT_STATE_IN_SETUP) enc_ie_channel_id(&setup_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); @@ -2661,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); @@ -2679,7 +2467,7 @@ void Pdss1::message_proceeding(unsigned long epoint_id, int message_id, union pa /* sending proceeding */ dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode); proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT); /* channel information */ if (p_state == PORT_STATE_IN_SETUP) enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); @@ -2687,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); @@ -2710,7 +2498,7 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para /* sending proceeding */ dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode); proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT); /* channel information */ enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); /* progress information */ @@ -2726,7 +2514,7 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para /* sending alerting */ dmsg = create_l3msg(CC_ALERTING | REQUEST, MT_ALERTING, p_m_d_l3id, sizeof(ALERTING_t), p_m_d_ntmode); alerting = (ALERTING_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_ALERTING | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_ALERTING | REQUEST, DIRECTION_OUT); /* channel information */ if (p_state == PORT_STATE_IN_SETUP) enc_ie_channel_id(&alerting->CHANNEL_ID, dmsg, 1, p_m_b_channel); @@ -2734,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); @@ -2760,7 +2548,7 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param /* sending proceeding */ dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode); proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT); /* channel information */ enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); // /* progress information */ @@ -2783,7 +2571,7 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param /* sending information */ dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode); information = (INFORMATION_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT); if (p_m_d_ntmode) enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_connectinfo.display); end_trace(); @@ -2800,7 +2588,7 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param /* preparing connect message */ dmsg = create_l3msg(CC_CONNECT | REQUEST, MT_CONNECT, p_m_d_l3id, sizeof(CONNECT_t), p_m_d_ntmode); connect = (CONNECT_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_CONNECT | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_CONNECT | REQUEST, DIRECTION_OUT); /* connect information */ plan = 1; switch (p_connectinfo.ntype) @@ -2883,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) @@ -2899,9 +2687,9 @@ void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union pa /* sending release */ dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); + 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); @@ -2909,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; @@ -2917,7 +2705,7 @@ void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union pa /* sending proceeding */ dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode); proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT); /* channel information */ enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); /* progress information */ @@ -2933,15 +2721,15 @@ void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union pa /* sending disconnect */ dmsg = create_l3msg(CC_DISCONNECT | REQUEST, MT_DISCONNECT, p_m_d_l3id, sizeof(DISCONNECT_t), p_m_d_ntmode); disconnect = (DISCONNECT_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_DISCONNECT | REQUEST, DIRECTION_OUT); + 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->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; @@ -2963,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(CC_RELEASE | REQUEST, DIRECTION_OUT); + 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(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(CC_RELEASE | REQUEST, DIRECTION_OUT); + 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) { @@ -3017,7 +2821,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param /* sending proceeding */ dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode); proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT); /* channel information */ enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); /* progress information */ @@ -3028,19 +2832,20 @@ 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); disconnect = (DISCONNECT_t *)(dmsg->data + headerlen); - l1l2l3_trace_header(CC_DISCONNECT | REQUEST, DIRECTION_OUT); + 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->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]) @@ -3049,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); } @@ -3108,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) { @@ -3124,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; @@ -3135,7 +2937,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet act.dinfo = 0; act.len = 0; mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC); - l1l2l3_trace_header(act.prim, DIRECTION_OUT); + l1l2l3_trace_header(p_m_mISDNport, this, act.prim, DIRECTION_OUT); end_trace(); // /* set timeout */ // p_m_mISDNport->l1timeout = now+3; @@ -3300,7 +3102,7 @@ int stack2manager_nt(void *dat, void *arg) case DL_ESTABLISH | INDICATION: case DL_ESTABLISH | CONFIRM: ss_estab: - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, hh->prim, DIRECTION_IN); add_trace("tei", NULL, "%d", hh->dinfo); end_trace(); if (mISDNport->ptp && hh->dinfo == 0) @@ -3319,7 +3121,7 @@ int stack2manager_nt(void *dat, void *arg) case DL_RELEASE | INDICATION: case DL_RELEASE | CONFIRM: ss_rel: - l1l2l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, hh->prim, DIRECTION_IN); add_trace("tei", NULL, "%d", hh->dinfo); end_trace(); if (mISDNport->ptp && hh->dinfo == 0) @@ -3334,35 +3136,16 @@ 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); - enc_ie_cause_standalone(mISDNport->ntmode?&release_complete->CAUSE:NULL, dmsg, (mISDNport->ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47); - msg_queue_tail(&mISDNport->downqueue, dmsg); - break; - } + FATAL("Cannot create Port instance.\n"); pdss1->message_isdn(hh->prim, hh->dinfo, msg->data); break; case CC_RESUME | INDICATION: /* creating port object */ SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum); - if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL))) - { - SUSPEND_REJECT_t *suspend_reject; - msg_t *dmsg; - - PERROR("FATAL ERROR: cannot create port object.\n"); - dmsg = create_l3msg(CC_SUSPEND_REJECT | REQUEST, MT_SUSPEND_REJECT, hh->dinfo, sizeof(SUSPEND_REJECT_t), mISDNport->ntmode); - suspend_reject = (SUSPEND_REJECT_t *)(dmsg->data + mISDN_HEADER_LEN); - enc_ie_cause_standalone(mISDNport->ntmode?&suspend_reject->CAUSE:NULL, dmsg, (mISDNport->ntmode)?1:0, 47); - msg_queue_tail(&mISDNport->downqueue, dmsg); - break; - } + if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, 0, 0))) + FATAL("Cannot create Port instance.\n"); pdss1->message_isdn(hh->prim, hh->dinfo, msg->data); break; @@ -3426,19 +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_TE_IN, mISDNport, name, NULL))) - { - RELEASE_COMPLETE_t *release_complete; - msg_t *dmsg; - - PERROR("FATAL ERROR: cannot create port object.\n"); - dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, frm->dinfo, sizeof(RELEASE_COMPLETE_t), mISDNport->ntmode); - release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + mISDN_HEADER_LEN); - enc_ie_cause_standalone(mISDNport->ntmode?&release_complete->CAUSE:NULL, dmsg, (mISDNport->ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47); - msg_queue_tail(&mISDNport->downqueue, dmsg); - free_msg(msg); - return(0); - } + 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);