X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=dss1.cpp;h=452c775a6a9e17b12de681610316272ab3d85451;hp=0821cb783010853e1cdc84eacbc0dd03165421bc;hb=3754d8f73ff7cb55e204f7ede6569028407a00e5;hpb=1ace98e214e20173f027f50abac2546159735e59 diff --git a/dss1.cpp b/dss1.cpp index 0821cb7..452c775 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; @@ -45,7 +45,6 @@ Pdss1::Pdss1(int type, mISDNport *mISDNport, char *portname, struct port_setting p_m_d_collect_cause = CAUSE_NOUSER; p_m_d_collect_location = LOCATION_PRIVATE_LOCAL; - PDEBUG(DEBUG_ISDN, "Created new mISDNPort(%s). Currently %d objects use, %s port #%d\n", portname, mISDNport->use, (mISDNport->ntmode)?"NT":"TE", p_m_portnum); } @@ -137,104 +136,6 @@ msg_t *create_l2msg(int prim, int dinfo, int size) /* NT only */ 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}, - - {NULL, 0}, -}; - -static char *isdn_prim[4] = { - " REQUEST", - " CONFIRM", - " INDICATION", - " RESPONSE", -}; - - -/* - * isdn trace header - */ -void Pdss1::l3_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; - } - i++; - } - SCAT(msgtext, isdn_prim[prim&0x00000003]); - - /* add direction */ - if (direction && (prim&0xffffff00)!=CC_NEW_CR && (prim&0xffffff00)!=CC_RELEASE_CR) - { - if (p_m_ntmode) - { - if (direction == DIRECTION_OUT) - SCAT(msgtext, " N->U"); - else - SCAT(msgtext, " N<-U"); - } else - { - if (direction == DIRECTION_OUT) - SCAT(msgtext, " U->N"); - else - SCAT(msgtext, " U<-N"); - } - } - - /* init trace with given values */ - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - direction, - CATEGORY_L3, - msgtext); -} - - /* * if we received a first reply to the setup message, * we will check if we have now channel information @@ -261,13 +162,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex if (p_state != PORT_STATE_OUT_SETUP) return(0); - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - DIRECTION_OUT, - CATEGORY_CH, - "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); @@ -285,7 +180,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) { @@ -295,13 +190,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex if (p_state != PORT_STATE_OUT_SETUP) return(0); - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - DIRECTION_OUT, - CATEGORY_CH, - "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); @@ -312,7 +201,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); } @@ -326,14 +215,12 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex } /* if channel was not accepted, try to get it */ - PDEBUG(DEBUG_BCHANNEL, "- our suggested channel %d was not accepted, but %d was given.\n", p_m_b_channel, channel); ret = seize_bchannel(channel, 1); // exclusively add_trace("channel", "available", ret<0?"no":"yes"); if (ret < 0) { add_trace("conclusion", NULL, "replied channel not available"); end_trace(); - PDEBUG(DEBUG_BCHANNEL, "- the replied channel %d is not available (cause %d).\n", channel, -ret); goto channelerror; } add_trace("conclusion", NULL, "replied channel accepted"); @@ -341,7 +228,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) { @@ -351,13 +238,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex if (p_state != PORT_STATE_OUT_SETUP) return(0); - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - DIRECTION_OUT, - CATEGORY_CH, - "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 */ @@ -383,7 +264,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' ***/ @@ -391,13 +272,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) { - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - DIRECTION_OUT, - CATEGORY_CH, - "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) @@ -418,7 +293,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); } @@ -426,13 +301,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex if (p_state != PORT_STATE_OUT_SETUP) return(0); - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - DIRECTION_OUT, - CATEGORY_CH, - "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 */ @@ -444,7 +313,6 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex } /* we will see, if our received channel is available */ - PDEBUG(DEBUG_BCHANNEL, "- our during call-waiting, we get channel %d as first reply.\n", channel); use_from_connect: ret = seize_bchannel(channel, exclusive); add_trace("channel", "available", ret<0?"no":"yes"); @@ -460,15 +328,14 @@ 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); - l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); - 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); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -479,6 +346,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 */ @@ -486,8 +482,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; @@ -506,7 +505,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) PERROR("fatal software error: l3-stack gives us a process id 0xff00-0xffff\n"); exit(-1); } - l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN); + 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); @@ -517,9 +516,9 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_m_d_ces = setup->ces; } - l3_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) */ @@ -530,8 +529,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 */ @@ -539,10 +538,9 @@ 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); - l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); 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 */ add_trace("reason", NULL, "port blocked"); end_trace(); @@ -553,7 +551,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; @@ -565,7 +563,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; @@ -574,7 +572,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; @@ -598,8 +596,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; @@ -614,7 +612,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; @@ -626,7 +626,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; @@ -635,7 +635,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; @@ -656,7 +656,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; @@ -679,17 +679,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; @@ -698,175 +698,51 @@ 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 */ - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - DIRECTION_IN, - CATEGORY_CH, - "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); - l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); 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); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -874,10 +750,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) 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) @@ -890,8 +763,8 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) RELEASE_COMPLETE_t *release_complete; dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); 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); @@ -910,7 +783,6 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) exit(-1); } /* send setup message to endpoit */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) setup: %s->%s\n", p_name, p_callerinfo.id, p_dialinginfo.number); message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_SETUP); message->param.setup.isdn_port = p_m_portnum; message->param.setup.port_type = p_type; @@ -935,13 +807,13 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data) unsigned char keypad[32] = ""; struct message *message; - l3_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: @@ -974,7 +846,7 @@ void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void int ret; struct message *message; - l3_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(); @@ -1010,7 +882,7 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) int notify = -1, type, plan, present; char redir[32]; - l3_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); @@ -1093,7 +965,7 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) int notify = -1, type, plan, present; char redir[32]; - l3_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); @@ -1180,7 +1052,7 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) if (p_m_d_ntmode) p_m_d_ces = connect->ces; - l3_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 @@ -1246,19 +1118,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); - l3_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.interfaces, p_m_mISDNport->ifport->interface->name); - PDEBUG(DEBUG_ISDN, "Pdss1(%s) connect (to '%s' COLP: '%s')\n", p_name, p_dialinginfo.number, p_connectinfo.id); + /* 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); @@ -1275,7 +1150,7 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data) int coding, proglocation, progress; struct message *message; - l3_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(); @@ -1284,16 +1159,16 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data) cause = 16; /* release if we are remote sends us no tones */ - if (p_m_mISDNport->is_earlyb) + if (p_m_mISDNport->earlyb) { RELEASE_t *release; msg_t *dmsg; - PDEBUG(DEBUG_ISDN, "Pdss1(%s) send release because remote disconnects AND provides no patterns (earlyb).\n", p_name); dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, dinfo, sizeof(RELEASE_t), p_m_d_ntmode); release = (RELEASE_t *)(dmsg->data + headerlen); - l3_trace_header(CC_RELEASE | REQUEST, DIRECTION_OUT); + 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 */ + add_trace("reason", NULL, "no remote patterns"); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -1340,7 +1215,7 @@ void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data int location, cause; /* cause */ - l3_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); @@ -1389,7 +1264,7 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data) int location, cause; struct message *message; - l3_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(); @@ -1415,7 +1290,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); - l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT); + 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); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -1433,7 +1308,7 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void * int location, cause; struct message *message; - l3_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(); @@ -1451,7 +1326,6 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void * free_epointlist(p_epointlist); } - PDEBUG(DEBUG_ISDN, "Pdss1(%s) release_complete (cause %d)\n", p_name, cause); new_state(PORT_STATE_RELEASE); p_m_delete = 1; } @@ -1474,7 +1348,6 @@ void Pdss1::t312_timeout(unsigned long prim, unsigned long dinfo, void *data) free_epointlist(p_epointlist); } - PDEBUG(DEBUG_ISDN, "Pdss1(%s) t312_timeout (collected cause %d location %d)\n", p_name, p_m_d_collect_cause, p_m_d_collect_location); new_state(PORT_STATE_RELEASE); p_m_delete = 1; } @@ -1487,16 +1360,13 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data) struct message *message; int notify, type, plan, present; - l3_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(); if (!ACTIVE_EPOINT(p_epointlist)) - { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) there is no active endpoint to notify to.\n", p_name); return; - } /* notification indicator */ if (notify < 0) return; @@ -1551,18 +1421,16 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data) msg_t *dmsg; // class Endpoint *epoint; - l3_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) { - - PDEBUG(DEBUG_ISDN, "Pdss1(%s) there is no endpoint to notify hold OR we are already on hold, so we reject.\n", p_name); - 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); - l3_trace_header(CC_HOLD_REJECT | REQUEST, DIRECTION_OUT); + 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 */ + add_trace("reason", NULL, "no endpoint"); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -1576,17 +1444,10 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data) message_put(message); /* deactivate bchannel */ - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - DIRECTION_OUT, - CATEGORY_CH, - "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; @@ -1602,7 +1463,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); - l3_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); } @@ -1620,7 +1481,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) msg_t *dmsg; int ret; - l3_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(); @@ -1628,11 +1489,10 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) { cause = 101; /* incompatible state */ reject: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) we are not on hold, so we reject (cazse %d).\n", p_name, cause); 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); - l3_trace_header(CC_RETRIEVE_REJECT | REQUEST, DIRECTION_OUT); + 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); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -1646,69 +1506,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 */ - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - DIRECTION_IN, - CATEGORY_CH, - "CHANNEL SELECTION (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; @@ -1716,7 +1528,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); - l3_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); @@ -1736,7 +1548,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) msg_t *dmsg; int ret = -31; /* normal, unspecified */ - l3_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(); @@ -1745,7 +1557,7 @@ 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); - l3_trace_header(CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT); + 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); end_trace(); msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); @@ -1765,7 +1577,6 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) if (epoint->ep_park_len == len) if (!memcmp(epoint->ep_park_callid, callid, len)) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) call id is in use, so we reject.\n", p_name); ret = -84; /* call id in use */ goto reject; } @@ -1780,16 +1591,10 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) message_put(message); /* deactivate bchannel */ - start_trace(p_m_mISDNport->portnum, - p_m_mISDNport->ifport->interface, - nationalize(p_callerinfo.id, p_callerinfo.ntype), - p_dialinginfo.number, - DIRECTION_OUT, - CATEGORY_CH, - "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) @@ -1805,7 +1610,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); - l3_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); @@ -1837,7 +1642,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) PERROR("fatal software error: l3-stack gives us a process id 0xff00-0xffff\n"); exit(-1); } - l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN); + 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); @@ -1845,19 +1650,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; } - l3_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; } @@ -1865,18 +1667,24 @@ 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); - l3_trace_header(CC_RESUME_REJECT | REQUEST, DIRECTION_OUT); + 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); if (ret == -27) add_trace("reason", NULL, "port blocked"); @@ -1886,6 +1694,7 @@ 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) @@ -1907,22 +1716,18 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) epoint = epoint->next; } if (!epoint) - { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) no suspended call, so we reject with cause %d.\n", p_name, ret); 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))) + if (!(epoint->portlist_new(p_serial, p_type, p_m_mISDNport->earlyb))) { PERROR("no memory for portlist\n"); exit(-1); } - PDEBUG(DEBUG_ISDN, "Pdss1(%s) resume\n", p_name); message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RESUME); message_put(message); @@ -1935,7 +1740,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); - l3_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); @@ -1953,7 +1758,7 @@ void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data) int facil_len; struct message *message; - l3_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(); @@ -1961,7 +1766,6 @@ void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data) if (facil_len<=0) return; - PDEBUG(DEBUG_ISDN, "Pdss1(%s) facility\n", p_name); message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_FACILITY); message->param.facilityinfo.len = facil_len; memcpy(message->param.facilityinfo.data, facil, facil_len); @@ -1975,14 +1779,13 @@ 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: - l3_trace_header(prim, DIRECTION_IN); + 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; @@ -1996,19 +1799,15 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) break; case CC_SETUP | INDICATION: - PDEBUG((DEBUG_BCHANNEL|DEBUG_ISDN), "Pdss1(%s) setup\n", p_name); if (p_state != PORT_STATE_IDLE) - { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) received setup again, IGNORING.\n", p_name); break; - } setup_ind(prim, dinfo, data); break; case CC_SETUP | CONFIRM: if (p_m_d_ntmode) { - l3_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) @@ -2017,62 +1816,55 @@ 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; - PDEBUG(DEBUG_ISDN, "Pdss1(%s) setup confirm (l3id=0x%x)\n", p_name, p_m_d_l3id); break; case CC_INFORMATION | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) information\n", p_name); information_ind(prim, dinfo, data); break; case CC_SETUP_ACKNOWLEDGE | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) setup acknowledge\n", p_name); if (p_state != PORT_STATE_OUT_SETUP) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) received setup_acknowledge, but we are not in outgoing setup state, IGNORING.\n", p_name); + PERROR("Pdss1(%s) received setup_acknowledge, but we are not in outgoing setup state, IGNORING.\n", p_name); break; } setup_acknowledge_ind(prim, dinfo, data); break; case CC_PROCEEDING | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) proceeding\n", p_name); if (p_state != PORT_STATE_OUT_SETUP && p_state != PORT_STATE_OUT_OVERLAP) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) received proceeding, but we are not in outgoing setup OR overlap state, IGNORING.\n", p_name); + PERROR("Pdss1(%s) received proceeding, but we are not in outgoing setup OR overlap state, IGNORING.\n", p_name); break; } proceeding_ind(prim, dinfo, data); break; case CC_ALERTING | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) alerting\n", p_name); if (p_state != PORT_STATE_OUT_SETUP && p_state != PORT_STATE_OUT_OVERLAP && p_state != PORT_STATE_OUT_PROCEEDING) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding state, IGNORING.\n", p_name); + PERROR("Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding state, IGNORING.\n", p_name); break; } alerting_ind(prim, dinfo, data); break; case CC_CONNECT | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) connect\n", p_name); if (p_state != PORT_STATE_OUT_SETUP && p_state != PORT_STATE_OUT_OVERLAP && p_state != PORT_STATE_OUT_PROCEEDING && p_state != PORT_STATE_OUT_ALERTING) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding OR ALERTING state, IGNORING.\n", p_name); + PERROR("Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding OR ALERTING state, IGNORING.\n", p_name); break; } connect_ind(prim, dinfo, data); if (p_m_d_notify_pending) { - PDEBUG(DEBUG_ISDN, "received or connect, so we send pending notify message.\n"); + /* send pending notify message during connect */ message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param); message_free(p_m_d_notify_pending); p_m_d_notify_pending = NULL; @@ -2081,12 +1873,11 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) case CC_CONNECT_ACKNOWLEDGE | INDICATION: case CC_CONNECT | CONFIRM: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) connect_acknowlege.\n", p_name); if (p_state == PORT_STATE_CONNECT_WAITING) new_state(PORT_STATE_CONNECT); if (p_m_d_notify_pending) { - PDEBUG(DEBUG_ISDN, "received or connect-ack, so we send pending notify message.\n"); + /* send pending notify message during connect-ack */ message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param); message_free(p_m_d_notify_pending); p_m_d_notify_pending = NULL; @@ -2094,58 +1885,47 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) break; case CC_DISCONNECT | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) disconnect\n", p_name); disconnect_ind(prim, dinfo, data); break; case CC_RELEASE | CONFIRM: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) release confirm\n", p_name); case CC_RELEASE | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) release\n", p_name); release_ind(prim, dinfo, data); break; case CC_RELEASE_COMPLETE | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) release_complete.\n", p_name); release_complete_ind(prim, dinfo, data); break; case CC_RELEASE_COMPLETE | CONFIRM: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) release_complete (confirm).\n", p_name); break; case CC_NOTIFY | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) notify\n", p_name); notify_ind(prim, dinfo, data); break; case CC_HOLD | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) hold\n", p_name); hold_ind(prim, dinfo, data); break; case CC_RETRIEVE | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) retrieve\n", p_name); retrieve_ind(prim, dinfo, data); break; case CC_SUSPEND | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) suspend\n", p_name); suspend_ind(prim, dinfo, data); break; case CC_RESUME | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) resume\n", p_name); resume_ind(prim, dinfo, data); break; case CC_FACILITY | INDICATION: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) facility\n", p_name); facility_ind(prim, dinfo, data); break; case CC_RELEASE_CR | INDICATION: - l3_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) @@ -2174,7 +1954,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) break; case CC_NEW_CR | INDICATION: - l3_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) @@ -2192,7 +1972,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) break; default: - l3_trace_header(prim, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN); add_trace("unhandled", "prim", "0x%x", prim); end_trace(); } @@ -2256,13 +2036,12 @@ int Pdss1::handler(void) { int ret; - if ((ret = Port::handler())) + if ((ret = PmISDN::handler())) return(ret); /* handle destruction */ if (p_m_delete && p_m_d_l3id==0) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) doing pending release.\n", p_name); delete this; return(-1); } @@ -2281,12 +2060,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); - l3_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); } @@ -2312,6 +2091,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; @@ -2339,7 +2120,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); - l3_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(); @@ -2378,7 +2159,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet channel = CHANNEL_NO; /* creating l3id */ - l3_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; @@ -2426,8 +2207,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); - l3_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 */ { @@ -2474,9 +2255,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) @@ -2611,12 +2392,10 @@ void Pdss1::message_facility(unsigned long epoint_id, int message_id, union para if (!p_m_d_ntmode) return; - PDEBUG(DEBUG_ISDN, "Pdss1(%s) sending facility message\n", p_name); - /* 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); - l3_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); @@ -2632,7 +2411,6 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame int plan, type = -1, present; msg_t *dmsg; - PDEBUG(DEBUG_ISDN, "Pdss1(%s) sending information message\n", p_name); if (param->notifyinfo.notify>INFO_NOTIFY_NONE) notify = param->notifyinfo.notify & 0x7f; else @@ -2681,7 +2459,7 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame if (notify<0 && !param->notifyinfo.display[0]) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) nothing to notify, nothing to display\n", p_name); + /* nothing to notify, nothing to display */ return; } @@ -2690,7 +2468,6 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame if (p_state!=PORT_STATE_CONNECT) { /* queue notification */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) queueing notification because isdn port is not active state.\n", p_name); if (p_m_d_notify_pending) message_free(p_m_d_notify_pending); p_m_d_notify_pending = message_create(ACTIVE_EPOINT(p_epointlist), p_serial, EPOINT_TO_PORT, message_id); @@ -2700,7 +2477,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); - l3_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) @@ -2715,7 +2492,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); - l3_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); @@ -2732,7 +2509,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); - l3_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); @@ -2740,7 +2517,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); @@ -2758,7 +2535,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); - l3_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); @@ -2766,7 +2543,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); @@ -2789,7 +2566,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); - l3_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 */ @@ -2805,7 +2582,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); - l3_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); @@ -2813,7 +2590,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); @@ -2839,7 +2616,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); - l3_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 */ @@ -2862,7 +2639,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); - l3_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(); @@ -2872,14 +2649,14 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param if (p_state!=PORT_STATE_IN_SETUP && p_state!=PORT_STATE_IN_OVERLAP && p_state!=PORT_STATE_IN_PROCEEDING && p_state!=PORT_STATE_IN_ALERTING) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) connect command only possible in setup, proceeding or alerting state.\n", p_name); + /* connect command only possible in setup, proceeding or alerting state */ return; } /* preparing connect message */ dmsg = create_l3msg(CC_CONNECT | REQUEST, MT_CONNECT, p_m_d_l3id, sizeof(CONNECT_t), p_m_d_ntmode); connect = (CONNECT_t *)(dmsg->data + headerlen); - l3_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) @@ -2962,7 +2739,7 @@ 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) + if ((p_state==PORT_STATE_IN_SETUP && !p_m_mISDNport->tones) || p_state==PORT_STATE_OUT_SETUP) { /* sending release to endpoint */ @@ -2978,7 +2755,7 @@ 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); - l3_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); end_trace(); @@ -2996,7 +2773,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); - l3_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 */ @@ -3012,12 +2789,12 @@ 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); - l3_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); @@ -3049,7 +2826,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param /* 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); - l3_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); end_trace(); @@ -3058,7 +2835,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param /* remove epoint */ remove_endpoint: free_epointid(epoint_id); - l3_trace_header(CC_RELEASE_CR | REQUEST, DIRECTION_OUT); + 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) @@ -3079,7 +2856,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param /* 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); - l3_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); end_trace(); @@ -3096,7 +2873,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); - l3_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 */ @@ -3111,12 +2888,12 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param /* 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); - l3_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); @@ -3147,14 +2924,12 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet switch(message_id) { case MESSAGE_INFORMATION: /* overlap dialing */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) received dialing info '%s'.\n", p_name, param->information.number); if (p_type==PORT_TYPE_DSS1_NT_OUT && p_state!=PORT_STATE_OUT_OVERLAP && p_state!=PORT_STATE_CONNECT && p_state!=PORT_STATE_OUT_DISCONNECT && p_state!=PORT_STATE_IN_DISCONNECT) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) (internal outgoing) ignoring information, invalid state.\n", p_name); break; } if (p_type==PORT_TYPE_DSS1_TE_OUT @@ -3165,8 +2940,6 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet && p_state!=PORT_STATE_OUT_DISCONNECT && p_state!=PORT_STATE_IN_DISCONNECT) { - if (options.deb & DEBUG_ISDN) - PERROR("Pdss1(%s) (external outgoing) ignoring information, invalid state.\n", p_name); break; } if ((p_type==PORT_TYPE_DSS1_NT_IN || p_type==PORT_TYPE_DSS1_TE_IN) @@ -3178,14 +2951,12 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet && p_state!=PORT_STATE_OUT_DISCONNECT && p_state!=PORT_STATE_IN_DISCONNECT) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) (incoming) ignoring information, invalid state.\n", p_name); break; } message_information(epoint_id, message_id, param); break; case MESSAGE_SETUP: /* dial-out command received from epoint */ - PDEBUG((DEBUG_ISDN | DEBUG_BCHANNEL), "Pdss1(%s) isdn port received setup from '%s' to '%s'\n", p_name, param->setup.callerinfo.id, param->setup.dialinginfo.number); if (p_state!=PORT_STATE_IDLE && p_state!=PORT_STATE_CONNECT) { @@ -3220,70 +2991,61 @@ 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(p_m_mISDNport, this, act.prim, DIRECTION_OUT); + end_trace(); // /* set timeout */ // p_m_mISDNport->l1timeout = now+3; } break; case MESSAGE_NOTIFY: /* display and notifications */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) isdn port with (caller id %s) received notification: display='%s' notify=%d phone=%s\n", p_name, p_callerinfo.id, param->notifyinfo.display, param->notifyinfo.notify, param->notifyinfo.id); message_notify(epoint_id, message_id, param); break; case MESSAGE_FACILITY: /* facility message */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) isdn port with (caller id %s) received facility.\n", p_name, p_callerinfo.id); message_facility(epoint_id, message_id, param); break; case MESSAGE_OVERLAP: /* more information is needed */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) isdn port with (caller id %s) received setup acknowledge\n", p_name, p_callerinfo.id); if (p_state!=PORT_STATE_IN_SETUP) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) ignoring setup acknowledge because isdn port is not incoming setup state.\n", p_name); break; } message_overlap(epoint_id, message_id, param); break; case MESSAGE_PROCEEDING: /* call of endpoint is proceeding */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) isdn port with (caller id %s) received proceeding\n", p_name, p_callerinfo.id); if (p_state!=PORT_STATE_IN_SETUP && p_state!=PORT_STATE_IN_OVERLAP) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) ignoring: proceeding command not possible in current state.\n", p_name); break; } message_proceeding(epoint_id, message_id, param); break; case MESSAGE_ALERTING: /* call of endpoint is ringing */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) isdn port with (caller id %s) received alerting\n", p_name, p_callerinfo.id); if (p_state!=PORT_STATE_IN_SETUP && p_state!=PORT_STATE_IN_OVERLAP && p_state!=PORT_STATE_IN_PROCEEDING) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) ignoring: alerting command not possible in current state.\n", p_name); break; } message_alerting(epoint_id, message_id, param); break; case MESSAGE_CONNECT: /* call of endpoint is connected */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) isdn port with (caller id %s) received connect\n", p_name, p_callerinfo.id); if (p_state!=PORT_STATE_IN_SETUP && p_state!=PORT_STATE_IN_OVERLAP && p_state!=PORT_STATE_IN_PROCEEDING && p_state!=PORT_STATE_IN_ALERTING && !(p_state==PORT_STATE_CONNECT && p_m_d_ntmode)) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) ignoring: connect command not possible in current state.\n", p_name); break; } message_connect(epoint_id, message_id, param); break; case MESSAGE_DISCONNECT: /* call has been disconnected */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) isdn port with (caller id %s) received disconnect cause=%d\n", p_name, p_callerinfo.id, param->disconnectinfo.cause); if (p_state!=PORT_STATE_IN_SETUP && p_state!=PORT_STATE_IN_OVERLAP && p_state!=PORT_STATE_IN_PROCEEDING @@ -3295,24 +3057,21 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet && p_state!=PORT_STATE_CONNECT && p_state!=PORT_STATE_CONNECT_WAITING) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) ignoring: disconnect command not possible in current state.\n", p_name); break; } message_disconnect(epoint_id, message_id, param); break; case MESSAGE_RELEASE: /* release isdn port */ - PDEBUG(DEBUG_ISDN, "Pdss1(%s) isdn port with (caller id %s) received release cause=%d\n", p_name, p_callerinfo.id, param->disconnectinfo.cause); if (p_state==PORT_STATE_RELEASE) { - PDEBUG(DEBUG_ISDN, "Pdss1(%s) ignoring: release command not possible in RELEASE state.\n", p_name); break; } message_release(epoint_id, message_id, param); break; default: - PDEBUG(DEBUG_ISDN, "Pdss1(%s) isdn port with (caller id %s) received a wrong message: %d\n", p_name, p_callerinfo.id, message); + PERROR("Pdss1(%s) isdn port with (caller id %s) received a wrong message: %d\n", p_name, p_callerinfo.id, message); } return(1); @@ -3397,7 +3156,9 @@ int stack2manager_nt(void *dat, void *arg) case DL_ESTABLISH | INDICATION: case DL_ESTABLISH | CONFIRM: ss_estab: - PDEBUG(DEBUG_ISDN, "establish data link (DL) NT portnum=%d TEI=%d\n", mISDNport->portnum, hh->dinfo); + l1l2l3_trace_header(mISDNport, NULL, hh->prim, DIRECTION_IN); + add_trace("tei", NULL, "%d", hh->dinfo); + end_trace(); if (mISDNport->ptp && hh->dinfo == 0) { if (mISDNport->l2establish) @@ -3414,7 +3175,9 @@ int stack2manager_nt(void *dat, void *arg) case DL_RELEASE | INDICATION: case DL_RELEASE | CONFIRM: ss_rel: - PDEBUG(DEBUG_ISDN, "release data link (DL) NT portnum=%d TEI=%d\n", mISDNport->portnum, hh->dinfo); + l1l2l3_trace_header(mISDNport, NULL, hh->prim, DIRECTION_IN); + add_trace("tei", NULL, "%d", hh->dinfo); + end_trace(); if (mISDNport->ptp && hh->dinfo == 0) { mISDNport->l2link = 0; @@ -3434,7 +3197,9 @@ int stack2manager_nt(void *dat, void *arg) 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; } @@ -3444,7 +3209,7 @@ int stack2manager_nt(void *dat, void *arg) 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))) + if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, 0, 0))) { SUSPEND_REJECT_t *suspend_reject; msg_t *dmsg; @@ -3452,7 +3217,9 @@ int stack2manager_nt(void *dat, void *arg) 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; } @@ -3460,14 +3227,14 @@ int stack2manager_nt(void *dat, void *arg) break; case CC_RELEASE_CR | INDICATION: - PDEBUG(DEBUG_ISDN, "%s: unhandled message from stack: call ref released (l3id=0x%x)\n", __FUNCTION__, hh->dinfo); + PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", hh->dinfo); break; case CC_DISCONNECT | INDICATION: // fall throug default: - PDEBUG(DEBUG_ISDN, "%s: unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", __FUNCTION__, hh->prim, hh->dinfo, msg->len); + PERROR("unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", hh->prim, hh->dinfo, msg->len); return(-EINVAL); } free_msg(msg); @@ -3494,7 +3261,6 @@ int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg) if (port->p_type == PORT_TYPE_DSS1_TE_IN || port->p_type == PORT_TYPE_DSS1_TE_OUT) { pdss1 = (class Pdss1 *)port; -//PDEBUG(DEBUG_ISDN, "comparing dinfo = 0x%x with l3id 0x%x\n", frm->dinfo, pdss1->p_m_d_l3id); /* check out correct stack */ if (pdss1->p_m_mISDNport == mISDNport) /* check out correct id */ @@ -3520,7 +3286,7 @@ 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))) + if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, 0, 0))) { RELEASE_COMPLETE_t *release_complete; msg_t *dmsg; @@ -3528,7 +3294,9 @@ int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg) 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); @@ -3541,11 +3309,11 @@ int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg) if (frm->prim == (CC_RELEASE_CR | INDICATION)) { - PDEBUG(DEBUG_ISDN, "unhandled message from stack: call ref released (l3id=0x%x)\n", frm->dinfo); + PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", frm->dinfo); free_msg(msg); return(0); } - PDEBUG(DEBUG_ISDN, "unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", frm->prim, frm->dinfo, msg->len); + PERROR("unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", frm->prim, frm->dinfo, msg->len); return(-EINVAL); }