X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=dss1.cpp;h=75ff448a5ae824ec68576a2d7b59ae91a9bbd5ab;hp=2df264504d2c620bf81d97f23008568ea8a35660;hb=473d6569efcad130f9a5044b182b75a1c07a1eee;hpb=012abb3e07c04507685491070cedd93e4b093374 diff --git a/dss1.cpp b/dss1.cpp index 2df2645..75ff448 100644 --- a/dss1.cpp +++ b/dss1.cpp @@ -1,6 +1,6 @@ /*****************************************************************************\ ** ** -** PBX4Linux ** +** LCR ** ** ** **---------------------------------------------------------------------------** ** Copyright: Andreas Eversberg ** @@ -11,37 +11,31 @@ #include "main.h" #include "myisdn.h" -#ifndef SOCKET_MISDN -// old mISDN -extern "C" { -#include -} -#else // socket mISDN -#include +//#include extern "C" { } #include -extern unsigned long mt_assign_pid; -#endif +extern unsigned int mt_assign_pid; #include "ie.cpp" /* * 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); } @@ -51,86 +45,25 @@ 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); - -#ifndef SOCKET_MISDN - /* check how many processes are left */ - if (p_m_d_ntmode == 1) - { - if (p_m_mISDNport->nst.layer3->proc) - PDEBUG(DEBUG_ISDN, "destroyed mISDNPort(%s). WARNING: There is still a layer 3 process left. Ignore this, if currently are other calls. This message is not an error!\n", p_name); - } -#endif } /* * create layer 3 message */ -#ifdef SOCKET_MISDN static struct l3_msg *create_l3msg(void) -#else -static msg_t *create_l3msg(int prim, int mt, int dinfo, int size, int ntmode) -#endif { -#ifdef SOCKET_MISDN struct l3_msg *l3m; l3m = alloc_l3_msg(); if (l3m) return(l3m); -#else - msg_t *dmsg; - Q931_info_t *qi; - iframe_t *frm; - - if (!ntmode) - size = sizeof(Q931_info_t)+2; - - if (ntmode) - { - dmsg = prep_l3data_msg(prim, dinfo, size, 256, NULL); - if (dmsg) - { - return(dmsg); - } - } else - { - dmsg = alloc_msg(size+256+mISDN_HEADER_LEN+DEFAULT_HEADROOM); - if (dmsg) - { - memset(msg_put(dmsg,size+mISDN_HEADER_LEN), 0, size+mISDN_HEADER_LEN); - frm = (iframe_t *)dmsg->data; - frm->prim = prim; - frm->dinfo = dinfo; - qi = (Q931_info_t *)(dmsg->data + mISDN_HEADER_LEN); - qi->type = mt; - return(dmsg); - } - } -#endif - - FATAL("Cannot allocate memory, system overloaded.\n"); - exit(0); // make gcc happy -} - -#ifndef SOCKET_MISDN -msg_t *create_l2msg(int prim, int dinfo, int size) /* NT only */ -{ - msg_t *dmsg; - - dmsg = prep_l3data_msg(prim, dinfo, size, 256, NULL); - if (dmsg) - return(dmsg); FATAL("Cannot allocate memory, system overloaded.\n"); exit(0); // make gcc happy } -#endif /* * if we received a first reply to the setup message, @@ -138,28 +71,17 @@ msg_t *create_l2msg(int prim, int dinfo, int size) /* NT only */ * return: <0: error, call is released, -cause is given * 0: ok, nothing to do */ -#ifdef SOCKET_MISDN -int Pdss1::received_first_reply_to_setup(unsigned long cmd, int channel, int exclusive) -#else -int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int exclusive) -#endif +int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int exclusive) { int ret; -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - RELEASE_COMPLETE_t *release_complete; - msg_t *dmsg; -#endif /* correct exclusive to 0, if no explicit channel was given */ if (exclusive<0 || channel<=0) 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 */ @@ -171,8 +93,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex 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; @@ -186,8 +107,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex /* 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 */ @@ -199,8 +119,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex 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(); @@ -210,8 +129,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex } /* if channel value is faulty */ - if (channel <= 0) - { + if (channel <= 0) { add_trace("conclusion", NULL, "illegal reply"); end_trace(); ret = -111; // protocol error @@ -221,8 +139,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex /* 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; @@ -234,8 +151,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex /* 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 */ @@ -246,8 +162,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex 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 @@ -257,8 +172,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex /* 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; @@ -269,28 +183,20 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex /* 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 */ -#ifdef SOCKET_MISDN - if (cmd==MT_CONNECT && p_state!=PORT_STATE_OUT_SETUP) -#else - if (prim==(CC_CONNECT | INDICATION) && p_state!=PORT_STATE_OUT_SETUP) -#endif - { + 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; @@ -313,8 +219,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex 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); @@ -324,8 +229,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex 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; @@ -345,24 +249,11 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex * NOTE: we send MT_RELEASE_COMPLETE to "REJECT" the channel * in response to the setup reply */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); -#else - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_RELEASE); p_m_delete = 1; return(-34); /* to epoint: no channel available */ @@ -385,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 @@ -394,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; @@ -416,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"); @@ -433,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; } @@ -445,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; } @@ -473,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; } @@ -484,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 @@ -502,35 +392,26 @@ use_channel: * handles all indications */ /* CC_SETUP INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - SETUP_t *setup = (SETUP_t *)((unsigned long)data + headerlen); -#endif int calling_type, calling_plan, calling_present, calling_screen; + int 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; struct lcr_msg *message; -#ifdef SOCKET_MISDN /* 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(); @@ -547,86 +428,37 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_m_d_l3id = pid; p_m_d_ces = pid >> 16; end_trace(); -#else - /* callref from nt-lib */ - if (p_m_d_ntmode) - { - /* nt-library now gives us the id via CC_SETUP */ - if (dinfo&(~0xff) == 0xff00) - FATAL("l3-stack gives us a process id 0xff00-0xffff\n"); - l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_IND, DIRECTION_IN); - if (p_m_d_l3id) - add_trace("callref", "old", "0x%x", p_m_d_l3id); - add_trace("callref", "new", "0x%x", dinfo); - end_trace(); - 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; - } -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN - 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)); dec_ie_channel_id(l3m, &exclusive, &channel); dec_ie_hlc(l3m, &hlc_coding, &hlc_interpretation, &hlc_presentation, &hlc_hlc, &hlc_exthlc); dec_ie_bearer(l3m, &bearer_coding, &bearer_capability, &bearer_mode, &bearer_rate, &bearer_multi, &bearer_user); -#else - 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.id, sizeof(p_dialinginfo.id)); - dec_ie_keypad(setup->KEYPAD, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)keypad, sizeof(keypad)); - /* te-mode: CNIP (calling name identification presentation) */ - if (!p_m_d_ntmode) - dec_facility_centrex(setup->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)p_callerinfo.name, sizeof(p_callerinfo.name)); - dec_ie_useruser(setup->USER_USER, (Q931_info_t *)((unsigned long)data+headerlen), &useruser_protocol, useruser, &useruser_len); - 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, &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); -#endif + dec_ie_display(l3m, (unsigned char *)p_dialinginfo.display, sizeof(p_dialinginfo.display)); end_trace(); /* if blocked, release call with MT_RELEASE_COMPLETE */ - if (p_m_mISDNport->ifport->block) - { -#ifdef SOCKET_MISDN + if (p_m_mISDNport->ifport->block) { l3m = create_l3msg(); -#else - RELEASE_COMPLETE_t *release_complete; - dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */ -#else - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */ -#endif add_trace("reason", NULL, "port blocked"); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_RELEASE); p_m_delete = 1; return; } /* caller info */ - switch (calling_present) - { + switch (calling_present) { case 1: p_callerinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -637,21 +469,26 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -669,10 +506,56 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -688,8 +571,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) } /* redir info */ - switch (redir_present) - { + switch (redir_present) { case 1: p_redirinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -700,17 +582,21 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -730,12 +616,12 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -753,8 +639,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -763,8 +648,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_capainfo.bearer_capa = bearer_capability; break; } - switch (bearer_mode) - { + switch (bearer_mode) { case 2: p_capainfo.bearer_mode = INFO_BMODE_PACKET; break; @@ -772,8 +656,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_capainfo.bearer_mode = INFO_BMODE_CIRCUIT; break; } - switch (bearer_user) - { + switch (bearer_user) { case -1: p_capainfo.bearer_info1 = INFO_INFO1_NONE; break; @@ -783,8 +666,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) } /* hlc */ - switch (hlc_hlc) - { + switch (hlc_hlc) { case -1: p_capainfo.hlc = INFO_HLC_NONE; break; @@ -792,8 +674,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) p_capainfo.hlc = hlc_hlc + 0x80; break; } - switch (hlc_exthlc) - { + switch (hlc_exthlc) { case -1: p_capainfo.exthlc = INFO_HLC_NONE; break; @@ -802,6 +683,15 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) 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) @@ -809,32 +699,17 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) /* 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 * in response to the setup */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - RELEASE_COMPLETE_t *release_complete; - dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); -#else - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_RELEASE); p_m_delete = 1; return; @@ -854,7 +729,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) 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; - message->param.setup.dtmf = !p_m_mISDNport->ifport->nodtmf; +// message->param.setup.dtmf = !p_m_mISDNport->ifport->nodtmf; memcpy(&message->param.setup.dialinginfo, &p_dialinginfo, sizeof(struct dialing_info)); memcpy(&message->param.setup.callerinfo, &p_callerinfo, sizeof(struct caller_info)); memcpy(&message->param.setup.redirinfo, &p_redirinfo, sizeof(struct redir_info)); @@ -868,34 +743,21 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) } /* CC_INFORMATION INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - INFORMATION_t *information = (INFORMATION_t *)((unsigned long)data + headerlen); -#endif int type, plan; - unsigned char keypad[32] = ""; + unsigned char keypad[33] = "", display[128] = ""; struct lcr_msg *message; l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_called_pn(l3m, &type, &plan, (unsigned char *)p_dialinginfo.id, sizeof(p_dialinginfo.id)); dec_ie_keypad(l3m, (unsigned char *)keypad, sizeof(keypad)); + dec_ie_display(l3m, (unsigned char *)display, sizeof(display)); dec_ie_complete(l3m, &p_dialinginfo.sending_complete); -#else - 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); -#endif end_trace(); SCAT(p_dialinginfo.id, (char *)keypad); - switch (type) - { + switch (type) { case 0x1: p_dialinginfo.ntype = INFO_NTYPE_INTERNATIONAL; break; @@ -909,6 +771,7 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data) p_dialinginfo.ntype = INFO_NTYPE_UNKNOWN; break; } + 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); @@ -917,38 +780,24 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data) } /* CC_SETUP_ACCNOWLEDGE INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - SETUP_ACKNOWLEDGE_t *setup_acknowledge = (SETUP_ACKNOWLEDGE_t *)((unsigned long)data + headerlen); -#endif int exclusive, channel; 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); -#ifdef SOCKET_MISDN dec_ie_channel_id(l3m, &exclusive, &channel); dec_ie_progress(l3m, &coding, &location, &progress); -#else - 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); -#endif end_trace(); /* process channel */ -#ifdef SOCKET_MISDN ret = received_first_reply_to_setup(cmd, channel, exclusive); -#else - ret = received_first_reply_to_setup(prim, channel, exclusive); -#endif - 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; @@ -962,18 +811,25 @@ void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void 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 */ -#ifdef SOCKET_MISDN void Pdss1::proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - CALL_PROCEEDING_t *proceeding = (CALL_PROCEEDING_t *)((unsigned long)data + headerlen); -#endif int exclusive, channel; int coding, location, progress; int ret; @@ -982,26 +838,14 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) char redir[32]; l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_channel_id(l3m, &exclusive, &channel); dec_ie_progress(l3m, &coding, &location, &progress); dec_ie_notify(l3m, ¬ify); dec_ie_redir_dn(l3m, &type, &plan, &present, (unsigned char *)redir, sizeof(redir)); -#else - 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); - dec_ie_redir_dn(proceeding->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)redir, sizeof(redir)); -#endif end_trace(); -#ifdef SOCKET_MISDN ret = received_first_reply_to_setup(cmd, channel, exclusive); -#else - ret = received_first_reply_to_setup(prim, channel, exclusive); -#endif - 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; @@ -1019,16 +863,14 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -1039,11 +881,9 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -1064,15 +904,8 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) } /* CC_ALERTING INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - ALERTING_t *alerting = (ALERTING_t *)((unsigned long)data + headerlen); -#endif int exclusive, channel; int coding, location, progress; int ret; @@ -1081,27 +914,15 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) char redir[32]; l1l2l3_trace_header(p_m_mISDNport, this, L3_ALERTING_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_channel_id(l3m, &exclusive, &channel); dec_ie_progress(l3m, &coding, &location, &progress); dec_ie_notify(l3m, ¬ify); dec_ie_redir_dn(l3m, &type, &plan, &present, (unsigned char *)redir, sizeof(redir)); -#else - 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); - dec_ie_redir_dn(alerting->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)redir, sizeof(redir)); -#endif end_trace(); /* process channel */ -#ifdef SOCKET_MISDN ret = received_first_reply_to_setup(cmd, channel, exclusive); -#else - ret = received_first_reply_to_setup(prim, channel, exclusive); -#endif - 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; @@ -1119,15 +940,13 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -1138,11 +957,9 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -1163,53 +980,26 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) } /* CC_CONNECT INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - CONNECT_t *connect = (CONNECT_t *)((unsigned long)data + headerlen); - CONNECT_ACKNOWLEDGE_t *connect_acknowledge; -#endif int exclusive, channel; int type, plan, present, screen; int ret; struct lcr_msg *message; int bchannel_before; -#ifndef SOCKET_MISDN - if (p_m_d_ntmode) - p_m_d_ces = connect->ces; -#endif - l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_channel_id(l3m, &exclusive, &channel); 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)); -#else - 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)); - /* te-mode: CONP (connected name identification presentation) */ - if (!p_m_d_ntmode) - dec_facility_centrex(connect->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)p_connectinfo.name, sizeof(p_connectinfo.name)); -#endif + dec_facility_centrex(l3m, (unsigned char *)p_connectinfo.name, sizeof(p_connectinfo.name)); end_trace(); /* select channel */ bchannel_before = p_m_b_channel; -#ifdef SOCKET_MISDN ret = received_first_reply_to_setup(cmd, channel, exclusive); -#else - ret = received_first_reply_to_setup(prim, channel, exclusive); -#endif - 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; @@ -1220,8 +1010,7 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) } /* connect information */ - switch (present) - { + switch (present) { case 1: p_connectinfo.present = INFO_PRESENT_RESTRICTED; break; @@ -1232,20 +1021,23 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -1264,29 +1056,15 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) 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 */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_CONNECT | RESPONSE, MT_CONNECT, dinfo, sizeof(CONNECT_ACKNOWLEDGE_t), p_m_d_ntmode); - connect_acknowledge = (CONNECT_ACKNOWLEDGE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_RES, DIRECTION_OUT); /* if we had no bchannel before, we send it now */ if (!bchannel_before && p_m_b_channel) -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&connect_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CONNECT_ACKNOWLEDGE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif } message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CONNECT); @@ -1297,70 +1075,43 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) } /* CC_DISCONNECT INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - DISCONNECT_t *disconnect = (DISCONNECT_t *)((unsigned long)data + headerlen); -#endif int location, cause; int coding, proglocation, progress; struct lcr_msg *message; + unsigned char display[128] = ""; l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_progress(l3m, &coding, &proglocation, &progress); dec_ie_cause(l3m, &location, &cause); -#else - 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); -#endif + dec_ie_display(l3m, (unsigned char *)display, sizeof(display)); end_trace(); - if (location == LOCATION_PRIVATE_LOCAL) - location = LOCATION_PRIVATE_REMOTE; - if (cause < 0) + if (cause < 0) { cause = 16; + location = LOCATION_PRIVATE_LOCAL; + } /* release if remote sends us no tones */ - if (!p_m_mISDNport->earlyb) - { -#ifdef SOCKET_MISDN + if (!p_m_mISDNport->earlyb) { l3_msg *l3m; -#else - msg_t *dmsg; - RELEASE_t *release; -#endif -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, dinfo, sizeof(RELEASE_t), p_m_d_ntmode); - release = (RELEASE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN - enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */ -#else - enc_ie_cause(&release->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */ -#endif + enc_ie_cause(l3m, location, cause); /* normal */ add_trace("reason", NULL, "no remote patterns"); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif /* sending release to endpoint */ - while(p_epointlist) - { + if (location == LOCATION_PRIVATE_LOCAL) + location = LOCATION_PRIVATE_REMOTE; + 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; + SCAT(message->param.disconnectinfo.display, (char *)display); message_put(message); /* remove epoint */ free_epointlist(p_epointlist); @@ -1371,18 +1122,20 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data) } /* sending disconnect to active endpoint and release to inactive endpoints */ - if (ACTIVE_EPOINT(p_epointlist)) - { + if (location == LOCATION_PRIVATE_LOCAL) + location = LOCATION_PRIVATE_REMOTE; + 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; + SCAT(message->param.disconnectinfo.display, (char *)display); message_put(message); /* remove epoint */ free_epointid(INACTIVE_EPOINT(p_epointlist)); @@ -1391,29 +1144,17 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data) } /* CC_DISCONNECT INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::disconnect_ind_i(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - DISCONNECT_t *disconnect = (DISCONNECT_t *)((unsigned long)data + headerlen); -#endif int location, cause; /* 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); } -#ifdef SOCKET_MISDN dec_ie_cause(l3m, &location, &cause); -#else - dec_ie_cause(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); -#endif if (location == LOCATION_PRIVATE_LOCAL) location = LOCATION_PRIVATE_REMOTE; @@ -1426,114 +1167,77 @@ void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data } /* CC_RELEASE INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::release_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - RELEASE_t *release = (RELEASE_t *)((unsigned long)data + headerlen); -#endif int location, cause; struct lcr_msg *message; + unsigned char display[128] = ""; l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_cause(l3m, &location, &cause); -#else - dec_ie_cause(release->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); -#endif + dec_ie_display(l3m, (unsigned char *)display, sizeof(display)); 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) - { + if (location == LOCATION_PRIVATE_LOCAL) + location = LOCATION_PRIVATE_REMOTE; + 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; + SCAT(message->param.disconnectinfo.display, (char *)display); message_put(message); /* remove epoint */ free_epointlist(p_epointlist); } - /* only in NT mode we must send release_complete, if we got a release confirm */ -#ifdef SOCKET_MISDN - if (cmd == MT_RELEASE) -#else - if (prim == (CC_RELEASE | CONFIRM)) -#endif - { - /* sending release complete */ -#ifdef SOCKET_MISDN - l3m = create_l3msg(); -#else - RELEASE_COMPLETE_t *release_complete; - dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); -#endif - l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN - enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); -#else - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); -#endif - end_trace(); -#ifdef SOCKET_MISDN - p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif - } - new_state(PORT_STATE_RELEASE); p_m_delete = 1; } +/* CC_RESTART INDICATION */ +void Pdss1::restart_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) +{ + l1l2l3_trace_header(p_m_mISDNport, this, L3_RESTART_IND, DIRECTION_IN); + end_trace(); + + // L3 process is not toucht. (not even by network stack) +} + /* CC_RELEASE_COMPLETE INDICATION (a reject) */ -#ifdef SOCKET_MISDN void Pdss1::release_complete_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - RELEASE_COMPLETE_t *release_complete = (RELEASE_COMPLETE_t *)((unsigned long)data + headerlen); -#endif int location, cause; struct lcr_msg *message; 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 - { -#ifdef SOCKET_MISDN + } else { dec_ie_cause(l3m, &location, &cause); -#else - dec_ie_cause(release_complete->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); -#endif - 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; @@ -1547,62 +1251,23 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void * } /* T312 timeout */ -#ifdef SOCKET_MISDN void Pdss1::t312_timeout_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { // not required, release is performed with MT_FREE } -#else -void Pdss1::t312_timeout_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - struct lcr_msg *message; - // trace is done at message_isdn() - - /* sending release to endpoint */ - while(p_epointlist) - { - message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); - 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 - { - message->param.disconnectinfo.cause = CAUSE_NOUSER; - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - } - message_put(message); - /* remove epoint */ - free_epointlist(p_epointlist); - } - - new_state(PORT_STATE_RELEASE); - p_m_delete = 1; -} -#endif /* CC_NOTIFY INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::notify_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - NOTIFY_t *notifying = (NOTIFY_t *)((unsigned long)data + headerlen); -#endif struct lcr_msg *message; int notify, type, plan, present; unsigned char notifyid[sizeof(message->param.notifyinfo.id)]; + unsigned char display[128] = ""; l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_notify(l3m, ¬ify); dec_ie_redir_dn(l3m, &type, &plan, &present, notifyid, sizeof(notifyid)); -#else - 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, notifyid, sizeof(notifyid)); -#endif + dec_ie_display(l3m, (unsigned char *)display, sizeof(display)); end_trace(); if (!ACTIVE_EPOINT(p_epointlist)) @@ -1615,8 +1280,7 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -1627,11 +1291,9 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -1646,6 +1308,7 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data) message->param.notifyinfo.ntype = INFO_NTYPE_UNKNOWN; break; } + SCAT(message->param.notifyinfo.display, (char *)display); message->param.notifyinfo.isdn_port = p_m_portnum; message_put(message); } @@ -1653,44 +1316,20 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data) /* CC_HOLD INDICATION */ struct lcr_msg *message; -#ifdef SOCKET_MISDN void Pdss1::hold_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; -// HOLD_t *hold = (HOLD_t *)((unsigned long)data + headerlen); - HOLD_REJECT_t *hold_reject; - HOLD_ACKNOWLEDGE_t *hold_acknowledge; -#endif // class Endpoint *epoint; l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_IND, DIRECTION_IN); end_trace(); - if (!ACTIVE_EPOINT(p_epointlist) || p_m_hold) - { -#ifdef SOCKET_MISDN + if (!ACTIVE_EPOINT(p_epointlist) || p_m_hold) { l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_HOLD_REJECT | REQUEST, MT_HOLD_REJECT, dinfo, sizeof(HOLD_REJECT_t), p_m_d_ntmode); - hold_reject = (HOLD_REJECT_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_REJECT_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, p_m_hold?101:31); /* normal unspecified / incompatible state */ -#else - enc_ie_cause(&hold_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, p_m_hold?101:31); /* normal unspecified / incompatible state */ -#endif add_trace("reason", NULL, "no endpoint"); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_HOLD_REJECT, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif return; } @@ -1711,78 +1350,40 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data) 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); } #endif /* acknowledge hold */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_HOLD_ACKNOWLEDGE | REQUEST, MT_HOLD_ACKNOWLEDGE, dinfo, sizeof(HOLD_ACKNOWLEDGE_t), p_m_d_ntmode); - hold_acknowledge = (HOLD_ACKNOWLEDGE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_ACKNOWLEDGE_REQ, DIRECTION_OUT); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_HOLD_ACKNOWLEDGE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif } /* CC_RETRIEVE INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::retrieve_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - RETRIEVE_t *retrieve = (RETRIEVE_t *)((unsigned long)data + headerlen); - RETRIEVE_REJECT_t *retrieve_reject; - RETRIEVE_ACKNOWLEDGE_t *retrieve_acknowledge; -#endif struct lcr_msg *message; int channel, exclusive, cause; int ret; l1l2l3_trace_header(p_m_mISDNport, this, L3_RETRIEVE_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_channel_id(l3m, &exclusive, &channel); -#else - dec_ie_channel_id(retrieve->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel); -#endif end_trace(); - if (!p_m_hold) - { + if (!p_m_hold) { cause = 101; /* incompatible state */ reject: -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_RETRIEVE_REJECT | REQUEST, MT_RETRIEVE_REJECT, dinfo, sizeof(RETRIEVE_REJECT_t), p_m_d_ntmode); - retrieve_reject = (RETRIEVE_REJECT_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RETRIEVE_REJECT_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause); -#else - enc_ie_cause(&retrieve_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RETRIEVE_REJECT, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif return; } @@ -1800,8 +1401,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) /* open channel */ ret = seize_bchannel(channel, 1); - if (ret < 0) - { + if (ret < 0) { no_channel: cause = -ret; goto reject; @@ -1813,39 +1413,16 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) p_m_timeout = 0; /* acknowledge retrieve */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_RETRIEVE_ACKNOWLEDGE | REQUEST, MT_RETRIEVE_ACKNOWLEDGE, dinfo, sizeof(RETRIEVE_ACKNOWLEDGE_t), p_m_d_ntmode); - retrieve_acknowledge = (RETRIEVE_ACKNOWLEDGE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RETRIEVE_ACKNOWLEDGE_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&retrieve_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RETRIEVE_ACKNOWLEDGE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif } /* CC_SUSPEND INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - SUSPEND_t *suspend = (SUSPEND_t *)((unsigned long)data + headerlen); - SUSPEND_ACKNOWLEDGE_t *suspend_acknowledge; - SUSPEND_REJECT_t *suspend_reject; -#endif struct lcr_msg *message; class Endpoint *epoint; unsigned char callid[8]; @@ -1853,35 +1430,16 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) int ret = -31; /* normal, unspecified */ l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_call_id(l3m, callid, &len); -#else - dec_ie_call_id(suspend->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len); -#endif end_trace(); - if (!ACTIVE_EPOINT(p_epointlist)) - { + if (!ACTIVE_EPOINT(p_epointlist)) { reject: -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_SUSPEND_REJECT | REQUEST, MT_SUSPEND_REJECT, dinfo, sizeof(SUSPEND_REJECT_t), p_m_d_ntmode); - suspend_reject = (SUSPEND_REJECT_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_REJECT_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); -#else - enc_ie_cause(&suspend_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SUSPEND_REJECT, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif - return; } @@ -1890,13 +1448,10 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) /* 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; } @@ -1917,8 +1472,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) 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; @@ -1928,37 +1482,18 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) } /* sending SUSPEND_ACKNOWLEDGE */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_SUSPEND_ACKNOWLEDGE | REQUEST, MT_SUSPEND_ACKNOWLEDGE, dinfo, sizeof(SUSPEND_ACKNOWLEDGE_t), p_m_d_ntmode); - suspend_acknowledge = (SUSPEND_ACKNOWLEDGE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_ACKNOWLEDGE_REQ, DIRECTION_OUT); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SUSPEND_ACKNOWLEDGE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_RELEASE); p_m_delete = 1; } /* CC_RESUME INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - RESUME_t *resume = (RESUME_t *)((unsigned long)data + headerlen); - RESUME_REJECT_t *resume_reject; - RESUME_ACKNOWLEDGE_t *resume_acknowledge; -#endif unsigned char callid[8]; int len; int channel, exclusive; @@ -1966,12 +1501,10 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) struct lcr_msg *message; int ret; -#ifdef SOCKET_MISDN /* 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(); @@ -1988,36 +1521,13 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) p_m_d_l3id = pid; p_m_d_ces = pid >> 16; end_trace(); -#else - /* callref from nt-lib */ - if (p_m_d_ntmode) - { - /* nt-library now gives us the id via CC_RESUME */ - if (dinfo&(~0xff) == 0xff00) - FATAL("l3-stack gives us a process id 0xff00-0xffff\n"); - l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_IND, DIRECTION_IN); - if (p_m_d_l3id) - add_trace("callref", "old", "0x%x", p_m_d_l3id); - add_trace("callref", "new", "0x%x", dinfo); - end_trace(); - 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 = resume->ces; - } -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_call_id(l3m, callid, &len); -#else - dec_ie_call_id(resume->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len); -#endif end_trace(); /* if blocked, release call */ - if (p_m_mISDNport->ifport->block) - { + if (p_m_mISDNport->ifport->block) { ret = -27; goto reject; } @@ -2034,32 +1544,19 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) 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: -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_RESUME_REJECT | REQUEST, MT_RESUME_REJECT, dinfo, sizeof(RESUME_REJECT_t), p_m_d_ntmode); - resume_reject = (RESUME_REJECT_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_REJECT_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); -#else - enc_ie_cause(&resume_reject->CAUSE, dmsg, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret); -#endif if (ret == -27) add_trace("reason", NULL, "port blocked"); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_REJECT, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_RELEASE); p_m_delete = 1; return; @@ -2071,10 +1568,8 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) 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)) @@ -2098,49 +1593,25 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) message_put(message); /* sending RESUME_ACKNOWLEDGE */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_RESUME_ACKNOWLEDGE | REQUEST, MT_RESUME_ACKNOWLEDGE, dinfo, sizeof(RESUME_ACKNOWLEDGE_t), p_m_d_ntmode); - resume_acknowledge = (RESUME_ACKNOWLEDGE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_ACKNOWLEDGE_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&resume_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_ACKNOWLEDGE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_CONNECT); } /* CC_FACILITY INDICATION */ -#ifdef SOCKET_MISDN void Pdss1::facility_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { -#else -void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data) -{ - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - FACILITY_t *facility = (FACILITY_t *)((unsigned long)data + headerlen); -#endif unsigned char facil[256]; int facil_len; struct lcr_msg *message; l1l2l3_trace_header(p_m_mISDNport, this, L3_FACILITY_IND, DIRECTION_IN); -#ifdef SOCKET_MISDN dec_ie_facility(l3m, facil, &facil_len); -#else - dec_ie_facility(facility->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), facil, &facil_len); -#endif end_trace(); /* facility */ @@ -2154,25 +1625,32 @@ void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data) } +/* 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 */ -#ifdef SOCKET_MISDN 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; } @@ -2197,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; } @@ -2207,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; } @@ -2218,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; } @@ -2230,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); @@ -2248,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); @@ -2269,6 +1741,10 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) release_complete_ind(cmd, pid, l3m); break; + case MT_RESTART: + restart_ind(cmd, pid, l3m); + break; + case MT_NOTIFY: notify_ind(cmd, pid, l3m); break; @@ -2293,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); @@ -2303,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; } @@ -2325,257 +1802,45 @@ 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(); } } -#else -void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) -{ - int new_l3id; - int timer_hex=0; - - switch (prim) - { - case CC_TIMEOUT | INDICATION: - if (p_m_d_ntmode) - { - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - timer_hex = *((int *)(((char *)data)+headerlen)); - } - if (timer_hex==0x312 && p_m_d_ntmode) - { - l1l2l3_trace_header(p_m_mISDNport, this, L3_TIMEOUT_IND, DIRECTION_IN); - add_trace("timer", NULL, "%x", timer_hex); - end_trace(); - t312_timeout_ind(prim, dinfo, data); - } - break; - - case CC_SETUP | INDICATION: - if (p_state != PORT_STATE_IDLE) - break; - setup_ind(prim, dinfo, data); - break; - - case CC_SETUP | CONFIRM: - if (p_m_d_ntmode) - { - l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_IND, 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) - PERROR(" strange setup-procid 0x%x\n", p_m_d_l3id); - p_m_d_l3id = *((int *)(((u_char *)data)+ mISDNUSER_HEAD_SIZE)); - add_trace("callref", "new", "0x%x", p_m_d_l3id); - end_trace(); - } - break; - - case CC_INFORMATION | INDICATION: - information_ind(prim, dinfo, data); - break; - - case CC_SETUP_ACKNOWLEDGE | INDICATION: - if (p_state != PORT_STATE_OUT_SETUP) - { - 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: - if (p_state != PORT_STATE_OUT_SETUP - && p_state != PORT_STATE_OUT_OVERLAP) - { - 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: - if (p_state != PORT_STATE_OUT_SETUP - && p_state != PORT_STATE_OUT_OVERLAP - && p_state != PORT_STATE_OUT_PROCEEDING) - { - 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: - 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) - { - 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) - { - /* 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 CC_CONNECT_ACKNOWLEDGE | INDICATION: - case CC_CONNECT | CONFIRM: - if (p_state == PORT_STATE_CONNECT_WAITING) - new_state(PORT_STATE_CONNECT); - 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); - p_m_d_notify_pending = NULL; - } - break; - - case CC_DISCONNECT | INDICATION: - disconnect_ind(prim, dinfo, data); - break; - - case CC_RELEASE | CONFIRM: - case CC_RELEASE | INDICATION: - release_ind(prim, dinfo, data); - break; - - case CC_RELEASE_COMPLETE | INDICATION: - release_complete_ind(prim, dinfo, data); - break; - - case CC_RELEASE_COMPLETE | CONFIRM: - break; - - case CC_NOTIFY | INDICATION: - notify_ind(prim, dinfo, data); - break; - - case CC_HOLD | INDICATION: - hold_ind(prim, dinfo, data); - break; - - case CC_RETRIEVE | INDICATION: - retrieve_ind(prim, dinfo, data); - break; - - case CC_SUSPEND | INDICATION: - suspend_ind(prim, dinfo, data); - break; - - case CC_RESUME | INDICATION: - resume_ind(prim, dinfo, data); - break; - - case CC_FACILITY | INDICATION: - facility_ind(prim, dinfo, data); - break; - - case CC_RELEASE_CR | INDICATION: - l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_CR_IND, DIRECTION_IN); - add_trace("callref", NULL, "0x%x", p_m_d_l3id); - end_trace(); - if (p_m_d_ntmode) - { - if ((p_m_d_l3id&0xff00) == 0xff00) - p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0; - } - p_m_d_l3id = 0; - p_m_d_ces = -1; - p_m_delete = 1; -//#warning remove me -//PDEBUG(DEBUG_LOG, "JOLLY release cr %d\n", p_serial); - /* sending release to endpoint in case we still have an endpoint - * this is because we don't get any response if a release_complete is received (or a release in release state) - */ - while(p_epointlist) - { - struct lcr_msg *message; - message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE); - message->param.disconnectinfo.cause = (p_m_d_collect_cause!=CAUSE_NOUSER)?p_m_d_collect_cause:CAUSE_UNSPECIFIED; - message->param.disconnectinfo.location = (p_m_d_collect_cause!=CAUSE_NOUSER)?p_m_d_collect_location:LOCATION_PRIVATE_LOCAL; - message_put(message); - /* remove epoint */ - free_epointlist(p_epointlist); - - new_state(PORT_STATE_RELEASE); - } - break; - - case CC_NEW_CR | INDICATION: - l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_IND, DIRECTION_IN); - if (p_m_d_l3id) - add_trace("callref", "old", "0x%x", p_m_d_l3id); - if (p_m_d_ntmode) - { - new_l3id = *((int *)(((u_char *)data+mISDNUSER_HEAD_SIZE))); - if (((new_l3id&0xff00)!=0xff00) && ((p_m_d_l3id&0xff00)==0xff00)) - p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0; - } else - { - new_l3id = dinfo; - } - p_m_d_l3id = new_l3id; - add_trace("callref", "new", "0x%x", p_m_d_l3id); - end_trace(); - break; - - default: - l1l2l3_trace_header(p_m_mISDNport, this, L3_UNKNOWN, DIRECTION_IN); - add_trace("unhandled", "prim", "0x%x", prim); - end_trace(); - } -} -#endif 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); } @@ -2596,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); } @@ -2610,64 +1874,46 @@ int Pdss1::handler(void) * handles all messages from endpoint */ /* MESSAGE_INFORMATION */ -void Pdss1::message_information(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_information(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - INFORMATION_t *information; -#endif - - if (param->information.id[0]) /* only if we have something to dial */ - { -#ifdef SOCKET_MISDN + 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(); -#else - dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode); - information = (INFORMATION_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN - enc_ie_called_pn(l3m, 0, 1, (unsigned char *)param->information.id); -#else - enc_ie_called_pn(&information->CALLED_PN, dmsg, 0, 1, (unsigned char *)param->information.id); -#endif + 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(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif + number += max; } new_state(p_state); } -int newteid = 0; - /* MESSAGE_SETUP */ -void Pdss1::message_setup(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_setup(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; int ret; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - INFORMATION_t *information; - SETUP_t *setup; - int i; -#endif 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); @@ -2684,46 +1930,30 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet 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 */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode); - information = (INFORMATION_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT); - if (p_m_d_ntmode) -#ifdef SOCKET_MISDN + if (p_m_d_ntmode || p_m_d_tespecial) enc_ie_display(l3m, (unsigned char *)p_callerinfo.display); -#else - enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_callerinfo.display); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif return; } } /* attach only if not already */ epointlist = p_epointlist; - while(epointlist) - { + while(epointlist) { if (epointlist->epoint_id == epoint_id) break; epointlist = epointlist->next; @@ -2733,8 +1963,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet /* 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 @@ -2743,14 +1972,12 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet if (!p_m_b_channel && !p_m_b_reserve && p_type==PORT_TYPE_DSS1_NT_OUT) channel = CHANNEL_NO; -#ifdef SOCKET_MISDN /* creating l3id */ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_REQ, DIRECTION_OUT); /* 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"); @@ -2765,74 +1992,21 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet } p_m_d_l3id = mt_assign_pid; mt_assign_pid = ~0; -#else - /* creating l3id */ - l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_REQ, DIRECTION_OUT); - if (p_m_d_ntmode) - { - i = 0; - while(i < 0x100) - { - if (p_m_mISDNport->procids[i] == 0) - break; - i++; - } - if (i == 0x100) - { - struct lcr_msg *message; - - add_trace("callref", NULL, "no free id"); - end_trace(); - message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); - message->param.disconnectinfo.cause = 47; - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - message_put(message); - new_state(PORT_STATE_RELEASE); - p_m_delete = 1; - return; - } - p_m_mISDNport->procids[i] = 1; - p_m_d_l3id = 0xff00 | i; - } else - { - iframe_t ncr; - /* if we are in te-mode, we need to create a process first */ - if (newteid++ > 0x7fff) - newteid = 0x0001; - p_m_d_l3id = (entity<<16) | newteid; - /* preparing message */ - ncr.prim = CC_NEW_CR | REQUEST; - ncr.addr = p_m_mISDNport->upper_id | FLG_MSG_DOWN; - ncr.dinfo = p_m_d_l3id; - ncr.len = 0; - /* send message */ - mISDN_write(mISDNdevice, &ncr, mISDN_HEADER_LEN+ncr.len, TIMEOUT_1SEC); - } -#endif add_trace("callref", "new", "0x%x", p_m_d_l3id); end_trace(); /* preparing setup message */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_SETUP | REQUEST, MT_SETUP, p_m_d_l3id, sizeof(SETUP_t), p_m_d_ntmode); - setup = (SETUP_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_REQ, DIRECTION_OUT); /* channel information */ if (channel >= 0) /* it should */ - { -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, exclusive, channel); -#else - enc_ie_channel_id(&setup->CHANNEL_ID, dmsg, exclusive, channel); -#endif - } /* caller information */ plan = 1; - switch (p_callerinfo.ntype) - { + switch (p_callerinfo.ntype) { + case INFO_NTYPE_UNKNOWN: + type = 0x0; + break; case INFO_NTYPE_INTERNATIONAL: type = 0x1; break; @@ -2842,66 +2016,104 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet 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) -#ifdef SOCKET_MISDN - enc_ie_calling_pn(l3m, type, plan, present, screen, (unsigned char *)p_callerinfo.id); -#else - enc_ie_calling_pn(&setup->CALLING_PN, dmsg, type, plan, present, screen, (unsigned char *)p_callerinfo.id); -#endif + 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 */ - { -#ifdef SOCKET_MISDN - enc_ie_called_pn(l3m, 0, 1, (unsigned char *)p_dialinginfo.id); -#else - enc_ie_called_pn(&setup->CALLED_PN, dmsg, 0, 1, (unsigned char *)p_dialinginfo.id); -#endif - } + 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) -#ifdef SOCKET_MISDN enc_ie_complete(l3m, 1); -#else - enc_ie_complete(&setup->COMPLETE, dmsg, 1); -#endif /* sending user-user */ - if (param->setup.useruser.len) - { -#ifdef SOCKET_MISDN + if (param->setup.useruser.len) { enc_ie_useruser(l3m, param->setup.useruser.protocol, param->setup.useruser.data, param->setup.useruser.len); -#else - enc_ie_useruser(&setup->USER_USER, dmsg, param->setup.useruser.protocol, param->setup.useruser.data, param->setup.useruser.len); -#endif } /* redirecting number */ plan = 1; - switch (p_redirinfo.ntype) - { + switch (p_redirinfo.ntype) { + case INFO_NTYPE_UNKNOWN: + type = 0x0; + break; case INFO_NTYPE_INTERNATIONAL: type = 0x1; break; @@ -2911,21 +2123,25 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet 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; @@ -2945,40 +2161,27 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet 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) -#ifdef SOCKET_MISDN + 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); -#else - enc_ie_redir_nr(&setup->REDIR_NR, dmsg, type, plan, present, screen, reason, (unsigned char *)p_redirinfo.id); -#endif /* bearer capability */ //printf("hlc=%d\n",p_capainfo.hlc); coding = 0; 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; @@ -2986,14 +2189,9 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet user = p_capainfo.bearer_info1 & 0x7f; break; } -#ifdef SOCKET_MISDN enc_ie_bearer(l3m, coding, capability, mode, rate, -1, user); -#else - enc_ie_bearer(&setup->BEARER, dmsg, coding, capability, mode, rate, -1, user); -#endif /* hlc */ - if (p_capainfo.hlc) - { + if (p_capainfo.hlc) { coding = 0; interpretation = 4; presentation = 1; @@ -3001,99 +2199,65 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet exthlc = -1; if (p_capainfo.exthlc) exthlc = p_capainfo.exthlc & 0x7f; -#ifdef SOCKET_MISDN enc_ie_hlc(l3m, coding, interpretation, presentation, hlc, exthlc); -#else - enc_ie_hlc(&setup->HLC, dmsg, coding, interpretation, presentation, hlc, exthlc); -#endif } /* display */ - if (p_callerinfo.display[0] && p_m_d_ntmode) -#ifdef SOCKET_MISDN + if (p_callerinfo.display[0] && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)p_callerinfo.display); -#else - enc_ie_display(&setup->DISPLAY, dmsg, (unsigned char *)p_callerinfo.display); -#endif /* nt-mode: CNIP (calling name identification presentation) */ -// if (p_callerinfo.name[0] && p_m_d_ntmode) +// 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(); /* send setup message now */ -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SETUP, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_OUT_SETUP); } /* MESSAGE_FACILITY */ -void Pdss1::message_facility(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_facility(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - FACILITY_t *facility; -#endif /* 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 */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_FACILITY | REQUEST, MT_FACILITY, p_m_d_l3id, sizeof(FACILITY_t), p_m_d_ntmode); - facility = (FACILITY_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_FACILITY_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_facility(l3m, (unsigned char *)param->facilityinfo.data, param->facilityinfo.len); -#else - enc_ie_facility(&facility->FACILITY, dmsg, (unsigned char *)param->facilityinfo.data, param->facilityinfo.len); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_FACILITY, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif } /* MESSAGE_NOTIFY */ -void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_notify(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - INFORMATION_t *information; - NOTIFY_t *notification; -#endif int notify; - int plan, type = -1, present; + 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; @@ -3104,323 +2268,167 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame 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 */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_NOTIFY | REQUEST, MT_NOTIFY, p_m_d_l3id, sizeof(NOTIFY_t), p_m_d_ntmode); - notification = (NOTIFY_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_notify(l3m, notify); -#else - enc_ie_notify(¬ification->NOTIFY, dmsg, notify); -#endif /* sending redirection number only in ntmode */ - if (type >= 0 && p_m_d_ntmode) -#ifdef SOCKET_MISDN + if (type >= 0 && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_redir_dn(l3m, type, plan, present, (unsigned char *)param->notifyinfo.id); -#else - enc_ie_redir_dn(¬ification->REDIR_DN, dmsg, type, plan, present, (unsigned char *)param->notifyinfo.id); -#endif - if (param->notifyinfo.display[0] && p_m_d_ntmode) -#ifdef SOCKET_MISDN + if (param->notifyinfo.display[0] && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)param->notifyinfo.display); -#else - enc_ie_display(¬ification->DISPLAY, dmsg, (unsigned char *)param->notifyinfo.display); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_NOTIFY, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif } - } else if (p_m_d_ntmode) - { + } else if (p_m_d_ntmode || p_m_d_tespecial) { /* sending information */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode); - information = (INFORMATION_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT); -#ifdef SOCKET_MISDN enc_ie_display(l3m, (unsigned char *)param->notifyinfo.display); -#else - enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)param->notifyinfo.display); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif } } /* MESSAGE_OVERLAP */ -void Pdss1::message_overlap(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_overlap(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - SETUP_ACKNOWLEDGE_t *setup_acknowledge; -#endif + + /* 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 */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_SETUP_ACKNOWLEDGE | REQUEST, MT_SETUP_ACKNOWLEDGE, p_m_d_l3id, sizeof(SETUP_ACKNOWLEDGE_t), p_m_d_ntmode); - setup_acknowledge = (SETUP_ACKNOWLEDGE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_REQ, DIRECTION_OUT); /* channel information */ if (p_state == PORT_STATE_IN_SETUP) -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&setup_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif /* progress information */ if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) -#ifdef SOCKET_MISDN - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); -#else - enc_ie_progress(&setup_acknowledge->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); -#endif + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SETUP_ACKNOWLEDGE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_IN_OVERLAP); } /* MESSAGE_PROCEEDING */ -void Pdss1::message_proceeding(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_proceeding(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - CALL_PROCEEDING_t *proceeding; -#endif /* sending proceeding */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode); - proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT); /* channel information */ if (p_state == PORT_STATE_IN_SETUP) -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif /* progress information */ if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) -#ifdef SOCKET_MISDN - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); -#else - enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); -#endif + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_IN_PROCEEDING); } /* MESSAGE_ALERTING */ -void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_alerting(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - ALERTING_t *alerting; -#endif /* NT-MODE in setup state we must send PROCEEDING first */ - if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) - { + if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) { /* sending proceeding */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - CALL_PROCEEDING_t *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); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT); /* channel information */ -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif /* progress information */ if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) -#ifdef SOCKET_MISDN - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); -#else - enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); -#endif + if (p_m_mISDNport->tones) + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_IN_PROCEEDING); } /* sending alerting */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_ALERTING | REQUEST, MT_ALERTING, p_m_d_l3id, sizeof(ALERTING_t), p_m_d_ntmode); - alerting = (ALERTING_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_ALERTING_REQ, DIRECTION_OUT); /* channel information */ if (p_state == PORT_STATE_IN_SETUP) -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&alerting->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif /* progress information */ if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) -#ifdef SOCKET_MISDN - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); -#else - enc_ie_progress(&alerting->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); -#endif + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_ALERTING, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_IN_ALERTING); } /* MESSAGE_CONNECT */ -void Pdss1::message_connect(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - INFORMATION_t *information; - CONNECT_t *connect; -#endif int type, plan, present, screen; 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 */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - CALL_PROCEEDING_t *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); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT); /* channel information */ -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif -// /* progress information */ -// if (p_capainfo.bearer_capa==INFO_BC_SPEECH -// || p_capainfo.bearer_capa==INFO_BC_AUDIO -// || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) -#ifdef SOCKET_MISDN -// enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); -#else -// enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_IN_PROCEEDING); } @@ -3431,49 +2439,31 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param /* only display at connect state */ if (p_state == PORT_STATE_CONNECT) - if (p_connectinfo.display[0]) - { + if (p_connectinfo.display[0]) { /* sending information */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode); - information = (INFORMATION_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT); - if (p_m_d_ntmode) -#ifdef SOCKET_MISDN + if (p_m_d_ntmode || p_m_d_tespecial) enc_ie_display(l3m, (unsigned char *)p_connectinfo.display); -#else - enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_connectinfo.display); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif 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; } /* preparing connect message */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_CONNECT | REQUEST, MT_CONNECT, p_m_d_l3id, sizeof(CONNECT_t), p_m_d_ntmode); - connect = (CONNECT_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, 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; @@ -3483,70 +2473,51 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param 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) -#ifdef SOCKET_MISDN enc_ie_connected_pn(l3m, type, plan, present, screen, (unsigned char *)p_connectinfo.id); -#else - enc_ie_connected_pn(&connect->CONNECT_PN, dmsg, type, plan, present, screen, (unsigned char *)p_connectinfo.id); -#endif /* display */ - if (p_connectinfo.display[0] && p_m_d_ntmode) -#ifdef SOCKET_MISDN + if (p_connectinfo.display[0] && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)p_connectinfo.display); -#else - enc_ie_display(&connect->DISPLAY, dmsg, (unsigned char *)p_connectinfo.display); -#endif /* nt-mode: CONP (connected name identification presentation) */ -// if (p_connectinfo.name[0] && p_m_d_ntmode) +// 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); -#ifdef SOCKET_MISDN enc_ie_date(l3m, now, p_settings.no_seconds); -#else - enc_ie_date(&connect->DATE, dmsg, now, p_settings.no_seconds); -#endif } end_trace(); /* finally send message */ -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CONNECT, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif if (p_m_d_ntmode) new_state(PORT_STATE_CONNECT); @@ -3556,148 +2527,78 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param } /* MESSAGE_DISCONNECT */ -void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_disconnect(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - DISCONNECT_t *disconnect; - RELEASE_COMPLETE_t *release_complete; -#endif struct lcr_msg *message; 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->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); - message->param.disconnectinfo.cause = 16; - message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; + memcpy(&message->param, param, sizeof(union parameter)); message_put(message); /* remove epoint */ free_epointlist(p_epointlist); } /* sending release */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT); /* send cause */ -#ifdef SOCKET_MISDN - enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#else - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#endif + enc_ie_cause(l3m, (!p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_REMOTE:param->disconnectinfo.location, param->disconnectinfo.cause); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_RELEASE); p_m_delete = 1; return; } /* 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 */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - CALL_PROCEEDING_t *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); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT); /* channel information */ -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif /* progress information */ if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) -#ifdef SOCKET_MISDN - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); -#else - enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); -#endif + if (p_m_mISDNport->tones) + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_IN_PROCEEDING); } /* sending disconnect */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_DISCONNECT | REQUEST, MT_DISCONNECT, p_m_d_l3id, sizeof(DISCONNECT_t), p_m_d_ntmode); - disconnect = (DISCONNECT_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_REQ, DIRECTION_OUT); /* progress information */ if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) -#ifdef SOCKET_MISDN - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); -#else - enc_ie_progress(&disconnect->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); -#endif + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); /* send cause */ -#ifdef SOCKET_MISDN - enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#else - enc_ie_cause(&disconnect->CAUSE, dmsg, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#endif + 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) -#ifdef SOCKET_MISDN + if (p) if (*p && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)p); -#else - enc_ie_display(&disconnect->DISPLAY, dmsg, (unsigned char *)p); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_DISCONNECT, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_OUT_DISCONNECT); } /* MESSAGE_RELEASE */ -void Pdss1::message_release(unsigned long epoint_id, int message_id, union parameter *param) +void Pdss1::message_release(unsigned int epoint_id, int message_id, union parameter *param) { -#ifdef SOCKET_MISDN l3_msg *l3m; -#else - int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; - msg_t *dmsg; - RELEASE_t *release; - RELEASE_COMPLETE_t *release_complete; - DISCONNECT_t *disconnect; -#endif class Endpoint *epoint; char *p = NULL; @@ -3706,28 +2607,14 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param * 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 */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, p_m_d_l3id, sizeof(RELEASE_t), p_m_d_ntmode); - release = (RELEASE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT); /* send cause */ -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#else - enc_ie_cause(&release->CAUSE, dmsg, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_RELEASE); /* remove epoint */ free_epointid(epoint_id); @@ -3740,32 +2627,16 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param * also on outgoing call setup, we send a release complete, BUT this is not conform. (i don't know any other way) */ if (p_state==PORT_STATE_IN_SETUP - || p_state==PORT_STATE_OUT_SETUP) -// // NOTE: a bug in mISDNuser (see disconnect_req_out !!!) -// || p_state==PORT_STATE_OUT_DISCO) - { + || p_state==PORT_STATE_OUT_SETUP) { //#warning remove me //PDEBUG(DEBUG_LOG, "JOLLY sending release complete %d\n", p_serial); /* sending release complete */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode); - release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT); /* send cause */ -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#else - enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_RELEASE); /* remove epoint */ free_epointid(epoint_id); @@ -3776,82 +2647,44 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param #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 */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode); - proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT); /* channel information */ -#ifdef SOCKET_MISDN enc_ie_channel_id(l3m, 1, p_m_b_channel); -#else - enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel); -#endif /* progress information */ if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) -#ifdef SOCKET_MISDN - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); -#else - enc_ie_progress(&proceeding->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); -#endif + if (p_m_mISDNport->tones) + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif } #endif /* sending disconnect */ -#ifdef SOCKET_MISDN l3m = create_l3msg(); -#else - dmsg = create_l3msg(CC_DISCONNECT | REQUEST, MT_DISCONNECT, p_m_d_l3id, sizeof(DISCONNECT_t), p_m_d_ntmode); - disconnect = (DISCONNECT_t *)(dmsg->data + headerlen); -#endif l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_REQ, DIRECTION_OUT); /* progress information */ if (p_capainfo.bearer_capa==INFO_BC_SPEECH || p_capainfo.bearer_capa==INFO_BC_AUDIO || p_capainfo.bearer_capa==INFO_BC_DATAUNRESTRICTED_TONES) if (p_m_mISDNport->tones) -#ifdef SOCKET_MISDN - enc_ie_progress(l3m, 0, p_m_d_ntmode?1:5, 8); -#else - enc_ie_progress(&disconnect->PROGRESS, dmsg, 0, p_m_d_ntmode?1:5, 8); -#endif + enc_ie_progress(l3m, 0, (p_m_d_ntmode)?1:5, 8); /* send cause */ -#ifdef SOCKET_MISDN enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#else - enc_ie_cause(&disconnect->CAUSE, dmsg, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause); -#endif /* send display */ epoint = find_epoint_id(epoint_id); if (param->disconnectinfo.display[0]) p = param->disconnectinfo.display; - if (p) if (*p && p_m_d_ntmode) -#ifdef SOCKET_MISDN + if (p) if (*p && (p_m_d_ntmode || p_m_d_tespecial)) enc_ie_display(l3m, (unsigned char *)p); -#else - enc_ie_display(&disconnect->DISPLAY, dmsg, (unsigned char *)p); -#endif end_trace(); -#ifdef SOCKET_MISDN p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_DISCONNECT, p_m_d_l3id, l3m); -#else - msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); -#endif new_state(PORT_STATE_OUT_DISCONNECT); /* remove epoint */ free_epointid(epoint_id); @@ -3864,22 +2697,18 @@ wirklich erst proceeding?: /* * endpoint sends messages to the port */ -int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union parameter *param) +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 @@ -3888,8 +2717,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet && 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) @@ -3899,8 +2727,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet && 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); @@ -3908,42 +2735,13 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet 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; } if (p_epointlist && p_state==PORT_STATE_IDLE) FATAL("Pdss1(%s): epoint pointer is set in idle state, how bad!!\n", p_name); -#ifdef SOCKET_MISDN message_setup(epoint_id, message_id, param); -#else - /* note: pri is a special case, because links must be up for pri */ - if (p_m_mISDNport->l1link || p_m_mISDNport->pri || !p_m_mISDNport->ntmode || p_state!=PORT_STATE_IDLE) - { - /* LAYER 1 is up, or we may send */ - message_setup(epoint_id, message_id, param); - } else { - iframe_t act; - /* LAYER 1 id down, so we queue */ - p_m_d_queue = message_create(epoint_id, p_serial, EPOINT_TO_PORT, message_id); - memcpy(&p_m_d_queue->param, param, sizeof(union parameter)); - /* attach us */ - if (!(epointlist_new(epoint_id))) - FATAL("No memory for epointlist\n"); - /* activate link */ - PDEBUG(DEBUG_ISDN, "the L1 is down, we try to establish the link NT portnum=%d (%s).\n", p_m_mISDNport->portnum, p_name); - act.prim = PH_ACTIVATE | REQUEST; - act.addr = p_m_mISDNport->upper_id | FLG_MSG_DOWN; - act.dinfo = 0; - act.len = 0; - mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC); - l1l2l3_trace_header(p_m_mISDNport, this, L1_ACTIVATE_REQ, DIRECTION_OUT); - end_trace(); -// /* set timeout */ -// p_m_mISDNport->l1timeout = now+3; - } -#endif break; case MESSAGE_NOTIFY: /* display and notifications */ @@ -3955,8 +2753,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet 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); @@ -3964,21 +2761,31 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet 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 */ @@ -3986,11 +2793,16 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet && 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 */ @@ -4003,23 +2815,21 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet && 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); @@ -4030,7 +2840,6 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet /* * data from isdn-stack (layer-3) to pbx (port class) */ -#ifdef SOCKET_MISDN int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { class Port *port; @@ -4039,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 @@ -4073,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); @@ -4093,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); @@ -4118,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; @@ -4152,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) @@ -4168,299 +2964,8 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi } return(0); } -#else -/* NOTE: nt mode use mISDNuser_head_t as header */ -int stack2manager_nt(void *dat, void *arg) -{ - class Port *port; - class Pdss1 *pdss1; - manager_t *mgr = (manager_t *)dat; - msg_t *msg = (msg_t *)arg; - mISDNuser_head_t *hh; - struct mISDNport *mISDNport; - char name[32]; - - if (!msg || !mgr) - return(-EINVAL); - /* note: nst is the first data feld of mISDNport */ - mISDNport = (struct mISDNport *)mgr->nst; - hh = (mISDNuser_head_t *)msg->data; - PDEBUG(DEBUG_ISDN, "prim(0x%x) dinfo(0x%x) msg->len(%d)\n", hh->prim, hh->dinfo, msg->len); - - /* find Port object of type ISDN */ - port = port_first; - while(port) - { - if (port->p_type == PORT_TYPE_DSS1_NT_IN || port->p_type == PORT_TYPE_DSS1_NT_OUT) - { - pdss1 = (class Pdss1 *)port; -//PDEBUG(DEBUG_ISDN, "comparing dinfo = 0x%x with l3id 0x%x\n", hh->dinfo, pdss1->p_m_d_l3id); - /* check out correct stack */ - if (pdss1->p_m_mISDNport == mISDNport) - /* check out correct id */ - if ((pdss1->p_m_d_l3id&0x0000ff00) != 0x000ff00) - { - /* a single process */ - if (hh->dinfo == pdss1->p_m_d_l3id) - { - /* found port, the message belongs to */ - break; - } - } else - { - /* a broadcast process */ - if ((hh->dinfo&0xffff0000) == (pdss1->p_m_d_l3id&0xffff0000)) - { - /* found port, the message belongs to */ - break; - } - } - } - port = port->next; - } - if (port) - { -//printf("%x %x\n", hh->dinfo, pdss1->p_m_d_l3id); - /* if process id is master process, but a child disconnects */ - if ((hh->dinfo&0x0000ff00)!=0x0000ff00 && (pdss1->p_m_d_l3id&0x0000ff00)==0x0000ff00) - { - if (hh->prim == (CC_DISCONNECT|INDICATION)) - { - /* send special indication for child disconnect */ - pdss1->disconnect_ind_i(hh->prim, hh->dinfo, msg->data); - free_msg(msg); - return(0); - } - // ignoring other messages from child processes - free_msg(msg); - return(0); - } - /* if process id and layer 3 id matches */ - if (hh->dinfo == pdss1->p_m_d_l3id) - { - pdss1->message_isdn(hh->prim, hh->dinfo, msg->data); - free_msg(msg); - return(0); - } - } - - /* d-message */ - switch(hh->prim) - { - case MGR_SHORTSTATUS | INDICATION: - case MGR_SHORTSTATUS | CONFIRM: - switch(hh->dinfo) { - case SSTATUS_L2_ESTABLISHED: - goto ss_estab; - case SSTATUS_L2_RELEASED: - goto ss_rel; - } - break; - - case DL_ESTABLISH | INDICATION: - l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_IND, DIRECTION_IN); - goto ss_estab; - case DL_ESTABLISH | CONFIRM: - l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_CON, DIRECTION_IN); - ss_estab: - add_trace("tei", NULL, "%d", hh->dinfo); - end_trace(); - if (mISDNport->ptp && hh->dinfo == 0) - { - if (mISDNport->l2establish) - { - mISDNport->l2establish = 0; - PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n"); - } - mISDNport->l2link = 1; - if (mISDNport->pri); - mISDNport->l1link = 1; /* this is a hack, we also assume L1 to be active */ - } - break; - - case DL_RELEASE | INDICATION: - l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN); - goto ss_rel; - case DL_RELEASE | CONFIRM: - l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_CON, DIRECTION_IN); - ss_rel: - add_trace("tei", NULL, "%d", hh->dinfo); - end_trace(); - if (mISDNport->ptp && hh->dinfo == 0) - { - mISDNport->l2link = 0; - time(&mISDNport->l2establish); - PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n"); - } - break; - - case CC_SETUP | 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, 0, 0))) - - FATAL("Cannot create Port instance.\n"); - pdss1->message_isdn(hh->prim, hh->dinfo, msg->data); - break; - - case CC_RESUME | INDICATION: - /* creating port object */ - SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum); - if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, 0, 0))) - FATAL("Cannot create Port instance.\n"); - pdss1->message_isdn(hh->prim, hh->dinfo, msg->data); - break; - - case CC_RELEASE_CR | INDICATION: - PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", hh->dinfo); - break; - - case CC_RELEASE_COMPLETE | INDICATION: - break; - - case CC_FACILITY | INDICATION: - break; - - default: - PERROR("unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", hh->prim, hh->dinfo, msg->len); - port = port_first; - while(port) - { - if (port->p_type == PORT_TYPE_DSS1_NT_IN || port->p_type == PORT_TYPE_DSS1_NT_OUT) - { - pdss1 = (class Pdss1 *)port; - //PDEBUG(DEBUG_ISDN, "comparing dinfo = 0x%x with l3id 0x%x\n", hh->dinfo, pdss1->p_m_d_l3id); - /* check out correct stack */ - if (pdss1->p_m_mISDNport == mISDNport) - /* check out correct id */ - PERROR("unhandled message: dinfo=%x is not associated with port-dinfo=%x\n",hh->dinfo,pdss1->p_m_d_l3id); - } - port = port->next; - } - return(-EINVAL); - } - free_msg(msg); - return(0); -} - -/* NOTE: te mode use iframe_t as header */ -int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg) -{ - class Port *port; - class Pdss1 *pdss1; - iframe_t *frm; - char name[32]; - - if (!msg || !mISDNport) - return(-EINVAL); - frm = (iframe_t *)msg->data; - PDEBUG(DEBUG_ISDN, "prim(0x%x) dinfo(0x%x) msg->len(%d)\n", frm->prim, frm->dinfo, msg->len); - - /* find Port object of type ISDN */ - port = port_first; - while(port) - { - if (port->p_type == PORT_TYPE_DSS1_TE_IN || port->p_type == PORT_TYPE_DSS1_TE_OUT) - { - pdss1 = (class Pdss1 *)port; - /* check out correct stack */ - if (pdss1->p_m_mISDNport == mISDNport) - /* check out correct id */ - if (frm->dinfo == pdss1->p_m_d_l3id) - { - /* found port, the message belongs to */ - break; - } - } - port = port->next; - } - if (port) - { - pdss1->message_isdn(frm->prim, frm->dinfo, msg->data); - free_msg(msg); - return(0); - } - - /* process new cr (before setup indication) */ -//printf("prim = 0x%x, looking for 0x%x\n",frm->prim, (CC_NEW_CR | INDICATION)); - if (frm->prim == (CC_NEW_CR | INDICATION)) - { - - /* 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, 0, 0))) - FATAL("Cannot create Port instance.\n"); - /* l3id will be set from dinfo at message_isdn */ - pdss1->message_isdn(frm->prim, frm->dinfo, msg->data); - free_msg(msg); - return(0); - } - - if (frm->prim == (CC_RELEASE_CR | INDICATION)) - { - PDEBUG(DEBUG_ISDN, "unhandled message from stack: call ref released (l3id=0x%x)\n", frm->dinfo); - free_msg(msg); - return(0); - } - PERROR("unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", frm->prim, frm->dinfo, msg->len); - return(-EINVAL); -} - -#endif // stacktomanager - - -#ifndef SOCKET_MISDN -/* - * 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