X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=dss1.cpp;h=2df264504d2c620bf81d97f23008568ea8a35660;hp=419223fb5b94b0ae8184bd60c82fd0bb285b99af;hb=012abb3e07c04507685491070cedd93e4b093374;hpb=da21ec0158f0be010a75d42c058fdc8891498b2d diff --git a/dss1.cpp b/dss1.cpp index 419223f..2df2645 100644 --- a/dss1.cpp +++ b/dss1.cpp @@ -9,26 +9,24 @@ ** ** \*****************************************************************************/ - -#include -#include -#include #include "main.h" -#include -#include -#include -#include -#include -#include -#include +#include "myisdn.h" +#ifndef SOCKET_MISDN +// old mISDN extern "C" { #include } +#else +// socket mISDN +#include +extern "C" { +} +#include +extern unsigned long mt_assign_pid; +#endif -#include "q931.h" #include "ie.cpp" - /* * constructor */ @@ -59,12 +57,14 @@ Pdss1::~Pdss1() 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 } @@ -138,7 +138,11 @@ 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 ret; #ifdef SOCKET_MISDN @@ -270,7 +274,11 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex /*** 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 { chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (connect)", DIRECTION_NONE); add_trace("channel", "request", "no-channel"); @@ -351,7 +359,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m); + 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 @@ -515,9 +523,31 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) unsigned char useruser[128]; int useruser_len = 0, useruser_protocol; class Endpoint *epoint; - struct message *message; + struct lcr_msg *message; -#ifndef SOCKET_MISDN +#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) + { + /* release in case the ID is already in use */ + add_trace("error", NULL, "callref already in use"); + end_trace(); + l3m = create_l3msg(); + l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT); + enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47); + add_trace("reason", NULL, "callref already in use"); + end_trace(); + p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, pid, l3m); + new_state(PORT_STATE_RELEASE); + p_m_delete = 1; + return; + } + p_m_d_l3id = pid; + p_m_d_ces = pid >> 16; + end_trace(); +#else /* callref from nt-lib */ if (p_m_d_ntmode) { @@ -569,11 +599,10 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) /* if blocked, release call with MT_RELEASE_COMPLETE */ if (p_m_mISDNport->ifport->block) { - RELEASE_COMPLETE_t *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 @@ -586,7 +615,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) add_trace("reason", NULL, "port blocked"); end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m); + 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 @@ -802,7 +831,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m); + 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 @@ -850,13 +879,13 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data) #endif int type, plan; unsigned char keypad[32] = ""; - struct message *message; + struct lcr_msg *message; l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_IND, DIRECTION_IN); #ifdef SOCKET_MISDN - 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); + 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_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)); @@ -900,12 +929,12 @@ void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void int exclusive, channel; int coding, location, progress; int ret; - struct message *message; + struct lcr_msg *message; l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_IND, DIRECTION_IN); #ifdef SOCKET_MISDN - 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); + 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); @@ -913,7 +942,11 @@ void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void 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) { message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); @@ -944,16 +977,16 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) int exclusive, channel; int coding, location, progress; int ret; - struct message *message; + struct lcr_msg *message; int notify = -1, type, plan, present; char redir[32]; l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_IND, DIRECTION_IN); #ifdef SOCKET_MISDN - 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)); + 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); @@ -962,7 +995,11 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) #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) { message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); @@ -1039,16 +1076,16 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) int exclusive, channel; int coding, location, progress; int ret; - struct message *message; + struct lcr_msg *message; int notify = -1, type, plan, present; char redir[32]; l1l2l3_trace_header(p_m_mISDNport, this, L3_ALERTING_IND, DIRECTION_IN); #ifdef SOCKET_MISDN - 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)); + 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); @@ -1058,7 +1095,11 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) 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) { message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); @@ -1136,28 +1177,37 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) int exclusive, channel; int type, plan, present, screen; int ret; - struct message *message; + 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(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)); + 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)); + /* 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)); -#endif /* 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 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) { message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); @@ -1233,7 +1283,7 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_CONNECT, l3m); + 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 @@ -1258,12 +1308,12 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data) #endif int location, cause; int coding, proglocation, progress; - struct message *message; + struct lcr_msg *message; l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_IND, DIRECTION_IN); #ifdef SOCKET_MISDN - 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); + 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); @@ -1300,7 +1350,7 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data) add_trace("reason", NULL, "no remote patterns"); end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE, l3m); + 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 @@ -1360,7 +1410,7 @@ void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data add_trace("old-cause", "value", "%d", p_m_d_collect_cause); } #ifdef SOCKET_MISDN - dec_ie_cause(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); + dec_ie_cause(l3m, &location, &cause); #else dec_ie_cause(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); #endif @@ -1387,11 +1437,11 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data) RELEASE_t *release = (RELEASE_t *)((unsigned long)data + headerlen); #endif int location, cause; - struct message *message; + struct lcr_msg *message; l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_IND, DIRECTION_IN); #ifdef SOCKET_MISDN - dec_ie_cause(release->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); + dec_ie_cause(l3m, &location, &cause); #else dec_ie_cause(release->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); #endif @@ -1414,14 +1464,17 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data) } /* 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 */ - RELEASE_COMPLETE_t *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 @@ -1433,7 +1486,7 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m); + 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 @@ -1454,14 +1507,23 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void * RELEASE_COMPLETE_t *release_complete = (RELEASE_COMPLETE_t *)((unsigned long)data + headerlen); #endif int location, cause; - struct message *message; - + 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) + { + cause = 27; + location = 5; + } else + { #ifdef SOCKET_MISDN - dec_ie_cause(release_complete->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); + dec_ie_cause(l3m, &location, &cause); #else - dec_ie_cause(release_complete->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause); + 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"); + } end_trace(); if (location == LOCATION_PRIVATE_LOCAL) location = LOCATION_PRIVATE_REMOTE; @@ -1488,12 +1550,12 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void * #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) { -#endif - struct message *message; - + struct lcr_msg *message; // trace is done at message_isdn() /* sending release to endpoint */ @@ -1517,6 +1579,7 @@ void Pdss1::t312_timeout_ind(unsigned long prim, unsigned long dinfo, void *data new_state(PORT_STATE_RELEASE); p_m_delete = 1; } +#endif /* CC_NOTIFY INDICATION */ #ifdef SOCKET_MISDN @@ -1528,14 +1591,14 @@ 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 message *message; + struct lcr_msg *message; int notify, type, plan, present; unsigned char notifyid[sizeof(message->param.notifyinfo.id)]; l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_IND, DIRECTION_IN); #ifdef SOCKET_MISDN - 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)); + 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)); @@ -1589,7 +1652,7 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data) /* CC_HOLD INDICATION */ - struct message *message; + struct lcr_msg *message; #ifdef SOCKET_MISDN void Pdss1::hold_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { @@ -1624,7 +1687,7 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data) add_trace("reason", NULL, "no endpoint"); end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_HOLD_REJECT, l3m); + 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 @@ -1665,7 +1728,7 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data) l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_ACKNOWLEDGE_REQ, DIRECTION_OUT); end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_HOLD_ACKNOWLEDGE, l3m); + 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 @@ -1685,13 +1748,13 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) RETRIEVE_REJECT_t *retrieve_reject; RETRIEVE_ACKNOWLEDGE_t *retrieve_acknowledge; #endif - struct message *message; + 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(retrieve->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel); + 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 @@ -1716,7 +1779,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RETRIEVE_REJECT, l3m); + 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 @@ -1764,7 +1827,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RETRIEVE_ACKNOWLEDGE, l3m); + 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 @@ -1783,7 +1846,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) SUSPEND_ACKNOWLEDGE_t *suspend_acknowledge; SUSPEND_REJECT_t *suspend_reject; #endif - struct message *message; + struct lcr_msg *message; class Endpoint *epoint; unsigned char callid[8]; int len; @@ -1791,7 +1854,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_IND, DIRECTION_IN); #ifdef SOCKET_MISDN - dec_ie_call_id(suspend->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len); + 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 @@ -1814,7 +1877,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SUSPEND_REJECT, l3m); + 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 @@ -1874,7 +1937,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data) l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_ACKNOWLEDGE_REQ, DIRECTION_OUT); end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SUSPEND_ACKNOWLEDGE, l3m); + 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 @@ -1900,9 +1963,32 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) int len; int channel, exclusive; class Endpoint *epoint; - struct message *message; + 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) + { + /* release is case the ID is already in use */ + add_trace("error", NULL, "callref already in use"); + end_trace(); + l3m = create_l3msg(); + l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_REJECT_REQ, DIRECTION_OUT); + enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47); + add_trace("reason", NULL, "callref already in use"); + end_trace(); + p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_REJECT, pid, l3m); + new_state(PORT_STATE_RELEASE); + p_m_delete = 1; + return; + } + p_m_d_l3id = pid; + p_m_d_ces = pid >> 16; + end_trace(); +#else /* callref from nt-lib */ if (p_m_d_ntmode) { @@ -1919,10 +2005,11 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) 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(resume->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len); + 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 @@ -1969,7 +2056,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) add_trace("reason", NULL, "port blocked"); end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RESUME_REJECT, l3m); + 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 @@ -2025,7 +2112,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RESUME_ACKNOWDGE, l3m); + 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 @@ -2046,11 +2133,11 @@ void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data) #endif unsigned char facil[256]; int facil_len; - struct message *message; + struct lcr_msg *message; l1l2l3_trace_header(p_m_mISDNport, this, L3_FACILITY_IND, DIRECTION_IN); #ifdef SOCKET_MISDN - dec_ie_facility(facility->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), facil, &facil_len); + dec_ie_facility(l3m, facil, &facil_len); #else dec_ie_facility(facility->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), facil, &facil_len); #endif @@ -2071,6 +2158,179 @@ void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data) * 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) + { + case MT_TIMEOUT: + if (!l3m->cause) + { + PERROR("Pdss1(%s) timeout without cause.\n", p_name); + break; + } + if (l3m->cause[0] != 5) + { + PERROR("Pdss1(%s) expecting timeout with timer diagnostic. (got len=%d)\n", p_name, l3m->cause[0]); + break; + } + timer = (l3m->cause[3]-'0')*100; + timer += (l3m->cause[4]-'0')*10; + timer += (l3m->cause[5]-'0'); + l1l2l3_trace_header(p_m_mISDNport, this, L3_TIMEOUT_IND, DIRECTION_IN); + add_trace("timer", NULL, "%d", timer); + end_trace(); + if (timer == 312) + t312_timeout_ind(cmd, pid, l3m); + break; + + case MT_SETUP: + if (p_state != PORT_STATE_IDLE) + break; + setup_ind(cmd, pid, l3m); + break; + + case MT_INFORMATION: + information_ind(cmd, pid, l3m); + break; + + case MT_SETUP_ACKNOWLEDGE: + 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; + } + setup_acknowledge_ind(cmd, pid, l3m); + break; + + case MT_CALL_PROCEEDING: + if (p_state != PORT_STATE_OUT_SETUP + && p_state != PORT_STATE_OUT_OVERLAP) + { + PDEBUG(DEBUG_ISDN, "Pdss1(%s) received proceeding, but we are not in outgoing setup OR overlap state, IGNORING.\n", p_name); + break; + } + proceeding_ind(cmd, pid, l3m); + break; + + case MT_ALERTING: + if (p_state != PORT_STATE_OUT_SETUP + && p_state != PORT_STATE_OUT_OVERLAP + && p_state != PORT_STATE_OUT_PROCEEDING) + { + PDEBUG(DEBUG_ISDN, "Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding state, IGNORING.\n", p_name); + break; + } + alerting_ind(cmd, pid, l3m); + break; + + case MT_CONNECT: + if (p_state != PORT_STATE_OUT_SETUP + && p_state != PORT_STATE_OUT_OVERLAP + && p_state != PORT_STATE_OUT_PROCEEDING + && p_state != PORT_STATE_OUT_ALERTING) + { + PDEBUG(DEBUG_ISDN, "Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding OR ALERTING state, IGNORING.\n", p_name); + break; + } + connect_ind(cmd, pid, l3m); + 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 MT_CONNECT_ACKNOWLEDGE: + 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 MT_DISCONNECT: + disconnect_ind(cmd, pid, l3m); + break; + + case MT_RELEASE: + release_ind(cmd, pid, l3m); + break; + + case MT_RELEASE_COMPLETE: + release_complete_ind(cmd, pid, l3m); + break; + + case MT_NOTIFY: + notify_ind(cmd, pid, l3m); + break; + + case MT_HOLD: + hold_ind(cmd, pid, l3m); + break; + + case MT_RETRIEVE: + retrieve_ind(cmd, pid, l3m); + break; + + case MT_SUSPEND: + suspend_ind(cmd, pid, l3m); + break; + + case MT_RESUME: + resume_ind(cmd, pid, l3m); + break; + + case MT_FACILITY: + facility_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); + end_trace(); + p_m_d_l3id = 0; + p_m_d_ces = -1; + p_m_delete = 1; + /* 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 + { + struct lcr_msg *message; + 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); + } + break; + + default: + l1l2l3_trace_header(p_m_mISDNport, this, L3_UNKNOWN, 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; @@ -2081,13 +2341,8 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) case CC_TIMEOUT | INDICATION: if (p_m_d_ntmode) { -#ifdef SOCKET_MISDN - #warning TESTEN!!! - timer_hex = *((int *)(((char *)data)/*+headerlen*/)); -#else int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN; timer_hex = *((int *)(((char *)data)+headerlen)); -#endif } if (timer_hex==0x312 && p_m_d_ntmode) { @@ -2234,6 +2489,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) 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); @@ -2242,7 +2498,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) */ while(p_epointlist) { - struct message *message; + 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; @@ -2278,6 +2534,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) end_trace(); } } +#endif void Pdss1::new_state(int state) { @@ -2335,17 +2592,12 @@ int Pdss1::handler(void) { int ret; -//if (p_m_delete && p_m_d_l3id==0) -// printf("ping! %d", p_serial); if ((ret = PmISDN::handler())) return(ret); /* handle destruction */ if (p_m_delete && p_m_d_l3id==0) { -//#warning remove -//PDEBUG(DEBUG_LOG, "JOLLY destroy object %d\n", p_serial); - delete this; return(-1); } @@ -2384,7 +2636,7 @@ void Pdss1::message_information(unsigned long epoint_id, int message_id, union p #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m); + 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 @@ -2400,22 +2652,23 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet { #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 capability, mode, rate, coding, user, presentation, interpretation, hlc, exthlc; int channel, exclusive; - int i; struct epoint_list *epointlist; /* release if port is blocked */ if (p_m_mISDNport->ifport->block) { - struct message *message; + struct lcr_msg *message; message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE); message->param.disconnectinfo.cause = 27; // temp. unavail. @@ -2459,7 +2712,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m); + 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 @@ -2490,6 +2743,29 @@ 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) + { + 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_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) @@ -2503,7 +2779,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet } if (i == 0x100) { - struct message *message; + struct lcr_msg *message; add_trace("callref", NULL, "no free id"); end_trace(); @@ -2531,9 +2807,8 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet ncr.len = 0; /* send message */ mISDN_write(mISDNdevice, &ncr, mISDN_HEADER_LEN+ncr.len, TIMEOUT_1SEC); -// if (!dmsg) -// goto nomem; } +#endif add_trace("callref", "new", "0x%x", p_m_d_l3id); end_trace(); @@ -2747,7 +3022,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet /* send setup message now */ #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SETUP, l3m); + 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 @@ -2785,7 +3060,7 @@ void Pdss1::message_facility(unsigned long epoint_id, int message_id, union para #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_FACILITY, l3m); + 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 @@ -2896,7 +3171,7 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_NOTIFICATION, l3m); + 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 @@ -2918,7 +3193,7 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m); + 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 @@ -2963,7 +3238,7 @@ void Pdss1::message_overlap(unsigned long epoint_id, int message_id, union param #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SETUP_ACKNOWLEDGE, l3m); + 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 @@ -3009,7 +3284,7 @@ void Pdss1::message_proceeding(unsigned long epoint_id, int message_id, union pa #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m); + 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 @@ -3031,12 +3306,11 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para /* NT-MODE in setup state we must send PROCEEDING first */ if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) { - CALL_PROCEEDING_t *proceeding; - /* 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 @@ -3058,7 +3332,7 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m); + 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 @@ -3092,7 +3366,7 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_ALERTING, l3m); + 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 @@ -3117,12 +3391,11 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param /* NT-MODE in setup state we must send PROCEEDING first */ if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) { - CALL_PROCEEDING_t *proceeding; - /* 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 @@ -3144,7 +3417,7 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m); + 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 @@ -3176,7 +3449,7 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m); + 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 @@ -3270,7 +3543,7 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param end_trace(); /* finally send message */ #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_CONNECT, l3m); + 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 @@ -3293,7 +3566,7 @@ void Pdss1::message_disconnect(unsigned long epoint_id, int message_id, union pa DISCONNECT_t *disconnect; RELEASE_COMPLETE_t *release_complete; #endif - struct message *message; + 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 */ @@ -3326,7 +3599,7 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m); + 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 @@ -3338,12 +3611,11 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) /* workarround: NT-MODE in setup state we must send PROCEEDING first to make it work */ if (p_state==PORT_STATE_IN_SETUP) { - CALL_PROCEEDING_t *proceeding; - /* 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 @@ -3365,7 +3637,7 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m); + 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 @@ -3407,7 +3679,7 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_DISCONNECT, l3m); + 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 @@ -3452,7 +3724,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE, l3m); + 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 @@ -3490,26 +3762,13 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m); + 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); -#if 0 - /* remove process */ - l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_CR_REQ, DIRECTION_OUT); - add_trace("callref", NULL, "0x%x", p_m_d_l3id); - end_trace(); - if (p_m_d_ntmode) - { - if ((p_m_d_l3id&0xff00) == 0xff00) - p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0; - } - p_m_d_l3id = 0; - p_m_delete = 1; -#endif // wait for callref to be released return; } @@ -3546,7 +3805,7 @@ wirklich erst proceeding?: #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m); + 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 @@ -3589,7 +3848,7 @@ wirklich erst proceeding?: #endif end_trace(); #ifdef SOCKET_MISDN - p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_DISCONNECT, l3m); + 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 @@ -3607,7 +3866,7 @@ wirklich erst proceeding?: */ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union parameter *param) { - struct message *message; + struct lcr_msg *message; if (PmISDN::message_epoint(epoint_id, message_id, param)) return(1); @@ -3656,6 +3915,9 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet } 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) { @@ -3681,6 +3943,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet // /* set timeout */ // p_m_mISDNport->l1timeout = now+3; } +#endif break; case MESSAGE_NOTIFY: /* display and notifications */ @@ -3776,20 +4039,34 @@ 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) + { + PDEBUG(DEBUG_ISDN, "ignoring dummy process from phone.\n"); + return(0); + } + /* find Port object of type ISDN */ port = port_first; while(port) { /* are we ISDN ? */ - if (port->p_type == PORT_TYPE_DSS1_NT_IN || port->p_type == PORT_TYPE_DSS1_NT_OUT) + 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 - && pdss1->p_m_d_l3id == pid) + if (pdss1->p_m_mISDNport == mISDNport) { - /* found port, the message belongs to */ - break; + 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 + { + /* remote callref, ref + channel id */ + if (pdss1->p_m_d_l3id == pid) + break; // found + } } } port = port->next; @@ -3798,25 +4075,46 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi /* aktueller prozess */ 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); + /* nt-library now gives us a new id via CC_SETUP_CONFIRM */ + if ((pdss1->p_m_d_l3id&MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER) + PERROR(" strange setup-procid 0x%x\n", pdss1->p_m_d_l3id); + pdss1->p_m_d_l3id = pid; + if (port->p_state == PORT_STATE_CONNECT) + pdss1->p_m_d_ces = pid >> 16; + add_trace("callref", "new", "0x%x", pdss1->p_m_d_l3id); + end_trace(); + return(0); + } /* if process id is master process, but a child disconnects */ -#warning hier das abfragen des child processes - if (0) + if (mISDNport->ntmode + && (pid & MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER + && (pdss1->p_m_d_l3id & MISDN_PID_CRTYPE_MASK) == MISDN_PID_MASTER) { - if (cmd == MT_DISCONNECT) + if (cmd == MT_DISCONNECT + || cmd == MT_RELEASE) { /* send special indication for child disconnect */ pdss1->disconnect_ind_i(cmd, pid, l3m); return(0); } - // ignoring other messages from child processes - return(0); + if (cmd == MT_RELEASE_COMPLETE) + return(0); } - /* if process id and layer 3 id matches */ - if (pid == pdss1->p_m_d_l3id) - { - pdss1->message_isdn(cmd, pid, l3m); + /* if we have child pid and got different child pid message, ignore */ + if (mISDNport->ntmode + && (pid & MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER + && (pdss1->p_m_d_l3id & MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER + && pid != pdss1->p_m_d_l3id) return(0); - } + + /* process message */ + pdss1->message_isdn(cmd, pid, l3m); + return(0); } /* d-message */ @@ -3840,7 +4138,7 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi break; case MT_FREE: - PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", hh->dinfo); + PDEBUG(DEBUG_ISDN, "unused call ref released (l3id=0x%x)\n", pid); break; case MT_RELEASE_COMPLETE: @@ -4046,7 +4344,6 @@ int stack2manager_nt(void *dat, void *arg) free_msg(msg); return(0); } -#endif // stacktomanager /* NOTE: te mode use iframe_t as header */ int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg) @@ -4111,7 +4408,10 @@ int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg) return(-EINVAL); } +#endif // stacktomanager + +#ifndef SOCKET_MISDN /* * sending message that were queued during L1 activation * or releasing port if link is down @@ -4120,7 +4420,7 @@ void setup_queue(struct mISDNport *mISDNport, int link) { class Port *port; class Pdss1 *pdss1; - struct message *message; + struct lcr_msg *message; if (!mISDNport->ntmode) return; @@ -4160,7 +4460,7 @@ void setup_queue(struct mISDNport *mISDNport, int link) } } - +#endif