X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=dss1.cpp;h=75ff448a5ae824ec68576a2d7b59ae91a9bbd5ab;hp=75f4a8501ef52eb76375fee4c332e24567cb8a12;hb=473d6569efcad130f9a5044b182b75a1c07a1eee;hpb=acc5e55f7f38429822af3a245a13bec8ec2f5827 diff --git a/dss1.cpp b/dss1.cpp index 75f4a85..75ff448 100644 --- a/dss1.cpp +++ b/dss1.cpp @@ -1,6 +1,6 @@ /*****************************************************************************\ ** ** -** PBX4Linux ** +** LCR ** ** ** **---------------------------------------------------------------------------** ** Copyright: Andreas Eversberg ** @@ -12,7 +12,7 @@ #include "main.h" #include "myisdn.h" // socket mISDN -#include +//#include extern "C" { } #include @@ -23,18 +23,19 @@ extern unsigned int mt_assign_pid; /* * constructor */ -Pdss1::Pdss1(int type, struct 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, int mode) : PmISDN(type, mISDNport, portname, settings, channel, exclusive, mode) { p_callerinfo.itype = (mISDNport->ifport->interface->extension)?INFO_ITYPE_ISDN_EXTENSION:INFO_ITYPE_ISDN; p_m_d_ntmode = mISDNport->ntmode; + p_m_d_tespecial = mISDNport->tespecial; p_m_d_l3id = 0; p_m_d_ces = -1; - p_m_d_queue = NULL; + p_m_d_queue[0] = '\0'; p_m_d_notify_pending = NULL; p_m_d_collect_cause = 0; p_m_d_collect_location = 0; - PDEBUG(DEBUG_ISDN, "Created new mISDNPort(%s). Currently %d objects use, %s port #%d\n", portname, mISDNport->use, (mISDNport->ntmode)?"NT":"TE", p_m_portnum); + PDEBUG(DEBUG_ISDN, "Created new mISDNPort(%s). Currently %d objects use, %s%s port #%d\n", portname, mISDNport->use, (mISDNport->ntmode)?"NT":"TE", (mISDNport->tespecial)?" (special)":"", p_m_portnum); } @@ -44,9 +45,6 @@ Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_ Pdss1::~Pdss1() { /* remove queued message */ - if (p_m_d_queue) - message_free(p_m_d_queue); - if (p_m_d_notify_pending) message_free(p_m_d_notify_pending); } @@ -83,8 +81,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl exclusive = 0; /* select scenario */ - if (p_m_b_channel && p_m_b_exclusive) - { + if (p_m_b_channel && p_m_b_exclusive) { /*** we gave an exclusive channel (or if we are done) ***/ /* if not first reply, we are done */ @@ -96,8 +93,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel); /* if give channel not accepted or not equal */ - if (channel!=-1 && p_m_b_channel!=channel) - { + if (channel!=-1 && p_m_b_channel!=channel) { add_trace("conclusion", NULL, "forced channel not accepted"); end_trace(); ret = -44; @@ -111,8 +107,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl /* activate our exclusive channel */ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE); } else - if (p_m_b_channel) - { + if (p_m_b_channel) { /*** we gave a non-exclusive channel ***/ /* if not first reply, we are done */ @@ -124,8 +119,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel); /* if channel was accepted as given */ - if (channel==-1 || p_m_b_channel==channel) - { + if (channel==-1 || p_m_b_channel==channel) { add_trace("conclusion", NULL, "channel was accepted as given"); add_trace("connect", "channel", "%d", p_m_b_channel); end_trace(); @@ -135,8 +129,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl } /* if channel value is faulty */ - if (channel <= 0) - { + if (channel <= 0) { add_trace("conclusion", NULL, "illegal reply"); end_trace(); ret = -111; // protocol error @@ -146,8 +139,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl /* if channel was not accepted, try to get it */ ret = seize_bchannel(channel, 1); // exclusively add_trace("channel", "available", ret<0?"no":"yes"); - if (ret < 0) - { + if (ret < 0) { add_trace("conclusion", NULL, "replied channel not available"); end_trace(); goto channelerror; @@ -159,8 +151,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl /* activate channel given by remote */ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE); } else - if (p_m_b_reserve) - { + if (p_m_b_reserve) { /*** we sent 'any channel acceptable' ***/ /* if not first reply, we are done */ @@ -171,8 +162,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl add_trace("channel", "request", "any"); add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel); /* if no channel was replied */ - if (channel <= 0) - { + if (channel <= 0) { add_trace("conclusion", NULL, "no channel, protocol error"); end_trace(); ret = -111; // protocol error @@ -182,8 +172,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl /* we will see, if our received channel is available */ ret = seize_bchannel(channel, 1); // exclusively add_trace("channel", "available", ret<0?"no":"yes"); - if (ret < 0) - { + if (ret < 0) { add_trace("conclusion", NULL, "replied channel not available"); end_trace(); goto channelerror; @@ -194,24 +183,20 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl /* activate channel given by remote */ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE); - } else - { + } else { /*** we sent 'no channel available' ***/ /* if not the first reply, but a connect, we are forced */ - if (cmd==MT_CONNECT && p_state!=PORT_STATE_OUT_SETUP) - { + if (cmd==MT_CONNECT && p_state!=PORT_STATE_OUT_SETUP) { 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) - { + if (channel > 0) { goto use_from_connect; } ret = seize_bchannel(CHANNEL_ANY, 0); // any channel add_trace("channel", "available", ret<0?"no":"yes"); - if (ret < 0) - { + if (ret < 0) { add_trace("conclusion", NULL, "no channel available during call-waiting"); end_trace(); goto channelerror; @@ -234,8 +219,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl add_trace("channel", "request", "no-channel"); add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel); /* if first reply has no channel, we are done */ - if (channel <= 0) - { + if (channel <= 0) { add_trace("conclusion", NULL, "no channel until connect"); end_trace(); return(0); @@ -245,8 +229,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl use_from_connect: ret = seize_bchannel(channel, exclusive); add_trace("channel", "available", ret<0?"no":"yes"); - if (ret < 0) - { + if (ret < 0) { add_trace("conclusion", NULL, "replied channel not available"); end_trace(); goto channelerror; @@ -293,8 +276,7 @@ int Pdss1::hunt_bchannel(int channel, int exclusive) 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) - { + 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 @@ -302,20 +284,17 @@ int Pdss1::hunt_bchannel(int channel, int exclusive) if (channel <= 0) /* not given, no channel, whatever.. */ channel = CHANNEL_ANY; /* any channel */ add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved); - if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) // of out chan.. - { + if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) { // of out chan.. 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) - { + if (channel > 0) { /* check for given channel in selection list */ selchannel = ifport->in_channel; - while(selchannel) - { + while(selchannel) { if (selchannel->channel == channel || selchannel->channel == CHANNEL_FREE) break; selchannel = selchannel->next; @@ -324,15 +303,21 @@ int Pdss1::hunt_bchannel(int channel, int exclusive) channel = 0; /* exclusive channel requests must be in the list */ - if (exclusive) - { - if (!channel) - { + if (exclusive) { + /* no exclusive channel */ + 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); + /* get index for channel */ + i = channel-1-(channel>=17); + if (i < 0 || i >= p_m_mISDNport->b_num || channel == 16) { + add_trace("conclusion", NULL, "exclusively requested channel outside interface range"); + end_trace(); + return(-6); // channel unacceptable + } + /* check if busy */ if (p_m_mISDNport->b_port[i] == NULL) goto use_channel; add_trace("conclusion", NULL, "exclusively requested channel is busy"); @@ -341,9 +326,12 @@ int Pdss1::hunt_bchannel(int channel, int exclusive) } /* requested channels in list will be used */ - if (channel) - { - i = selchannel->channel-1-(selchannel->channel>=17); + if (channel) { + /* get index for channel */ + i = channel-1-(channel>=17); + if (i < 0 || i >= p_m_mISDNport->b_num || channel == 16) { + add_trace("info", NULL, "requested channel %d outside interface range", channel); + } else /* if inside range (else) check if available */ if (p_m_mISDNport->b_port[i] == NULL) goto use_channel; } @@ -353,20 +341,16 @@ int Pdss1::hunt_bchannel(int channel, int exclusive) /* check for first free channel in list */ channel = 0; selchannel = ifport->in_channel; - while(selchannel) - { - switch(selchannel->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) - { + while(i < p_m_mISDNport->b_num) { + if (p_m_mISDNport->b_port[i] == NULL) { channel = i+1+(i>=15); break; } @@ -381,8 +365,7 @@ int Pdss1::hunt_bchannel(int channel, int exclusive) 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) - { + if (p_m_mISDNport->b_port[i] == NULL) { channel = selchannel->channel; break; } @@ -392,8 +375,7 @@ int Pdss1::hunt_bchannel(int channel, int exclusive) break; /* found channel */ selchannel = selchannel->next; } - if (!channel) - { + if (!channel) { add_trace("conclusion", NULL, "no channel available"); end_trace(); return(-6); // channel unacceptable @@ -413,13 +395,14 @@ use_channel: void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { int calling_type, calling_plan, calling_present, calling_screen; + int calling_type2, calling_plan2, calling_present2, calling_screen2; 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; - unsigned char keypad[32] = ""; + unsigned char keypad[33] = ""; unsigned char useruser[128]; int useruser_len = 0, useruser_protocol; class Endpoint *epoint; @@ -428,8 +411,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) /* process given callref */ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_IND, DIRECTION_IN); add_trace("callref", "new", "0x%x", pid); - if (p_m_d_l3id) - { + if (p_m_d_l3id) { /* release in case the ID is already in use */ add_trace("error", NULL, "callref already in use"); end_trace(); @@ -448,12 +430,11 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) end_trace(); l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_IND, DIRECTION_IN); - dec_ie_calling_pn(l3m, &calling_type, &calling_plan, &calling_present, &calling_screen, (unsigned char *)p_callerinfo.id, sizeof(p_callerinfo.id)); + dec_ie_calling_pn(l3m, &calling_type, &calling_plan, &calling_present, &calling_screen, (unsigned char *)p_callerinfo.id, sizeof(p_callerinfo.id), &calling_type2, &calling_plan2, &calling_present2, &calling_screen2, (unsigned char *)p_callerinfo.id2, sizeof(p_callerinfo.id2)); dec_ie_called_pn(l3m, &called_type, &called_plan, (unsigned char *)p_dialinginfo.id, sizeof(p_dialinginfo.id)); dec_ie_keypad(l3m, (unsigned char *)keypad, sizeof(keypad)); /* te-mode: CNIP (calling name identification presentation) */ - if (!p_m_d_ntmode) - dec_facility_centrex(l3m, (unsigned char *)p_callerinfo.name, sizeof(p_callerinfo.name)); + dec_facility_centrex(l3m, (unsigned char *)p_callerinfo.name, sizeof(p_callerinfo.name)); dec_ie_useruser(l3m, &useruser_protocol, useruser, &useruser_len); dec_ie_complete(l3m, &p_dialinginfo.sending_complete); dec_ie_redir_nr(l3m, &redir_type, &redir_plan, &redir_present, &redir_screen, &redir_reason, (unsigned char *)p_redirinfo.id, sizeof(p_redirinfo.id)); @@ -464,8 +445,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) end_trace(); /* if blocked, release call with MT_RELEASE_COMPLETE */ - if (p_m_mISDNport->ifport->block) - { + if (p_m_mISDNport->ifport->block) { l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT); enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */ @@ -478,8 +458,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) } /* caller info */ - switch (calling_present) - { + switch (calling_present) { case 1: p_callerinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -490,21 +469,26 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_callerinfo.present = INFO_PRESENT_ALLOWED; break; } - switch (calling_screen) - { + switch (calling_screen) { case 0: p_callerinfo.screen = INFO_SCREEN_USER; break; + case 1: + p_callerinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED; + break; + case 2: + p_callerinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED; + break; default: p_callerinfo.screen = INFO_SCREEN_NETWORK; break; } - switch (calling_type) - { + switch (calling_type) { case -1: + p_callerinfo.ntype = INFO_NTYPE_NOTPRESENT; + break; + case 0x0: p_callerinfo.ntype = INFO_NTYPE_UNKNOWN; - p_callerinfo.present = INFO_PRESENT_NOTAVAIL; - p_callerinfo.screen = INFO_SCREEN_NETWORK; break; case 0x1: p_callerinfo.ntype = INFO_NTYPE_INTERNATIONAL; @@ -522,10 +506,56 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_callerinfo.isdn_port = p_m_portnum; SCPY(p_callerinfo.interface, p_m_mISDNport->ifport->interface->name); + /* caller info2 */ + switch (calling_present2) { + case 1: + p_callerinfo.present2 = INFO_PRESENT_RESTRICTED; + break; + case 2: + p_callerinfo.present2 = INFO_PRESENT_NOTAVAIL; + break; + default: + p_callerinfo.present2 = INFO_PRESENT_ALLOWED; + break; + } + switch (calling_screen2) { + case 0: + p_callerinfo.screen2 = INFO_SCREEN_USER; + break; + case 1: + p_callerinfo.screen2 = INFO_SCREEN_USER_VERIFIED_PASSED; + break; + case 2: + p_callerinfo.screen2 = INFO_SCREEN_USER_VERIFIED_FAILED; + break; + default: + p_callerinfo.screen2 = INFO_SCREEN_NETWORK; + break; + } + switch (calling_type2) { + case -1: + p_callerinfo.ntype2 = INFO_NTYPE_NOTPRESENT; + break; + case 0x0: + p_callerinfo.ntype2 = INFO_NTYPE_UNKNOWN; + break; + case 0x1: + p_callerinfo.ntype2 = INFO_NTYPE_INTERNATIONAL; + break; + case 0x2: + p_callerinfo.ntype2 = INFO_NTYPE_NATIONAL; + break; + case 0x4: + p_callerinfo.ntype2 = INFO_NTYPE_SUBSCRIBER; + break; + default: + p_callerinfo.ntype2 = INFO_NTYPE_UNKNOWN; + break; + } + /* dialing information */ SCAT(p_dialinginfo.id, (char *)keypad); - switch (called_type) - { + switch (called_type) { case 0x1: p_dialinginfo.ntype = INFO_NTYPE_INTERNATIONAL; break; @@ -541,8 +571,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) } /* redir info */ - switch (redir_present) - { + switch (redir_present) { case 1: p_redirinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -553,17 +582,21 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_redirinfo.present = INFO_PRESENT_ALLOWED; break; } - switch (redir_screen) - { + switch (redir_screen) { case 0: p_redirinfo.screen = INFO_SCREEN_USER; break; + case 1: + p_redirinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED; + break; + case 2: + p_redirinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED; + break; default: p_redirinfo.screen = INFO_SCREEN_NETWORK; break; } - switch (redir_reason) - { + switch (redir_reason) { case 1: p_redirinfo.reason = INFO_REDIR_BUSY; break; @@ -583,12 +616,12 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_redirinfo.reason = INFO_REDIR_UNKNOWN; break; } - switch (redir_type) - { + switch (redir_type) { case -1: + p_redirinfo.ntype = INFO_NTYPE_NOTPRESENT; + break; + case 0x0: p_redirinfo.ntype = INFO_NTYPE_UNKNOWN; - p_redirinfo.present = INFO_PRESENT_NULL; /* not redirecting */ - p_redirinfo.reason = INFO_REDIR_UNKNOWN; break; case 0x1: p_redirinfo.ntype = INFO_NTYPE_INTERNATIONAL; @@ -606,8 +639,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_redirinfo.isdn_port = p_m_portnum; /* bearer capability */ - switch (bearer_capability) - { + switch (bearer_capability) { case -1: p_capainfo.bearer_capa = INFO_BC_AUDIO; bearer_user = (options.law=='a')?3:2; @@ -616,8 +648,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_capainfo.bearer_capa = bearer_capability; break; } - switch (bearer_mode) - { + switch (bearer_mode) { case 2: p_capainfo.bearer_mode = INFO_BMODE_PACKET; break; @@ -625,8 +656,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_capainfo.bearer_mode = INFO_BMODE_CIRCUIT; break; } - switch (bearer_user) - { + switch (bearer_user) { case -1: p_capainfo.bearer_info1 = INFO_INFO1_NONE; break; @@ -636,8 +666,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) } /* hlc */ - switch (hlc_hlc) - { + switch (hlc_hlc) { case -1: p_capainfo.hlc = INFO_HLC_NONE; break; @@ -645,8 +674,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_capainfo.hlc = hlc_hlc + 0x80; break; } - switch (hlc_exthlc) - { + switch (hlc_exthlc) { case -1: p_capainfo.exthlc = INFO_HLC_NONE; break; @@ -655,6 +683,15 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) break; } + /* set bchannel mode */ + if (p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED + || p_capainfo.bearer_capa==INFO_BC_DATARESTRICTED + || p_capainfo.bearer_capa==INFO_BC_VIDEO) + p_capainfo.source_mode = B_MODE_HDLC; + else + p_capainfo.source_mode = B_MODE_TRANSPARENT; + p_m_b_mode = p_capainfo.source_mode; + /* hunt channel */ ret = channel = hunt_bchannel(channel, exclusive); if (ret < 0) @@ -662,8 +699,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) /* open channel */ ret = seize_bchannel(channel, 1); - if (ret < 0) - { + if (ret < 0) { no_channel: /* * NOTE: we send MT_RELEASE_COMPLETE to "REJECT" the channel @@ -710,7 +746,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) void Pdss1::information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { int type, plan; - unsigned char keypad[32] = "", display[128] = ""; + unsigned char keypad[33] = "", display[128] = ""; struct lcr_msg *message; l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_IND, DIRECTION_IN); @@ -721,8 +757,7 @@ void Pdss1::information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l end_trace(); SCAT(p_dialinginfo.id, (char *)keypad); - switch (type) - { + switch (type) { case 0x1: p_dialinginfo.ntype = INFO_NTYPE_INTERNATIONAL; break; @@ -736,7 +771,7 @@ void Pdss1::information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l p_dialinginfo.ntype = INFO_NTYPE_UNKNOWN; break; } - SCAT(p_dialinginfo.display, (char *)display); + SCPY(p_dialinginfo.display, (char *)display); message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_INFORMATION); memcpy(&message->param.information, &p_dialinginfo, sizeof(struct dialing_info)); message_put(message); @@ -751,6 +786,9 @@ void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_ int coding, location, progress; int ret; struct lcr_msg *message; + int max = p_m_mISDNport->ifport->dialmax; + char *number; + l3_msg *nl3m; l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_IND, DIRECTION_IN); dec_ie_channel_id(l3m, &exclusive, &channel); @@ -759,8 +797,7 @@ void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_ /* process channel */ ret = received_first_reply_to_setup(cmd, channel, exclusive); - if (ret < 0) - { + if (ret < 0) { message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = -ret; message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; @@ -774,6 +811,20 @@ void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_ message_put(message); new_state(PORT_STATE_OUT_OVERLAP); + + number = p_m_d_queue; + while (number[0]) { /* as long we have something to dial */ + if (max > (int)strlen(number) || max == 0) + max = (int)strlen(number); + + nl3m = create_l3msg(); + l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT); + enc_ie_called_pn(nl3m, 0, 1, (unsigned char *)number, max); + end_trace(); + p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, nl3m); + number += max; + } + p_m_d_queue[0] = '\0'; } /* CC_PROCEEDING INDICATION */ @@ -794,8 +845,7 @@ void Pdss1::proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 end_trace(); ret = received_first_reply_to_setup(cmd, channel, exclusive); - if (ret < 0) - { + if (ret < 0) { message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = -ret; message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; @@ -813,16 +863,14 @@ void Pdss1::proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 notify |= 0x80; else notify = 0; - if (type >= 0 || notify) - { + if (type >= 0 || notify) { if (!notify && type >= 0) notify = 251; message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_NOTIFY); message->param.notifyinfo.notify = notify; SCPY(message->param.notifyinfo.id, redir); /* redirection number */ - switch (present) - { + switch (present) { case 1: message->param.notifyinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -833,11 +881,9 @@ void Pdss1::proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 message->param.notifyinfo.present = INFO_PRESENT_ALLOWED; break; } - switch (type) - { + switch (type) { case -1: - message->param.notifyinfo.ntype = INFO_NTYPE_UNKNOWN; - message->param.notifyinfo.present = INFO_PRESENT_NULL; + message->param.notifyinfo.ntype = INFO_NTYPE_NOTPRESENT; break; case 1: message->param.notifyinfo.ntype = INFO_NTYPE_INTERNATIONAL; @@ -876,8 +922,7 @@ void Pdss1::alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) /* process channel */ ret = received_first_reply_to_setup(cmd, channel, exclusive); - if (ret < 0) - { + if (ret < 0) { message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = -ret; message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; @@ -895,15 +940,13 @@ void Pdss1::alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) notify |= 0x80; else notify = 0; - if (type >= 0 || notify) - { + if (type >= 0 || notify) { if (!notify && type >= 0) notify = 251; message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_NOTIFY); message->param.notifyinfo.notify = notify; SCPY(message->param.notifyinfo.id, redir); - switch (present) - { + switch (present) { case 1: message->param.notifyinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -914,11 +957,9 @@ void Pdss1::alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) message->param.notifyinfo.present = INFO_PRESENT_ALLOWED; break; } - switch (type) - { + switch (type) { case -1: - message->param.notifyinfo.ntype = INFO_NTYPE_UNKNOWN; - message->param.notifyinfo.present = INFO_PRESENT_NULL; + message->param.notifyinfo.ntype = INFO_NTYPE_NOTPRESENT; break; case 1: message->param.notifyinfo.ntype = INFO_NTYPE_INTERNATIONAL; @@ -952,15 +993,13 @@ void Pdss1::connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) dec_ie_connected_pn(l3m, &type, &plan, &present, &screen, (unsigned char *)p_connectinfo.id, sizeof(p_connectinfo.id)); dec_ie_display(l3m, (unsigned char *)p_connectinfo.display, sizeof(p_connectinfo.display)); /* te-mode: CONP (connected name identification presentation) */ - if (!p_m_d_ntmode) - dec_facility_centrex(l3m, (unsigned char *)p_connectinfo.name, sizeof(p_connectinfo.name)); + dec_facility_centrex(l3m, (unsigned char *)p_connectinfo.name, sizeof(p_connectinfo.name)); end_trace(); /* select channel */ bchannel_before = p_m_b_channel; ret = received_first_reply_to_setup(cmd, channel, exclusive); - if (ret < 0) - { + if (ret < 0) { message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = -ret; message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; @@ -971,8 +1010,7 @@ void Pdss1::connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) } /* connect information */ - switch (present) - { + switch (present) { case 1: p_connectinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -983,20 +1021,23 @@ void Pdss1::connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_connectinfo.present = INFO_PRESENT_ALLOWED; break; } - switch (screen) - { + switch (screen) { case 0: p_connectinfo.screen = INFO_SCREEN_USER; break; + case 1: + p_connectinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED; + break; + case 2: + p_connectinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED; + break; default: p_connectinfo.screen = INFO_SCREEN_NETWORK; break; } - switch (type) - { - case 0x0: - p_connectinfo.present = INFO_PRESENT_NULL; /* no COLP info */ - p_connectinfo.ntype = INFO_NTYPE_UNKNOWN; + switch (type) { + case -1: + p_connectinfo.ntype = INFO_NTYPE_NOTPRESENT; break; case 0x1: p_connectinfo.ntype = INFO_NTYPE_INTERNATIONAL; @@ -1015,8 +1056,7 @@ void Pdss1::connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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) - { + if (p_m_d_ntmode) { /* send connect acknowledge */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_RES, DIRECTION_OUT); @@ -1048,12 +1088,13 @@ void Pdss1::disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 dec_ie_display(l3m, (unsigned char *)display, sizeof(display)); end_trace(); - if (cause < 0) + if (cause < 0) { cause = 16; + location = LOCATION_PRIVATE_LOCAL; + } /* release if remote sends us no tones */ - if (!p_m_mISDNport->earlyb) - { + if (!p_m_mISDNport->earlyb) { l3_msg *l3m; l3m = create_l3msg(); @@ -1066,8 +1107,7 @@ void Pdss1::disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 /* sending release to endpoint */ if (location == LOCATION_PRIVATE_LOCAL) location = LOCATION_PRIVATE_REMOTE; - while(p_epointlist) - { + while(p_epointlist) { message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = cause; message->param.disconnectinfo.location = location; @@ -1084,16 +1124,14 @@ void Pdss1::disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 /* sending disconnect to active endpoint and release to inactive endpoints */ if (location == LOCATION_PRIVATE_LOCAL) location = LOCATION_PRIVATE_REMOTE; - if (ACTIVE_EPOINT(p_epointlist)) - { + if (ACTIVE_EPOINT(p_epointlist)) { message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DISCONNECT); message->param.disconnectinfo.location = location; message->param.disconnectinfo.cause = cause; SCAT(message->param.disconnectinfo.display, (char *)display); message_put(message); } - while(INACTIVE_EPOINT(p_epointlist)) - { + while(INACTIVE_EPOINT(p_epointlist)) { message = message_create(p_serial, INACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.location = location; message->param.disconnectinfo.cause = cause; @@ -1112,8 +1150,7 @@ void Pdss1::disconnect_ind_i(unsigned int cmd, unsigned int pid, struct l3_msg * /* cause */ l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_IND, DIRECTION_IN); - if (p_m_d_collect_cause > 0) - { + if (p_m_d_collect_cause > 0) { add_trace("old-cause", "location", "%d", p_m_d_collect_location); add_trace("old-cause", "value", "%d", p_m_d_collect_cause); } @@ -1141,14 +1178,15 @@ void Pdss1::release_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) dec_ie_display(l3m, (unsigned char *)display, sizeof(display)); end_trace(); - if (cause < 0) + if (cause < 0) { cause = 16; + location = LOCATION_PRIVATE_LOCAL; + } /* sending release to endpoint */ if (location == LOCATION_PRIVATE_LOCAL) location = LOCATION_PRIVATE_REMOTE; - while(p_epointlist) - { + while(p_epointlist) { message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = cause; message->param.disconnectinfo.location = location; @@ -1179,25 +1217,27 @@ void Pdss1::release_complete_ind(unsigned int cmd, unsigned int pid, struct l3_m l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_IND, DIRECTION_IN); /* in case layer 2 is down during setup, we send cause 27 loc 5 */ - if (p_state == PORT_STATE_OUT_SETUP && !p_m_mISDNport->l1link) - { + if (p_state == PORT_STATE_OUT_SETUP && p_m_mISDNport->l1link == 0) { cause = 27; location = 5; - } else - { + } else { dec_ie_cause(l3m, &location, &cause); - add_trace("layer 1", NULL, (p_m_mISDNport->l1link)?"up":"down"); + if (p_m_mISDNport->l1link < 0) + add_trace("layer 1", NULL, "unknown"); + else + add_trace("layer 1", NULL, (p_m_mISDNport->l1link)?"up":"down"); } end_trace(); if (location == LOCATION_PRIVATE_LOCAL) location = LOCATION_PRIVATE_REMOTE; - if (cause < 0) + if (cause < 0) { cause = 16; + location = LOCATION_PRIVATE_LOCAL; + } /* sending release to endpoint */ - while(p_epointlist) - { + while(p_epointlist) { message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = cause; message->param.disconnectinfo.location = location; @@ -1240,8 +1280,7 @@ void Pdss1::notify_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) message->param.notifyinfo.notify = notify; SCPY(message->param.notifyinfo.id, (char *)notifyid); /* redirection number */ - switch (present) - { + switch (present) { case 1: message->param.notifyinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -1252,11 +1291,9 @@ void Pdss1::notify_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) message->param.notifyinfo.present = INFO_PRESENT_ALLOWED; break; } - switch (type) - { + switch (type) { case -1: - message->param.notifyinfo.ntype = INFO_NTYPE_UNKNOWN; - message->param.notifyinfo.present = INFO_PRESENT_NULL; + message->param.notifyinfo.ntype = INFO_NTYPE_NOTPRESENT; break; case 1: message->param.notifyinfo.ntype = INFO_NTYPE_INTERNATIONAL; @@ -1286,8 +1323,7 @@ void Pdss1::hold_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_IND, DIRECTION_IN); end_trace(); - if (!ACTIVE_EPOINT(p_epointlist) || p_m_hold) - { + if (!ACTIVE_EPOINT(p_epointlist) || p_m_hold) { l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_REJECT_REQ, DIRECTION_OUT); enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, p_m_hold?101:31); /* normal unspecified / incompatible state */ @@ -1314,8 +1350,7 @@ void Pdss1::hold_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) p_m_hold = 1; #if 0 epoint = find_epoint_id(ACTIVE_EPOINT(p_epointlist)); - if (epoint && p_m_d_ntmode) - { + if (epoint && p_m_d_ntmode) { p_m_timeout = p_settings.tout_hold; time(&p_m_timer); } @@ -1340,8 +1375,7 @@ void Pdss1::retrieve_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) dec_ie_channel_id(l3m, &exclusive, &channel); end_trace(); - if (!p_m_hold) - { + if (!p_m_hold) { cause = 101; /* incompatible state */ reject: @@ -1367,8 +1401,7 @@ void Pdss1::retrieve_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) /* open channel */ ret = seize_bchannel(channel, 1); - if (ret < 0) - { + if (ret < 0) { no_channel: cause = -ret; goto reject; @@ -1400,8 +1433,7 @@ void Pdss1::suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) dec_ie_call_id(l3m, callid, &len); end_trace(); - if (!ACTIVE_EPOINT(p_epointlist)) - { + if (!ACTIVE_EPOINT(p_epointlist)) { reject: l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_REJECT_REQ, DIRECTION_OUT); @@ -1416,13 +1448,10 @@ void Pdss1::suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) /* check if call id is in use */ epoint = epoint_first; - while(epoint) - { - if (epoint->ep_park) - { + while(epoint) { + if (epoint->ep_park) { if (epoint->ep_park_len == len) - if (!memcmp(epoint->ep_park_callid, callid, len)) - { + if (!memcmp(epoint->ep_park_callid, callid, len)) { ret = -84; /* call id in use */ goto reject; } @@ -1443,8 +1472,7 @@ void Pdss1::suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) drop_bchannel(); /* sending suspend to endpoint */ - while (p_epointlist) - { + while (p_epointlist) { message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_SUSPEND); memcpy(message->param.parkinfo.callid, callid, sizeof(message->param.parkinfo.callid)); message->param.parkinfo.len = len; @@ -1476,8 +1504,7 @@ void Pdss1::resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) /* process given callref */ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_IND, DIRECTION_IN); add_trace("callref", "new", "0x%x", pid); - if (p_m_d_l3id) - { + if (p_m_d_l3id) { /* release is case the ID is already in use */ add_trace("error", NULL, "callref already in use"); end_trace(); @@ -1500,8 +1527,7 @@ void Pdss1::resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) end_trace(); /* if blocked, release call */ - if (p_m_mISDNport->ifport->block) - { + if (p_m_mISDNport->ifport->block) { ret = -27; goto reject; } @@ -1518,10 +1544,10 @@ void Pdss1::resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) if (ret < 0) goto no_channel; +// mode (if hdlc parked) to be done. never mind, this is almost never requested /* open channel */ ret = seize_bchannel(channel, 1); - if (ret < 0) - { + if (ret < 0) { no_channel: reject: l3m = create_l3msg(); @@ -1542,10 +1568,8 @@ void Pdss1::resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) FATAL("Incoming resume but already got an endpoint.\n"); ret = -85; /* no call suspended */ epoint = epoint_first; - while(epoint) - { - if (epoint->ep_park) - { + while(epoint) { + if (epoint->ep_park) { ret = -83; /* suspended call exists, but this not */ if (epoint->ep_park_len == len) if (!memcmp(epoint->ep_park_callid, callid, len)) @@ -1601,6 +1625,17 @@ void Pdss1::facility_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) } +/* CC_PROGRESS INDICATION */ +void Pdss1::progress_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) +{ + int coding, location, progress; + + l1l2l3_trace_header(p_m_mISDNport, this, L3_PROGRESS_IND, DIRECTION_IN); + dec_ie_progress(l3m, &coding, &location, &progress); + end_trace(); +} + + /* * handler for isdn connections * incoming information are parsed and sent via message to the endpoint @@ -1609,16 +1644,13 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { int timer = 0; - switch (cmd) - { + switch (cmd) { case MT_TIMEOUT: - if (!l3m->cause) - { + if (!l3m->cause) { PERROR("Pdss1(%s) timeout without cause.\n", p_name); break; } - if (l3m->cause[0] != 5) - { + if (l3m->cause[0] != 5) { PERROR("Pdss1(%s) expecting timeout with timer diagnostic. (got len=%d)\n", p_name, l3m->cause[0]); break; } @@ -1643,8 +1675,7 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) break; case MT_SETUP_ACKNOWLEDGE: - if (p_state != PORT_STATE_OUT_SETUP) - { + 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); break; } @@ -1653,8 +1684,7 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) case MT_CALL_PROCEEDING: if (p_state != PORT_STATE_OUT_SETUP - && p_state != PORT_STATE_OUT_OVERLAP) - { + && 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); break; } @@ -1664,8 +1694,7 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) case MT_ALERTING: if (p_state != PORT_STATE_OUT_SETUP && p_state != PORT_STATE_OUT_OVERLAP - && p_state != PORT_STATE_OUT_PROCEEDING) - { + && 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); break; } @@ -1676,14 +1705,12 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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) - { + && 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); break; } connect_ind(cmd, pid, l3m); - if (p_m_d_notify_pending) - { + if (p_m_d_notify_pending) { /* 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); @@ -1694,8 +1721,7 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) case MT_CONNECT_ACKNOWLEDGE: if (p_state == PORT_STATE_CONNECT_WAITING) new_state(PORT_STATE_CONNECT); - if (p_m_d_notify_pending) - { + if (p_m_d_notify_pending) { /* 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); @@ -1743,6 +1769,10 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) facility_ind(cmd, pid, l3m); break; + case MT_PROGRESS: + progress_ind(cmd, pid, l3m); + break; + case MT_FREE: l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_L3ID_IND, DIRECTION_IN); add_trace("callref", NULL, "0x%x", p_m_d_l3id); @@ -1753,16 +1783,13 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) /* sending release to endpoint in case we still have an endpoint * this is because we don't get any response if a release_complete is received (or a release in release state) */ - while(p_epointlist) // only if not already released - { + while(p_epointlist) { // only if not already released struct lcr_msg *message; message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); - if (p_m_d_collect_cause) - { + if (p_m_d_collect_cause) { message->param.disconnectinfo.cause = p_m_d_collect_cause; message->param.disconnectinfo.location = p_m_d_collect_location; - } else - { + } else { message->param.disconnectinfo.cause = CAUSE_NOUSER; message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; } @@ -1775,7 +1802,7 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) break; default: - l1l2l3_trace_header(p_m_mISDNport, this, L3_UNKNOWN, DIRECTION_IN); + l1l2l3_trace_header(p_m_mISDNport, this, L3_UNKNOWN_IND, DIRECTION_IN); add_trace("unhandled", "cmd", "0x%x", cmd); end_trace(); } @@ -1786,41 +1813,34 @@ void Pdss1::new_state(int state) // class Endpoint *epoint; /* set timeout */ - if (state == PORT_STATE_IN_OVERLAP) - { + if (state == PORT_STATE_IN_OVERLAP) { p_m_timeout = p_m_mISDNport->ifport->tout_dialing; time(&p_m_timer); } - if (state != p_state) - { + if (state != p_state) { if (state == PORT_STATE_IN_SETUP || state == PORT_STATE_OUT_SETUP || state == PORT_STATE_IN_OVERLAP - || state == PORT_STATE_OUT_OVERLAP) - { + || state == PORT_STATE_OUT_OVERLAP) { p_m_timeout = p_m_mISDNport->ifport->tout_setup; time(&p_m_timer); } if (state == PORT_STATE_IN_PROCEEDING - || state == PORT_STATE_OUT_PROCEEDING) - { + || state == PORT_STATE_OUT_PROCEEDING) { p_m_timeout = p_m_mISDNport->ifport->tout_proceeding; time(&p_m_timer); } if (state == PORT_STATE_IN_ALERTING - || state == PORT_STATE_OUT_ALERTING) - { + || state == PORT_STATE_OUT_ALERTING) { p_m_timeout = p_m_mISDNport->ifport->tout_alerting; time(&p_m_timer); } if (state == PORT_STATE_CONNECT - || state == PORT_STATE_CONNECT_WAITING) - { + || state == PORT_STATE_CONNECT_WAITING) { p_m_timeout = 0; } if (state == PORT_STATE_IN_DISCONNECT - || state == PORT_STATE_OUT_DISCONNECT) - { + || state == PORT_STATE_OUT_DISCONNECT) { p_m_timeout = p_m_mISDNport->ifport->tout_disconnect; time(&p_m_timer); } @@ -1841,8 +1861,7 @@ int Pdss1::handler(void) return(ret); /* handle destruction */ - if (p_m_delete && p_m_d_l3id==0) - { + if (p_m_delete && p_m_d_l3id==0) { delete this; return(-1); } @@ -1858,36 +1877,43 @@ int Pdss1::handler(void) void Pdss1::message_information(unsigned int epoint_id, int message_id, union parameter *param) { l3_msg *l3m; - - if (param->information.id[0]) /* only if we have something to dial */ - { + char *display = param->information.display; + char *number = param->information.id; + int max = p_m_mISDNport->ifport->dialmax; + + while (number[0]) { /* as long we have something to dial */ + if (max > (int)strlen(number) || max == 0) + max = (int)strlen(number); + l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT); - enc_ie_called_pn(l3m, 0, 1, (unsigned char *)param->information.id); - if (p_m_d_ntmode) - enc_ie_display(l3m, (unsigned char *)param->information.display); + enc_ie_called_pn(l3m, 0, 1, (unsigned char *)number, max); + if ((p_m_d_ntmode || p_m_d_tespecial) && display[0]) { + enc_ie_display(l3m, (unsigned char *)display); + display = (char *)""; + } end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m); + number += max; } new_state(p_state); } -int newteid = 0; - /* MESSAGE_SETUP */ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union parameter *param) { l3_msg *l3m; int ret; int plan, type, screen, present, reason; + int plan2, type2, screen2, present2; int capability, mode, rate, coding, user, presentation, interpretation, hlc, exthlc; int channel, exclusive; struct epoint_list *epointlist; + int max = p_m_mISDNport->ifport->dialmax; /* release if port is blocked */ - if (p_m_mISDNport->ifport->block) - { + if (p_m_mISDNport->ifport->block) { struct lcr_msg *message; message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); @@ -1904,22 +1930,20 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete memcpy(&p_dialinginfo, ¶m->setup.dialinginfo, sizeof(p_dialinginfo)); memcpy(&p_capainfo, ¶m->setup.capainfo, sizeof(p_capainfo)); memcpy(&p_redirinfo, ¶m->setup.redirinfo, sizeof(p_redirinfo)); -// SCPY(&p_m_tones_dir, param->setup.ext.tones_dir); /* screen outgoing caller id */ do_screen(1, p_callerinfo.id, sizeof(p_callerinfo.id), &p_callerinfo.ntype, &p_callerinfo.present, p_m_mISDNport->ifport->interface); + do_screen(1, p_callerinfo.id2, sizeof(p_callerinfo.id2), &p_callerinfo.ntype2, &p_callerinfo.present2, p_m_mISDNport->ifport->interface); /* only display at connect state: this case happens if endpoint is in connected mode */ - if (p_state==PORT_STATE_CONNECT) - { + if (p_state==PORT_STATE_CONNECT) { if (p_type!=PORT_TYPE_DSS1_NT_OUT && p_type!=PORT_TYPE_DSS1_NT_IN) return; - if (p_callerinfo.display[0]) - { + if (p_callerinfo.display[0]) { /* sending information */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT); - if (p_m_d_ntmode) + if (p_m_d_ntmode || p_m_d_tespecial) enc_ie_display(l3m, (unsigned char *)p_callerinfo.display); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m); @@ -1929,8 +1953,7 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete /* attach only if not already */ epointlist = p_epointlist; - while(epointlist) - { + while(epointlist) { if (epointlist->epoint_id == epoint_id) break; epointlist = epointlist->next; @@ -1940,8 +1963,7 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete /* get channel */ exclusive = 0; - if (p_m_b_channel) - { + if (p_m_b_channel) { channel = p_m_b_channel; exclusive = p_m_b_exclusive; } else @@ -1955,8 +1977,7 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete /* see MT_ASSIGN notes at do_layer3() */ mt_assign_pid = 0; ret = p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_ASSIGN, 0, NULL); - if (mt_assign_pid == 0 || ret < 0) - { + if (mt_assign_pid == 0 || ret < 0) { struct lcr_msg *message; add_trace("callref", NULL, "no free id"); @@ -1979,13 +2000,13 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_REQ, DIRECTION_OUT); /* channel information */ if (channel >= 0) /* it should */ - { enc_ie_channel_id(l3m, exclusive, channel); - } /* caller information */ plan = 1; - switch (p_callerinfo.ntype) - { + switch (p_callerinfo.ntype) { + case INFO_NTYPE_UNKNOWN: + type = 0x0; + break; case INFO_NTYPE_INTERNATIONAL: type = 0x1; break; @@ -1995,50 +2016,104 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete case INFO_NTYPE_SUBSCRIBER: type = 0x4; break; - default: /* INFO_NTYPE_UNKNOWN */ - type = 0x0; + default: /* INFO_NTYPE_NOTPRESENT */ + type = -1; break; } - switch (p_callerinfo.screen) - { + switch (p_callerinfo.screen) { case INFO_SCREEN_USER: screen = 0; break; + case INFO_SCREEN_USER_VERIFIED_PASSED: + screen = 1; + break; + case INFO_SCREEN_USER_VERIFIED_FAILED: + screen = 2; + break; default: /* INFO_SCREEN_NETWORK */ screen = 3; break; } - switch (p_callerinfo.present) - { + switch (p_callerinfo.present) { + case INFO_PRESENT_ALLOWED: + present = 0; + break; case INFO_PRESENT_RESTRICTED: present = 1; break; - case INFO_PRESENT_NOTAVAIL: + default: /* INFO_PRESENT_NOTAVAIL */ present = 2; break; - default: /* INFO_PRESENT_ALLOWED */ - present = 0; + } + /* caller information 2 */ + plan2 = 1; + switch (p_callerinfo.ntype2) { + case INFO_NTYPE_UNKNOWN: + type2 = 0x0; + break; + case INFO_NTYPE_INTERNATIONAL: + type2 = 0x1; + break; + case INFO_NTYPE_NATIONAL: + type2 = 0x2; + break; + case INFO_NTYPE_SUBSCRIBER: + type2 = 0x4; + break; + default: /* INFO_NTYPE_NOTPRESENT */ + type2 = -1; + break; + } + switch (p_callerinfo.screen2) { + case INFO_SCREEN_USER: + screen2 = 0; + break; + case INFO_SCREEN_USER_VERIFIED_PASSED: + screen2 = 1; + break; + case INFO_SCREEN_USER_VERIFIED_FAILED: + screen2 = 2; + break; + default: /* INFO_SCREEN_NETWORK */ + screen2 = 3; + break; + } + switch (p_callerinfo.present2) { + case INFO_PRESENT_ALLOWED: + present2 = 0; + break; + case INFO_PRESENT_RESTRICTED: + present2 = 1; + break; + default: /* INFO_PRESENT_NOTAVAIL */ + present2 = 2; break; } if (type >= 0) - enc_ie_calling_pn(l3m, type, plan, present, screen, (unsigned char *)p_callerinfo.id); + enc_ie_calling_pn(l3m, type, plan, present, screen, (unsigned char *)p_callerinfo.id, type2, plan2, present2, screen2, (unsigned char *)p_callerinfo.id2); /* dialing information */ - if (p_dialinginfo.id[0]) /* only if we have something to dial */ - { - enc_ie_called_pn(l3m, 0, 1, (unsigned char *)p_dialinginfo.id); - } + if (p_dialinginfo.id[0]) { /* only if we have something to dial */ + if (max > (int)strlen(p_dialinginfo.id) || max == 0) + max = (int)strlen(p_dialinginfo.id); + enc_ie_called_pn(l3m, 0, 1, (unsigned char *)p_dialinginfo.id, max); + SCPY(p_m_d_queue, p_dialinginfo.id + max); + } + /* keypad */ + if (p_dialinginfo.keypad[0]) + enc_ie_keypad(l3m, (unsigned char *)p_dialinginfo.keypad); /* sending complete */ if (p_dialinginfo.sending_complete) enc_ie_complete(l3m, 1); /* sending user-user */ - if (param->setup.useruser.len) - { + if (param->setup.useruser.len) { enc_ie_useruser(l3m, param->setup.useruser.protocol, param->setup.useruser.data, param->setup.useruser.len); } /* redirecting number */ plan = 1; - switch (p_redirinfo.ntype) - { + switch (p_redirinfo.ntype) { + case INFO_NTYPE_UNKNOWN: + type = 0x0; + break; case INFO_NTYPE_INTERNATIONAL: type = 0x1; break; @@ -2048,21 +2123,25 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete case INFO_NTYPE_SUBSCRIBER: type = 0x4; break; - default: /* INFO_NTYPE_UNKNOWN */ - type = 0x0; + default: /* INFO_NTYPE_NOTPRESENT */ + type = -1; break; } - switch (p_redirinfo.screen) - { + switch (p_redirinfo.screen) { case INFO_SCREEN_USER: screen = 0; break; + case INFO_SCREEN_USER_VERIFIED_PASSED: + screen = 1; + break; + case INFO_SCREEN_USER_VERIFIED_FAILED: + screen = 2; + break; default: /* INFO_SCREE_NETWORK */ screen = 3; break; } - switch (p_redirinfo.reason) - { + switch (p_redirinfo.reason) { case INFO_REDIR_BUSY: reason = 1; break; @@ -2082,27 +2161,19 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete reason = 0; break; } - switch (p_redirinfo.present) - { - case INFO_PRESENT_NULL: /* no redir at all */ - present = -1; - screen = -1; - reason = -1; - plan = -1; - type = -1; + switch (p_redirinfo.present) { + case INFO_PRESENT_ALLOWED: + present = 0; break; case INFO_PRESENT_RESTRICTED: present = 1; break; - case INFO_PRESENT_NOTAVAIL: + default: /* INFO_PRESENT_NOTAVAIL */ present = 2; break; - default: /* INFO_PRESENT_ALLOWED */ - present = 0; - break; } /* sending redirecting number only in ntmode */ - if (type >= 0 && p_m_d_ntmode) + if (type >= 0 && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_redir_nr(l3m, type, plan, present, screen, reason, (unsigned char *)p_redirinfo.id); /* bearer capability */ //printf("hlc=%d\n",p_capainfo.hlc); @@ -2110,8 +2181,7 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete capability = p_capainfo.bearer_capa; mode = p_capainfo.bearer_mode; rate = (mode==INFO_BMODE_CIRCUIT)?0x10:0x00; - switch (p_capainfo.bearer_info1) - { + switch (p_capainfo.bearer_info1) { case INFO_INFO1_NONE: user = -1; break; @@ -2121,8 +2191,7 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete } enc_ie_bearer(l3m, coding, capability, mode, rate, -1, user); /* hlc */ - if (p_capainfo.hlc) - { + if (p_capainfo.hlc) { coding = 0; interpretation = 4; presentation = 1; @@ -2134,10 +2203,10 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete } /* display */ - if (p_callerinfo.display[0] && p_m_d_ntmode) + if (p_callerinfo.display[0] && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)p_callerinfo.display); /* nt-mode: CNIP (calling name identification presentation) */ -// if (p_callerinfo.name[0] && p_m_d_ntmode) +// if (p_callerinfo.name[0] && (p_m_d_ntmode || p_m_d_tespecial)) // enc_facility_centrex(&setup->FACILITY, dmsg, (unsigned char *)p_callerinfo.name, 1); end_trace(); @@ -2153,7 +2222,7 @@ void Pdss1::message_facility(unsigned int epoint_id, int message_id, union param l3_msg *l3m; /* facility will not be sent to external lines */ - if (!p_m_d_ntmode) + if (!p_m_d_ntmode && !p_m_d_tespecial) return; /* sending facility */ @@ -2169,22 +2238,26 @@ void Pdss1::message_notify(unsigned int epoint_id, int message_id, union paramet { l3_msg *l3m; int notify; - int plan, type = -1, present; + int plan = 0, type = -1, present = 0; + if (p_m_mISDNport->ifport->nonotify) { + l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_REQ, DIRECTION_OUT); + add_trace("info", NULL, "blocked by config"); + end_trace(); + return; + } + +// printf("if = %d\n", param->notifyinfo.notify); if (param->notifyinfo.notify>INFO_NOTIFY_NONE) notify = param->notifyinfo.notify & 0x7f; else notify = -1; - if (p_state != PORT_STATE_CONNECT) - { - /* notify only allowed in active state */ - notify = -1; - } - if (notify >= 0) - { + if (notify >= 0) { plan = 1; - switch (param->notifyinfo.ntype) - { + switch (param->notifyinfo.ntype) { + case INFO_NTYPE_UNKNOWN: + type = 0; + break; case INFO_NTYPE_INTERNATIONAL: type = 1; break; @@ -2195,59 +2268,48 @@ void Pdss1::message_notify(unsigned int epoint_id, int message_id, union paramet type = 4; break; default: /* INFO_NTYPE_UNKNOWN */ - type = 0; + type = -1; break; } - switch (param->notifyinfo.present) - { - case INFO_PRESENT_NULL: /* no redir at all */ - present = -1; - plan = -1; - type = -1; + switch (param->notifyinfo.present) { + case INFO_PRESENT_ALLOWED: + present = 0; break; case INFO_PRESENT_RESTRICTED: present = 1; break; - case INFO_PRESENT_NOTAVAIL: + default: /* INFO_PRESENT_NOTAVAIL */ present = 2; break; - default: /* INFO_PRESENT_ALLOWED */ - present = 0; - break; } } - if (notify<0 && !param->notifyinfo.display[0]) - { + if (notify<0 && !param->notifyinfo.display[0]) { /* nothing to notify, nothing to display */ return; } - if (notify >= 0) - { - if (p_state!=PORT_STATE_CONNECT) - { + if (notify >= 0) { + if (p_state!=PORT_STATE_CONNECT && p_state!=PORT_STATE_IN_PROCEEDING && p_state!=PORT_STATE_IN_ALERTING) { /* queue notification */ 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); memcpy(&p_m_d_notify_pending->param, param, sizeof(union parameter)); - } else - { + } else { /* sending notification */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_REQ, DIRECTION_OUT); enc_ie_notify(l3m, notify); /* sending redirection number only in ntmode */ - if (type >= 0 && p_m_d_ntmode) + if (type >= 0 && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_redir_dn(l3m, type, plan, present, (unsigned char *)param->notifyinfo.id); - if (param->notifyinfo.display[0] && p_m_d_ntmode) + if (param->notifyinfo.display[0] && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)param->notifyinfo.display); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_NOTIFY, p_m_d_l3id, l3m); } - } else if (p_m_d_ntmode) - { + } else if (p_m_d_ntmode || p_m_d_tespecial) { /* sending information */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT); @@ -2262,6 +2324,13 @@ void Pdss1::message_overlap(unsigned int epoint_id, int message_id, union parame { l3_msg *l3m; + /* in case of sending complete, we proceed */ + if (p_dialinginfo.sending_complete) { + PDEBUG(DEBUG_ISDN, "sending proceeding instead of setup_acknowledge, because address is complete.\n"); + message_proceeding(epoint_id, message_id, param); + return; + } + /* sending setup_acknowledge */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_REQ, DIRECTION_OUT); @@ -2273,7 +2342,7 @@ void Pdss1::message_overlap(unsigned int epoint_id, int message_id, union parame || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SETUP_ACKNOWLEDGE, p_m_d_l3id, l3m); @@ -2296,7 +2365,7 @@ void Pdss1::message_proceeding(unsigned int epoint_id, int message_id, union par || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m); @@ -2309,8 +2378,7 @@ void Pdss1::message_alerting(unsigned int epoint_id, int message_id, union param l3_msg *l3m; /* NT-MODE in setup state we must send PROCEEDING first */ - if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) - { + if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) { /* sending proceeding */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT); @@ -2321,7 +2389,7 @@ void Pdss1::message_alerting(unsigned int epoint_id, int message_id, union param || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m); new_state(PORT_STATE_IN_PROCEEDING); @@ -2338,7 +2406,7 @@ void Pdss1::message_alerting(unsigned int epoint_id, int message_id, union param || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_ALERTING, p_m_d_l3id, l3m); @@ -2353,8 +2421,7 @@ void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parame class Endpoint *epoint; /* NT-MODE in setup state we must send PROCEEDING first */ - if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) - { + if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) { /* sending proceeding */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT); @@ -2372,20 +2439,18 @@ void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parame /* only display at connect state */ if (p_state == PORT_STATE_CONNECT) - if (p_connectinfo.display[0]) - { + if (p_connectinfo.display[0]) { /* sending information */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT); - if (p_m_d_ntmode) + if (p_m_d_ntmode || p_m_d_tespecial) enc_ie_display(l3m, (unsigned char *)p_connectinfo.display); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m); return; } - 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) - { + 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) { /* connect command only possible in setup, proceeding or alerting state */ return; } @@ -2395,8 +2460,10 @@ void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parame l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_REQ, DIRECTION_OUT); /* connect information */ plan = 1; - switch (p_connectinfo.ntype) - { + switch (p_connectinfo.ntype) { + case INFO_NTYPE_UNKNOWN: + type = 0x0; + break; case INFO_NTYPE_INTERNATIONAL: type = 0x1; break; @@ -2406,48 +2473,45 @@ void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parame case INFO_NTYPE_SUBSCRIBER: type = 0x4; break; - default: /* INFO_NTYPE_UNKNOWN */ - type = 0x0; + default: /* INFO_NTYPE_NOTPRESENT */ + type = -1; break; } - switch (param->connectinfo.screen) - { + switch (param->connectinfo.screen) { case INFO_SCREEN_USER: screen = 0; break; + case INFO_SCREEN_USER_VERIFIED_PASSED: + screen = 1; + break; + case INFO_SCREEN_USER_VERIFIED_FAILED: + screen = 2; + break; default: /* INFO_SCREE_NETWORK */ screen = 3; break; } - switch (p_connectinfo.present) - { - case INFO_PRESENT_NULL: /* no colp at all */ - present = -1; - screen = -1; - plan = -1; - type = -1; + switch (p_connectinfo.present) { + case INFO_PRESENT_ALLOWED: + present = 0; break; case INFO_PRESENT_RESTRICTED: present = 1; break; - case INFO_PRESENT_NOTAVAIL: + default: /* INFO_PRESENT_NOTAVAIL */ present = 2; break; - default: /* INFO_PRESENT_ALLOWED */ - present = 0; - break; } if (type >= 0) enc_ie_connected_pn(l3m, type, plan, present, screen, (unsigned char *)p_connectinfo.id); /* display */ - if (p_connectinfo.display[0] && p_m_d_ntmode) + if (p_connectinfo.display[0] && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)p_connectinfo.display); /* nt-mode: CONP (connected name identification presentation) */ -// if (p_connectinfo.name[0] && p_m_d_ntmode) +// if (p_connectinfo.name[0] && (p_m_d_ntmode || p_m_d_tespecial)) // enc_facility_centrex(&connect->FACILITY, dmsg, (unsigned char *)p_connectinfo.name, 0); /* date & time */ - if (p_m_d_ntmode) - { + if (p_m_d_ntmode || p_m_d_tespecial) { epoint = find_epoint_id(epoint_id); enc_ie_date(l3m, now, p_settings.no_seconds); } @@ -2471,11 +2535,9 @@ void Pdss1::message_disconnect(unsigned int epoint_id, int message_id, union par /* we reject during incoming setup when we have no tones. also if we are in outgoing setup state */ // if ((p_state==PORT_STATE_IN_SETUP && !p_m_mISDNport->tones) -if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) - { +if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) { /* sending release to endpoint */ - while(p_epointlist) - { + while(p_epointlist) { message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); memcpy(&message->param, param, sizeof(union parameter)); message_put(message); @@ -2495,8 +2557,7 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) } /* workarround: NT-MODE in setup state we must send PROCEEDING first to make it work */ - if (p_state==PORT_STATE_IN_SETUP) - { + if (p_state==PORT_STATE_IN_SETUP) { /* sending proceeding */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT); @@ -2507,7 +2568,7 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m); new_state(PORT_STATE_IN_PROCEEDING); @@ -2521,13 +2582,13 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); /* send cause */ enc_ie_cause(l3m, (!p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_REMOTE:param->disconnectinfo.location, param->disconnectinfo.cause); /* send display */ if (param->disconnectinfo.display[0]) p = param->disconnectinfo.display; - if (p) if (*p && p_m_d_ntmode) + if (p) if (*p && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)p); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_DISCONNECT, p_m_d_l3id, l3m); @@ -2546,8 +2607,7 @@ void Pdss1::message_release(unsigned int epoint_id, int message_id, union parame * this means that the endpoint doesnt require audio anymore */ if (p_state == PORT_STATE_IN_DISCONNECT - || p_state == PORT_STATE_OUT_DISCONNECT) - { + || p_state == PORT_STATE_OUT_DISCONNECT) { /* sending release */ l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT); @@ -2567,8 +2627,7 @@ void Pdss1::message_release(unsigned int epoint_id, int message_id, union parame * 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) - { + || p_state==PORT_STATE_OUT_SETUP) { //#warning remove me //PDEBUG(DEBUG_LOG, "JOLLY sending release complete %d\n", p_serial); /* sending release complete */ @@ -2588,8 +2647,7 @@ void Pdss1::message_release(unsigned int epoint_id, int message_id, union parame #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) - { + if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) { CALL_PROCEEDING_t *proceeding; /* sending proceeding */ @@ -2602,7 +2660,7 @@ wirklich erst proceeding?: || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m); } @@ -2616,14 +2674,14 @@ wirklich erst proceeding?: || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); /* send cause */ enc_ie_cause(l3m, (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]) p = param->disconnectinfo.display; - if (p) if (*p && p_m_d_ntmode) + if (p) if (*p && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)p); end_trace(); p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_DISCONNECT, p_m_d_l3id, l3m); @@ -2641,20 +2699,16 @@ wirklich erst proceeding?: */ int Pdss1::message_epoint(unsigned int epoint_id, int message_id, union parameter *param) { - struct lcr_msg *message; - if (PmISDN::message_epoint(epoint_id, message_id, param)) return(1); - switch(message_id) - { + switch(message_id) { case MESSAGE_INFORMATION: /* overlap dialing */ 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) - { + && p_state!=PORT_STATE_IN_DISCONNECT) { break; } if (p_type==PORT_TYPE_DSS1_TE_OUT @@ -2663,8 +2717,7 @@ int Pdss1::message_epoint(unsigned int epoint_id, int message_id, union paramete && p_state!=PORT_STATE_OUT_ALERTING && p_state!=PORT_STATE_CONNECT && p_state!=PORT_STATE_OUT_DISCONNECT - && p_state!=PORT_STATE_IN_DISCONNECT) - { + && p_state!=PORT_STATE_IN_DISCONNECT) { break; } if ((p_type==PORT_TYPE_DSS1_NT_IN || p_type==PORT_TYPE_DSS1_TE_IN) @@ -2674,8 +2727,7 @@ int Pdss1::message_epoint(unsigned int epoint_id, int message_id, union paramete && p_state!=PORT_STATE_CONNECT && p_state!=PORT_STATE_CONNECT_WAITING && p_state!=PORT_STATE_OUT_DISCONNECT - && p_state!=PORT_STATE_IN_DISCONNECT) - { + && p_state!=PORT_STATE_IN_DISCONNECT) { break; } message_information(epoint_id, message_id, param); @@ -2683,8 +2735,7 @@ int Pdss1::message_epoint(unsigned int epoint_id, int message_id, union paramete case MESSAGE_SETUP: /* dial-out command received from epoint */ if (p_state!=PORT_STATE_IDLE - && p_state!=PORT_STATE_CONNECT) - { + && p_state!=PORT_STATE_CONNECT) { PERROR("Pdss1(%s) ignoring setup because isdn port is not in idle state (or connected for sending display info).\n", p_name); break; } @@ -2702,8 +2753,7 @@ int Pdss1::message_epoint(unsigned int epoint_id, int message_id, union paramete break; case MESSAGE_OVERLAP: /* more information is needed */ - if (p_state!=PORT_STATE_IN_SETUP) - { + if (p_state!=PORT_STATE_IN_SETUP) { break; } message_overlap(epoint_id, message_id, param); @@ -2711,21 +2761,31 @@ int Pdss1::message_epoint(unsigned int epoint_id, int message_id, union paramete case MESSAGE_PROCEEDING: /* call of endpoint is proceeding */ if (p_state!=PORT_STATE_IN_SETUP - && p_state!=PORT_STATE_IN_OVERLAP) - { + && p_state!=PORT_STATE_IN_OVERLAP) { break; } message_proceeding(epoint_id, message_id, param); + if (p_m_d_notify_pending) { + /* 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; + } break; case MESSAGE_ALERTING: /* call of endpoint is ringing */ if (p_state!=PORT_STATE_IN_SETUP && p_state!=PORT_STATE_IN_OVERLAP - && p_state!=PORT_STATE_IN_PROCEEDING) - { + && p_state!=PORT_STATE_IN_PROCEEDING) { break; } message_alerting(epoint_id, message_id, param); + if (p_m_d_notify_pending) { + /* 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; + } break; case MESSAGE_CONNECT: /* call of endpoint is connected */ @@ -2733,11 +2793,16 @@ int Pdss1::message_epoint(unsigned int epoint_id, int message_id, union paramete && 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)) - { + && !(p_state==PORT_STATE_CONNECT && p_m_d_ntmode)) { break; } message_connect(epoint_id, message_id, param); + if (p_m_d_notify_pending) { + /* 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; + } break; case MESSAGE_DISCONNECT: /* call has been disconnected */ @@ -2750,23 +2815,21 @@ int Pdss1::message_epoint(unsigned int epoint_id, int message_id, union paramete && p_state!=PORT_STATE_OUT_PROCEEDING && p_state!=PORT_STATE_OUT_ALERTING && p_state!=PORT_STATE_CONNECT - && p_state!=PORT_STATE_CONNECT_WAITING) - { + && p_state!=PORT_STATE_CONNECT_WAITING) { break; } message_disconnect(epoint_id, message_id, param); break; case MESSAGE_RELEASE: /* release isdn port */ - if (p_state==PORT_STATE_RELEASE) - { + if (p_state==PORT_STATE_RELEASE) { break; } message_release(epoint_id, message_id, param); break; default: - PERROR("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_id); } return(1); @@ -2785,30 +2848,24 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi PDEBUG(DEBUG_ISDN, "cmd(0x%x) pid(0x%x)\n", cmd, pid); - if (pid == 0) - { + if (pid == 0) { PDEBUG(DEBUG_ISDN, "ignoring dummy process from phone.\n"); return(0); } /* find Port object of type ISDN */ port = port_first; - while(port) - { + while(port) { /* are we ISDN ? */ - if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1) - { + if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1) { pdss1 = (class Pdss1 *)port; /* check out correct stack and id */ - if (pdss1->p_m_mISDNport == mISDNport) - { - if (pdss1->p_m_d_l3id & MISDN_PID_CR_FLAG) - { + if (pdss1->p_m_mISDNport == mISDNport) { + if (pdss1->p_m_d_l3id & MISDN_PID_CR_FLAG) { /* local callref, so match value only */ if ((pdss1->p_m_d_l3id & MISDN_PID_CRVAL_MASK) == (pid & MISDN_PID_CRVAL_MASK)) break; // found - } else - { + } else { /* remote callref, ref + channel id */ if (pdss1->p_m_d_l3id == pid) break; // found @@ -2819,10 +2876,8 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi } /* aktueller prozess */ - if (port) - { - if (cmd == MT_ASSIGN) - { + if (port) { + if (cmd == MT_ASSIGN) { /* stack gives us new layer 3 id (during connect) */ l1l2l3_trace_header(mISDNport, pdss1, L3_NEW_L3ID_IND, DIRECTION_IN); add_trace("callref", "old", "0x%x", pdss1->p_m_d_l3id); @@ -2839,11 +2894,9 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi /* if process id is master process, but a child disconnects */ if (mISDNport->ntmode && (pid & MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER - && (pdss1->p_m_d_l3id & MISDN_PID_CRTYPE_MASK) == MISDN_PID_MASTER) - { + && (pdss1->p_m_d_l3id & MISDN_PID_CRTYPE_MASK) == MISDN_PID_MASTER) { if (cmd == MT_DISCONNECT - || cmd == MT_RELEASE) - { + || cmd == MT_RELEASE) { /* send special indication for child disconnect */ pdss1->disconnect_ind_i(cmd, pid, l3m); return(0); @@ -2864,21 +2917,20 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi } /* d-message */ - switch(cmd) - { + switch(cmd) { case MT_SETUP: - /* creating port object */ + /* creating port object, transparent until setup with hdlc */ 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))) + if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, 0, 0, B_MODE_TRANSPARENT))) FATAL("Cannot create Port instance.\n"); pdss1->message_isdn(cmd, pid, l3m); break; case MT_RESUME: - /* creating port object */ + /* creating port object, transparent until setup with hdlc */ 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))) + if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, 0, 0, B_MODE_TRANSPARENT))) FATAL("Cannot create Port instance.\n"); pdss1->message_isdn(cmd, pid, l3m); break; @@ -2898,10 +2950,8 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi default: PERROR("unhandled message: cmd(0x%x) pid(0x%x)\n", cmd, pid); port = port_first; - while(port) - { - if (port->p_type == PORT_TYPE_DSS1_NT_IN || port->p_type == PORT_TYPE_DSS1_NT_OUT) - { + while(port) { + if (port->p_type == PORT_TYPE_DSS1_NT_IN || port->p_type == PORT_TYPE_DSS1_NT_OUT) { pdss1 = (class Pdss1 *)port; /* check out correct stack */ if (pdss1->p_m_mISDNport == mISDNport) @@ -2916,56 +2966,6 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi } -#if 0 -/* - * sending message that were queued during L1 activation - * or releasing port if link is down - */ -void setup_queue(struct mISDNport *mISDNport, int link) -{ - class Port *port; - class Pdss1 *pdss1; - struct lcr_msg *message; - - if (!mISDNport->ntmode) - return; - - /* check all port objects for pending message */ - port = port_first; - while(port) - { - if ((port->p_type&PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1) - { - pdss1 = (class Pdss1 *)port; - if (pdss1->p_m_mISDNport == mISDNport) - { - if (pdss1->p_m_d_queue) - { - if (link) - { - PDEBUG(DEBUG_ISDN, "the L1 became active, so we send queued message for portnum=%d (%s).\n", mISDNport->portnum, pdss1->p_name); - /* LAYER 1 is up, so we send */ - pdss1->message_setup(pdss1->p_m_d_queue->id_from, pdss1->p_m_d_queue->type, &pdss1->p_m_d_queue->param); - message_free(pdss1->p_m_d_queue); - pdss1->p_m_d_queue = NULL; - } else - { - PDEBUG(DEBUG_ISDN, "the L1 became NOT active, so we release port for portnum=%d (%s).\n", mISDNport->portnum, pdss1->p_name); - message = message_create(pdss1->p_serial, pdss1->p_m_d_queue->id_from, PORT_TO_EPOINT, MESSAGE_RELEASE); - message->param.disconnectinfo.cause = 27; - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - message_put(message); - pdss1->new_state(PORT_STATE_RELEASE); - pdss1->p_m_delete = 1; - } - } - } - } - port = port->next; - } -} - -#endif