From 258c2e57a441f1fd8ed779bb2d88992aba3c1e65 Mon Sep 17 00:00:00 2001 From: Super User Date: Sun, 13 Apr 2008 19:52:42 +0200 Subject: [PATCH] work on socket. (don't try yet) modified: Makefile modified: apppbx.cpp modified: bchannel.c modified: dss1.cpp modified: dss1.h modified: mISDN.cpp modified: mISDN.h deleted: q931.h modified: trace.h --- Makefile | 6 +- apppbx.cpp | 4 +- bchannel.c | 10 +- dss1.cpp | 491 ++++++++++++++++++++++++++++++++++++++++++++++--------------- dss1.h | 10 +- mISDN.cpp | 291 +++++++++++++++++++++++------------- mISDN.h | 6 +- q931.h | 95 ------------ trace.h | 8 +- 9 files changed, 588 insertions(+), 333 deletions(-) delete mode 100644 q931.h diff --git a/Makefile b/Makefile index a5dd458..89de77c 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,11 @@ WITH-CRYPTO = 42 # comment this out, if no libcrypto should be used INSTALL_BIN = /usr/local/bin INSTALL_DATA = /usr/local/lcr +ifdef WITH-SOCKET +LIBS += -lmISDN -lpthread +else LIBS += -lisdnnet -lmISDN -lpthread +endif CHANLIBS += -lmISDN # give location of the curses or ncurses library @@ -38,7 +42,7 @@ GEN = ./gentones GENW = ./genwave GENRC = ./genrc GENEXT = ./genextension -CFLAGS = -Wall -g -DINSTALL_DATA=\"$(INSTALL_DATA)\" -I/usr/include/mISDNuser/ +CFLAGS = -Wall -g -DINSTALL_DATA=\"$(INSTALL_DATA)\" #CFLAGS = -Wall -g -DINSTALL_DATA=\"$(INSTALL_DATA)\" ifdef WITH-CRYPTO CFLAGS += -DCRYPTO diff --git a/apppbx.cpp b/apppbx.cpp index bf89388..9560103 100644 --- a/apppbx.cpp +++ b/apppbx.cpp @@ -3881,12 +3881,12 @@ void EndpointAppPBX::join_join(void) { if (other_relation->epoint_id == other_eapp->ea_endpoint->ep_serial) { - /* detach other endpoint on hold */ + /* detach other endpoint on hold */ *other_relation_pointer = other_relation->next; FREE(other_relation, sizeof(struct join_relation)); cmemuse--; other_relation = *other_relation_pointer; - other_eapp->ea_endpoint->ep_join_id = NULL; + other_eapp->ea_endpoint->ep_join_id = 0; continue; } diff --git a/bchannel.c b/bchannel.c index fd4c8cc..dbc11d7 100644 --- a/bchannel.c +++ b/bchannel.c @@ -225,7 +225,7 @@ int bchannel_create(struct bchannel *channel) if (channel->b_sock) { - PERROR("Error: Socket already created for handle %d\n", channel->handle); + PERROR("Error: Socket already created for handle 0x%x\n", channel->handle); return(0); } @@ -233,7 +233,7 @@ int bchannel_create(struct bchannel *channel) channel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_L2DSP); if (channel->b_sock < 0) { - PERROR("Error: Failed to open bchannel-socket for handle %d with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", channel->handle); + PERROR("Error: Failed to open bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", channel->handle); return(0); } @@ -241,7 +241,7 @@ int bchannel_create(struct bchannel *channel) ret = ioctl(channel->b_sock, FIONBIO, &on); if (ret < 0) { - PERROR("Error: Failed to set bchannel-socket handle %d into nonblocking IO\n", channel->handle); + PERROR("Error: Failed to set bchannel-socket handle 0x%x into nonblocking IO\n", channel->handle); close(channel->b_sock); channel->b_sock = -1; return(0); @@ -251,10 +251,10 @@ int bchannel_create(struct bchannel *channel) addr.family = AF_ISDN; addr.dev = (channel->handle>>8)-1; addr.channel = channel->handle && 0xff; - ret = bind(di->bchan, (struct sockaddr *)&addr, sizeof(addr)); + ret = bind(channel->b_sock, (struct sockaddr *)&addr, sizeof(addr)); if (ret < 0) { - PERROR("Error: Failed to bind bchannel-socket for handle %d with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", channel->handle); + PERROR("Error: Failed to bind bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", channel->handle); close(channel->b_sock); channel->b_sock = -1; return(0); diff --git a/dss1.cpp b/dss1.cpp index 419223f..c6e6549 100644 --- a/dss1.cpp +++ b/dss1.cpp @@ -9,26 +9,26 @@ ** ** \*****************************************************************************/ - -#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 +#include +#include +extern unsigned long mt_assign_pid; +#endif -#include "q931.h" #include "ie.cpp" - /* * constructor */ @@ -59,12 +59,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 +140,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 +276,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 +361,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 @@ -517,7 +527,31 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data) class Endpoint *epoint; struct message *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 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_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; +#warning SOCKET TBD + // soll die ces wirklich von der pid abgeleitet werden oder kommt da noch ein "l3m->ces" ? + p_m_d_ces = pid >> 16; + end_trace(); +#else /* callref from nt-lib */ if (p_m_d_ntmode) { @@ -569,11 +603,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 +619,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 +835,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 @@ -854,9 +887,9 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data) 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)); @@ -904,8 +937,8 @@ void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void 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 +946,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); @@ -950,10 +987,10 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data) 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 +999,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); @@ -1045,10 +1086,10 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data) 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 +1099,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); @@ -1140,24 +1185,36 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data) int bchannel_before; if (p_m_d_ntmode) +#ifdef SOCKET_MISDN +#warning SOCKET TBD +// p_m_d_ces = connect->ces; +#else 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 +1290,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, p_m_d_l3id, l3m); #else msg_queue_tail(&p_m_mISDNport->downqueue, dmsg); #endif @@ -1262,8 +1319,8 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data) 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 +1357,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 +1417,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 @@ -1391,7 +1448,7 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data) 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 +1471,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 +1493,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 @@ -1458,7 +1518,7 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void * l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_IND, DIRECTION_IN); #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); #endif @@ -1534,8 +1594,8 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data) 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)); @@ -1624,7 +1684,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 +1725,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 @@ -1691,7 +1751,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data) 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 +1776,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 +1824,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 @@ -1791,7 +1851,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 +1874,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 +1934,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 @@ -1903,6 +1963,29 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data) struct message *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 +2002,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 +2053,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 +2109,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 @@ -2050,7 +2134,7 @@ void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data) 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 +2155,166 @@ 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_hex=0; + + switch (cmd) + { + case MT_TIMEOUT: +#warning SOCKET TBD +// if (p_m_d_ntmode) +// timer_hex = *((int *)(((char *)data)/*+headerlen*/)); + if (timer_hex==0x312) + { + l1l2l3_trace_header(p_m_mISDNport, this, L3_TIMEOUT_IND, DIRECTION_IN); + add_trace("timer", NULL, "%x", timer_hex); + end_trace(); + 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) + { + PERROR("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) + { + PERROR("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) + { + PERROR("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) + { + 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(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; +//#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 message *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; + + 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 +2325,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 +2473,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); @@ -2278,6 +2518,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data) end_trace(); } } +#endif void Pdss1::new_state(int state) { @@ -2335,17 +2576,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 +2620,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,16 +2636,17 @@ 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 */ @@ -2459,7 +2696,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 +2727,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 message *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) @@ -2535,6 +2795,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet // goto nomem; } add_trace("callref", "new", "0x%x", p_m_d_l3id); +#endif end_trace(); /* preparing setup message */ @@ -2747,7 +3008,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 +3046,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 +3157,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 +3179,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 +3224,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 +3270,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 +3292,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 +3318,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 +3352,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 +3377,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 +3403,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 +3435,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 +3529,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 @@ -3326,7 +3585,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 +3597,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 +3623,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 +3665,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 +3710,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 +3748,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 +3791,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 +3834,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 @@ -3656,6 +3901,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 +3929,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,6 +4025,12 @@ 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) + { + PERROR("PID is 0. change it.... quick...\n"); + return(-EINVAL); + } + /* find Port object of type ISDN */ port = port_first; while(port) @@ -3799,7 +4054,8 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi if (port) { /* if process id is master process, but a child disconnects */ -#warning hier das abfragen des child processes +#warning SOCKET TBD +//hier das abfragen des child processes if (0) { if (cmd == MT_DISCONNECT) @@ -3812,11 +4068,8 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi return(0); } /* if process id and layer 3 id matches */ - if (pid == pdss1->p_m_d_l3id) - { - pdss1->message_isdn(cmd, pid, l3m); - return(0); - } + pdss1->message_isdn(cmd, pid, l3m); + return(0); } /* d-message */ @@ -3840,7 +4093,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); + PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", pid); break; case MT_RELEASE_COMPLETE: @@ -4046,7 +4299,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 +4363,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 @@ -4160,7 +4415,7 @@ void setup_queue(struct mISDNport *mISDNport, int link) } } - +#endif diff --git a/dss1.h b/dss1.h index d3be055..8216e9c 100644 --- a/dss1.h +++ b/dss1.h @@ -15,11 +15,16 @@ class Pdss1 : public PmISDN public: Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive); ~Pdss1(); +#ifdef SOCKET_MISDN + unsigned int p_m_d_l3id; /* current l3 process id */ + void message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); +#else int p_m_d_l3id; /* current l3 process id */ + void message_isdn(unsigned long prim, unsigned long dinfo, void *data); +#endif int p_m_d_ces; /* ntmode: tei&sapi */ int handler(void); int message_epoint(unsigned long epoint_id, int message, union parameter *param); - void message_isdn(unsigned long prim, unsigned long dinfo, void *data); int p_m_d_ntmode; /* flags the nt-mode */ struct message *p_m_d_queue; /* queue for SETUP if link is down */ @@ -30,9 +35,9 @@ class Pdss1 : public PmISDN void new_state(int state); /* set new state */ // void isdn_show_send_message(unsigned long prim, msg_t *msg); - int received_first_reply_to_setup(unsigned long prim, int channel, int exclusive); int hunt_bchannel(int exclusive, int channel); #ifdef SOCKET_MISDN + int received_first_reply_to_setup(unsigned long cmd, int channel, int exclusive); void information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); void setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); void setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); @@ -51,6 +56,7 @@ class Pdss1 : public PmISDN void suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); void resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); #else + int received_first_reply_to_setup(unsigned long prim, int channel, int exclusive); void information_ind(unsigned long prim, unsigned long dinfo, void *data); void setup_ind(unsigned long prim, unsigned long dinfo, void *data); void setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void *data); diff --git a/mISDN.cpp b/mISDN.cpp index fd2625f..2ee2c49 100644 --- a/mISDN.cpp +++ b/mISDN.cpp @@ -5,12 +5,14 @@ **---------------------------------------------------------------------------** ** Copyright: Andreas Eversberg ** ** ** -** mISDN port abstraction for dss1 and sip ** +** mISDN port abstraction for dss1 ** ** ** \*****************************************************************************/ #include "main.h" +#include "myisdn.h" #ifndef SOCKET_MISDN +// old mISDN extern "C" { #include } @@ -55,6 +57,15 @@ extern "C" { #ifndef ISDN_PID_L4_B_USER #define ISDN_PID_L4_B_USER 0x440000ff #endif + +#else +// socket mISDN +#include +extern "C" { +} +#include +#include +#include #endif // timeouts if activating/deactivating response from mISDN got lost @@ -69,10 +80,14 @@ unsigned char mISDN_rand[256]; int mISDN_rand_count = 0; #ifdef SOCKET_MISDN +unsigned long mt_assign_pid = ~0; + int mISDNsocket = -1; int mISDN_initialize(void) { + char filename[256]; + /* try to open raw socket to check kernel */ mISDNsocket = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE); if (mISDNsocket < 0) @@ -84,14 +99,14 @@ int mISDN_initialize(void) /* open debug, if enabled and not only stack debugging */ if (options.deb && (options.deb != DEBUG_STACK)) { - SPRINT(debug_log, "%s/debug.log", INSTALL_DATA); - debug_fp = fopen(debug_log, "a"); + SPRINT(filename, "%s/debug.log", INSTALL_DATA); + debug_fp = fopen(filename, "a"); } if (options.deb & DEBUG_STACK) { - SPRINT(debug_stack, "%s/debug_mISDN.log", INSTALL_DATA); - mISDN_debug_init(DBGM_ALL, debug_stack, debug_stack, debug_stack); + SPRINT(filename, "%s/debug_mISDN.log", INSTALL_DATA); + mISDN_debug_init(0xffffffff, filename, filename, filename); } else mISDN_debug_init(0, NULL, NULL, NULL); @@ -174,7 +189,7 @@ void mISDN_deinitialize(void) debug_close(); global_debug = 0; - if (mISDNdevice >= 0) + if (mISDNdevice > -1) { /* free entity */ mISDN_write_frame(mISDNdevice, buff, 0, MGR_DELENTITY | REQUEST, entity, 0, NULL, TIMEOUT_1SEC); @@ -344,8 +359,8 @@ static struct isdn_message { {"MT_STATUS", L3_STATUS_REQ}, {"MT_RESTART", L3_RESTART_REQ}, #ifdef SOCKET_MISDN - {"MT_ASSIGN", L3_ASSIGN_REQ}, - {"MT_FREE", L3_FREE_REQ}, + {"MT_NEW_L3ID", L3_NEW_L3ID_REQ}, + {"MT_RELEASE_L3ID", L3_RELEASE_L3ID_REQ}, #else {"MT_NEW_CR", L3_NEW_CR_REQ}, {"MT_RELEASE_CR", L3_RELEASE_CR_REQ}, @@ -378,7 +393,11 @@ void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsign SCAT(msgtext, isdn_prim[msg&0x00000003]); /* add direction */ +#ifdef SOCKET_MISDN + if (direction && (msg&0xffffff00)!=L3_NEW_L3ID_REQ && (msg&0xffffff00)!=L3_RELEASE_L3ID_REQ) +#else if (direction && (msg&0xffffff00)!=L3_NEW_CR_REQ && (msg&0xffffff00)!=L3_RELEASE_CR_REQ) +#endif { if (mISDNport) { @@ -418,7 +437,7 @@ void ph_control(struct mISDNport *mISDNport, class PmISDN *isdnport, unsigned lo #ifdef SOCKET_MISDN unsigned char buffer[MISDN_HEADER_LEN+sizeof(int)+sizeof(int)]; struct mISDNhead *ctrl = (struct mISDNhead *)buffer; - unsigned long *d = buffer+MISDN_HEADER_LEN; + unsigned long *d = (unsigned long *)(buffer+MISDN_HEADER_LEN); int ret; ctrl->prim = PH_CONTROL_REQ; @@ -454,7 +473,7 @@ void ph_control_block(struct mISDNport *mISDNport, class PmISDN *isdnport, unsig #ifdef SOCKET_MISDN unsigned char buffer[MISDN_HEADER_LEN+sizeof(int)+c2_len]; struct mISDNhead *ctrl = (struct mISDNhead *)buffer; - unsigned long *d = buffer+MISDN_HEADER_LEN; + unsigned long *d = (unsigned long *)(buffer+MISDN_HEADER_LEN); int ret; ctrl->prim = PH_CONTROL_REQ; @@ -489,11 +508,10 @@ void ph_control_block(struct mISDNport *mISDNport, class PmISDN *isdnport, unsig */ static int _bchannel_create(struct mISDNport *mISDNport, int i) { - unsigned char buff[1024]; int ret; #ifdef SOCKET_MISDN unsigned long on = 1; - struct sockadd_mISDN addr; + struct sockaddr_mISDN addr; if (mISDNport->b_socket[i]) { @@ -521,9 +539,9 @@ static int _bchannel_create(struct mISDNport *mISDNport, int i) /* bind socket to bchannel */ addr.family = AF_ISDN; - addr.dev = mISDNport->port-1; + addr.dev = mISDNport->portnum-1; addr.channel = i+1+(i>=15); - ret = bind(di->bchan, (struct sockaddr *)&addr, sizeof(addr)); + ret = bind(mISDNport->b_socket[i], (struct sockaddr *)&addr, sizeof(addr)); if (ret < 0) { PERROR("Error: Failed to bind bchannel-socket for index %d with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", i); @@ -536,7 +554,10 @@ static int _bchannel_create(struct mISDNport *mISDNport, int i) add_trace("channel", NULL, "%d", i+1+(i>=15)); add_trace("socket", NULL, "%d", mISDNport->b_socket[i]); end_trace(); + + return(1); #else + unsigned char buff[1024]; layer_info_t li; mISDN_pid_t pid; @@ -602,13 +623,13 @@ static int _bchannel_create(struct mISDNport *mISDNport, int i) add_trace("stack", "id", "0x%08x", mISDNport->b_stid[i]); add_trace("stack", "address", "0x%08x", mISDNport->b_addr[i]); end_trace(); -#endif return(1); failed: mISDNport->b_addr[i] = 0; return(0); +#endif } @@ -1358,9 +1379,9 @@ void message_bchannel_from_join(class JoinRemote *joinremote, int type, unsigned while(i < ii) { #ifdef SOCKET_MISDN - if (mISDNport->b_socket[i] == handle) -#else if ((unsigned long)(mISDNport->portnum<<8)+i+1+(i>=15) == handle) +#else + if (mISDNport->b_addr[i] == handle) #endif break; i++; @@ -1371,7 +1392,7 @@ void message_bchannel_from_join(class JoinRemote *joinremote, int type, unsigned } if (!mISDNport) { - PERROR("received assign/remove ack for handle=%x, but handle does not exist in any mISDNport structure.\n", handle); + PERROR("received assign/remove ack for bchannel's handle=%x, but handle does not exist in any mISDNport structure.\n", handle); break; } /* mISDNport may now be set or NULL */ @@ -1486,7 +1507,7 @@ int PmISDN::handler(void) #ifdef SOCKET_MISDN unsigned char buf[MISDN_HEADER_LEN+tosend]; struct mISDNhead *frm = (struct mISDNhead *)buf; - unsigned long *d = buf+MISDN_HEADER_LEN; + unsigned char *p = buf+MISDN_HEADER_LEN; #else unsigned char buf[mISDN_HEADER_LEN+tosend]; iframe_t *frm = (iframe_t *)buf; @@ -1530,18 +1551,18 @@ int PmISDN::handler(void) #ifdef SOCKET_MISDN frm->prim = DL_DATA_REQ; frm->id = 0; - ret = sendto(handle, buffer, MISDN_HEADER_LEN+ISDN_LOAD-p_m_load-tosend, 0, NULL, 0); + ret = sendto(p_m_mISDNport->b_socket[p_m_b_index], buf, MISDN_HEADER_LEN+ISDN_LOAD-p_m_load-tosend, 0, NULL, 0); if (!ret) - PERROR("Failed to send to socket %d\n", handle); + PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_socket[p_m_b_index]); #else frm->prim = DL_DATA | REQUEST; frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN; frm->dinfo = 0; frm->len = ISDN_LOAD - p_m_load - tosend; -#endif if (frm->len) mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC); - p_m_load += frm->len; +#endif + p_m_load += ISDN_LOAD - p_m_load - tosend; } } @@ -1570,7 +1591,7 @@ int PmISDN::handler(void) * whenever we get audio data from bchannel, we process it here */ #ifdef SOCKET_MISDN -void PmISDN::bchannel_receive(mISDNhead *hh, unsigned char *data, int len) +void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len) { unsigned long cont = *((unsigned long *)data); #else @@ -1638,12 +1659,15 @@ void PmISDN::bchannel_receive(iframe_t *frm) return; } #ifdef SOCKET_MISDN - if (hh->prim == PH_SIGNAL_IND) + if (hh->prim == PH_CONTROL_IND) + { + switch(hh->id) #else - if (frm->prim == (PH_SIGNAL | INDICATION)) -#endif + if (frm->prim == (PH_SIGNAL | INDICATION) + || frm->prim == (PH_CONTROL | INDICATION)) { switch(frm->dinfo) +#endif { #ifndef OLD_MISDN case CMX_TX_DATA: @@ -1664,8 +1688,12 @@ void PmISDN::bchannel_receive(iframe_t *frm) #endif default: - chan_trace_header(p_m_mISDNport, this, "BCHANNEL signal", DIRECTION_IN); + chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); +#ifdef SOCKET_MISDN + add_trace("unknown", NULL, "0x%x", hh->id); +#else add_trace("unknown", NULL, "0x%x", frm->dinfo); +#endif end_trace(); } return; @@ -1776,7 +1804,7 @@ void PmISDN::set_tone(char *dir, char *tone) { nodsp: if (p_m_tone) - if (p_m_b_index >= 0) + if (p_m_b_index > -1) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) { PDEBUG(DEBUG_ISDN, "we reset tone from id=%d to OFF.\n", p_m_tone); @@ -1864,7 +1892,7 @@ void PmISDN::set_tone(char *dir, char *tone) /* set new tone */ p_m_tone = id; PDEBUG(DEBUG_ISDN, "we set tone to id=%d.\n", p_m_tone); - if (p_m_b_index >= 0) + if (p_m_b_index > -1) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) #ifdef SOCKET_MISDN ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_tone?TONE_PATT_ON:TONE_PATT_OFF, p_m_tone, "DSP-TONE", p_m_tone); @@ -1888,7 +1916,7 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union { p_m_tx_gain = param->mISDNsignal.tx_gain; PDEBUG(DEBUG_BCHANNEL, "we change tx-volume to shift=%d.\n", p_m_tx_gain); - if (p_m_b_index >= 0) + if (p_m_b_index > -1) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) #ifdef SOCKET_MISDN ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], VOL_CHANGE_TX, p_m_tx_gain, "DSP-TX_GAIN", p_m_tx_gain); @@ -1901,7 +1929,7 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union { p_m_rx_gain = param->mISDNsignal.rx_gain; PDEBUG(DEBUG_BCHANNEL, "we change rx-volume to shift=%d.\n", p_m_rx_gain); - if (p_m_b_index >= 0) + if (p_m_b_index > -1) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) #ifdef SOCKET_MISDN ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], VOL_CHANGE_RX, p_m_rx_gain, "DSP-RX_GAIN", p_m_rx_gain); @@ -1919,7 +1947,7 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union { p_m_conf = param->mISDNsignal.conf; PDEBUG(DEBUG_BCHANNEL, "we change conference to conf=%d.\n", p_m_conf); - if (p_m_b_index >= 0) + if (p_m_b_index > -1) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) #ifdef SOCKET_MISDN ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], (p_m_conf)?CMX_CONF_JOIN:CMX_CONF_SPLIT, p_m_conf, "DSP-CONF", p_m_conf); @@ -1948,7 +1976,7 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union p_m_delay = param->mISDNsignal.delay; PDEBUG(DEBUG_BCHANNEL, "we change delay mode to delay=%d.\n", p_m_delay); #ifndef OLD_MISDN - if (p_m_b_index >= 0) + if (p_m_b_index > -1) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) #ifdef SOCKET_MISDN ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_delay?CMX_DELAY:CMX_JITTER, p_m_delay, "DSP-DELAY", p_m_delay); @@ -1986,7 +2014,7 @@ void PmISDN::message_crypt(unsigned long epoint_id, int message_id, union parame memcpy(p_m_crypt_key, param->crypt.data, p_m_crypt_key_len); crypt_off: PDEBUG(DEBUG_BCHANNEL, "we set encryption to crypt=%d. (0 means OFF)\n", p_m_crypt); - if (p_m_b_index >= 0) + if (p_m_b_index > -1) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) #ifdef SOCKET_MISDN ph_control_block(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_crypt?BF_ENABLE_KEY:BF_DISABLE, p_m_crypt_key, p_m_crypt_key_len, "DSP-CRYPT", p_m_crypt_key_len); @@ -2077,7 +2105,7 @@ int mISDN_handler(void) struct mISDNport *mISDNport; class PmISDN *isdnport; int i; - char buffer[2048+MISDN_HEADER_LEN]; + unsigned char buffer[2048+MISDN_HEADER_LEN]; struct mISDNhead *hh = (struct mISDNhead *)buffer; /* process all ports */ @@ -2153,48 +2181,46 @@ int mISDN_handler(void) } /* handle message from bchannel */ - if (mISDNport->b_stack[i] > -1) + if (mISDNport->b_socket[i] > -1) { - ret = recv(mISDNport->b_stack[i], buffer, sizeof(buffer), 0); - if (ret >= MISDN_HEADER_LEN) + ret = recv(mISDNport->b_socket[i], buffer, sizeof(buffer), 0); + if (ret >= (int)MISDN_HEADER_LEN) { work = 1; switch(hh->prim) { /* we don't care about confirms, we use rx data to sync tx */ - case PH_DATA_CONF: - case DL_DATA_CONF: + case PH_DATA_CNF: break; /* we receive audio data, we respond to it AND we send tones */ case PH_DATA_IND: case DL_DATA_IND: - case PH_SIGNAL_IND: case PH_CONTROL_IND: if (mISDNport->b_port[i]) mISDNport->b_port[i]->bchannel_receive(hh, buffer+MISDN_HEADER_LEN, ret-MISDN_HEADER_LEN); else - PDEBUG(DEBUG_BCHANNEL, "b-channel is not associated to an ISDNPort (socket %d), ignoring.\n", mISDNport->b_stack[i]); + PDEBUG(DEBUG_BCHANNEL, "b-channel is not associated to an ISDNPort (socket %d), ignoring.\n", mISDNport->b_socket[i]); break; case PH_ACTIVATE_IND: case DL_ESTABLISH_IND: - case PH_ACTIVATE_CONF: - case DL_ESTABLISH_CONF: + case PH_ACTIVATE_CNF: + case DL_ESTABLISH_CNF: PDEBUG(DEBUG_BCHANNEL, "DL_ESTABLISH confirm: bchannel is now activated (socket %d).\n", mISDNport->b_socket[i]); bchannel_event(mISDNport, i, B_EVENT_ACTIVATED); break; case PH_DEACTIVATE_IND: case DL_RELEASE_IND: - case PH_DEACTIVATE_CONF: - case DL_RELEASE_CONF: + case PH_DEACTIVATE_CNF: + case DL_RELEASE_CNF: PDEBUG(DEBUG_BCHANNEL, "DL_RELEASE confirm: bchannel is now de-activated (socket %d).\n", mISDNport->b_socket[i]); bchannel_event(mISDNport, i, B_EVENT_DEACTIVATED); break; default: - PERROR("child message not handled: prim(0x%x) socket(%d) msg->len(%d)\n", hh->prim, mISDNport->b_socket[i], msg->len); + PERROR("child message not handled: prim(0x%x) socket(%d) msg->len(%d)\n", hh->prim, mISDNport->b_socket[i], ret-MISDN_HEADER_LEN); } } else { @@ -2219,9 +2245,10 @@ int mISDN_handler(void) { PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum); - mISDNport->ml3->to_layer2(mISDNport->ml3, DL_ESTABLISH_REQ); - l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT); - end_trace(); +#warning SOCKET TBD +// mISDNport->ml3->to_layer2(mISDNport->ml3, DL_ESTABLISH_REQ); +// l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT); +// end_trace(); return(1); } } @@ -2685,25 +2712,44 @@ int mISDN_handler(void) #ifdef SOCKET_MISDN int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3_msg *l3m) { - struct mISDNport *mISDNport = ml3->private; - + /* IMPORTAINT: + * + * l3m must be freed, except for MT_ASSIGN + * + */ + struct mISDNport *mISDNport = (struct mISDNport *)ml3->priv; + + /* special MT_ASSIGN handling: + * + * if we request a PID from mlayer, we always do it while lcr is locked. + * therefore we must check the MT_ASSIGN reply first before we lock. + * this is because the MT_ASSIGN reply is received with the requesting + * process, not by the mlayer thread! + * this means, that the reply is sent during call of the request. + * we must check if we get a reply and we know that we lcr is currently + * locked. + */ if (cmd == MT_ASSIGN) { - if (angeforderte, dann schreiben, weil wir ) - ueberdenken!!! + /* let's do some checking if someone changes stack behaviour */ + if (mt_assign_pid != 0) + FATAL("someone played with the mISDNuser stack. MT_ASSIGN not currently expected.\n"); + if ((pid >> 16) != MISDN_CES_MASTER) + FATAL("someone played with the mISDNuser stack. MT_ASSIGN is expected with master CES.\n"); + mt_assign_pid = pid; + return(0); } /* lock LCR */ pthread_mutex_lock(&mutex_lcr); - achtung MT_ASSIGN kommt hier an /* d-message */ switch(cmd) { -#warning shortstatus +#warning SOCKET TBD #if 0 case MGR_SHORTSTATUS_IND: - case MGR_SHORTSTATUS_CONF: + case MGR_SHORTSTATUS_CNF: switch(frm->dinfo) { case SSTATUS_L1_ACTIVATED: l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_IND, DIRECTION_IN); @@ -2725,15 +2771,13 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3 break; #endif +#warning SOCKET TBD +#if 0 case MT_L1ACTIVATE: l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_IND, DIRECTION_IN); end_trace(); // ss_act: mISDNport->l1link = 1; -#if 0 - if (mISDNport->ntmode) - setup_queue(mISDNport, 1); -#endif break; case MT_L1DEACTIVATE: @@ -2741,17 +2785,13 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3 end_trace(); // ss_deact: mISDNport->l1link = 0; -raus mit der setup-queue, da dies im stack geschieht -#if 0 - if (mISDNport->ntmode) - setup_queue(mISDNport, 0); -#endif break; case MT_L1CONTROL: PDEBUG(DEBUG_ISDN, "Received PH_CONTROL for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); // special config commands for interface (ip-address/LOS/AIS/RDI/SLIP) break; +#endif case MT_L2ESTABLISH: l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_IND, DIRECTION_IN); @@ -2801,15 +2841,14 @@ raus mit der setup-queue, da dies im stack geschieht struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, struct interface *interface) { int ret; - unsigned char buff[1025]; - iframe_t *frm = (iframe_t *)buff; struct mISDNport *mISDNport, **mISDNportp; int i, cnt; - int pri, bri, ports; + int pri, bri, pots; int nt, te; #ifdef SOCKET_MISDN - struct mlayer3 *ml3; +// struct mlayer3 *ml3; struct mISDN_devinfo devinfo; + unsigned int protocol, prop; ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt); if (ret < 0) @@ -2818,6 +2857,8 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, stru return(NULL); } #else + unsigned char buff[1025]; + iframe_t *frm = (iframe_t *)buff; // interface_info_t ii; net_stack_t *nst; manager_t *mgr; @@ -2839,14 +2880,14 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, stru return(NULL); } - pri = bri = ports = nt = te = 0; + pri = bri = pots = nt = te = 0; #ifdef SOCKET_MISDN devinfo.id = port - 1; - ret = ioctl(socket, IMGETDEVINFO, &devinfo); + ret = ioctl(mISDNsocket, IMGETDEVINFO, &devinfo); if (ret <= 0) { PERROR_RUNTIME("Cannot get device information for port %d. (ioctl IMGETDEVINFO failed ret=%d)\n", i, ret); - break; + return(NULL); } /* output the port info */ if (devinfo.Dprotocols & (1 << ISDN_P_TE_S0)) @@ -3010,13 +3051,18 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, stru /* allocate ressources of port */ #ifdef SOCKET_MISDN /* open layer 3 */ - protocol = (nt)?L3_PROTOCOL_DSS1_USER:L3_PROTOCOL_DSS1_NETWORK; + protocol = (nt)?L3_PROTOCOL_DSS1_USER:L3_PROTOCOL_DSS1_NET; prop = 0; - if (ptp) - prop |= FLG_PTP; - if (ptmp && pri) + if (ptp) // ptp forced + prop |= MISDN_FLG_PTP; +#warning SOCKET TBD +#if 0 + if (ptmp && pri) // ptmp forced prop |= FLG_FORCE_PTMP; - mISDNport->ml3 = open_layer3(port-1, protocol, prop , do_dchannel, mISDNport); +#endif + if (nt) // supports hold/retrieve on nt-mode + prop |= MISDN_FLG_NET_HOLD; + mISDNport->ml3 = open_layer3(port-1, protocol, prop , do_layer3, mISDNport); if (!mISDNport->ml3) { PERROR_RUNTIME("Cannot get layer(%d) id of port %d\n", nt?2:4, port); @@ -3156,7 +3202,7 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, stru { mISDNport->b_state[i] = B_STATE_IDLE; #ifdef SOCKET_MISDN - mISDNport->b_socket = -1; + mISDNport->b_socket[i] = -1; #else mISDNport->b_stid[i] = stinf->child[i]; PDEBUG(DEBUG_ISDN, "b_stid[%d] = 0x%x.\n", i, mISDNport->b_stid[i]); @@ -3164,6 +3210,17 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, stru i++; } +#ifdef SOCKET_MISDN + /* if ptp, pull up the link */ + if (mISDNport->ptp) + { +#warning SOCKET TBD +// mISDNport->ml3->to_layer2(mISDNport->ml3, DL_ESTABLISH_REQ); +// l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT); +// end_trace(); + time(&mISDNport->l2establish); + } +#else /* if te-mode, query state link */ if (!mISDNport->ntmode) { @@ -3175,6 +3232,7 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, stru act.dinfo = SSTATUS_BROADCAST_BIT | SSTATUS_ALL; act.len = 0; mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC); + time(&mISDNport->l2establish); } /* if ptp AND te-mode, pull up the link */ if (mISDNport->ptp && !mISDNport->ntmode) @@ -3186,6 +3244,10 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, stru act.dinfo = 0; act.len = 0; mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC); + time(&mISDNport->l2establish); + + l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT); + end_trace(); } /* if ptp AND nt-mode, pull up the link */ if (mISDNport->ptp && mISDNport->ntmode) @@ -3195,7 +3257,10 @@ struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, stru dmsg = create_l2msg(DL_ESTABLISH | REQUEST, 0, 0); if (mISDNport->nst.manager_l3(&mISDNport->nst, dmsg)) free_msg(dmsg); + l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT); + end_trace(); } +#endif /* initially, we assume that the link is down, exept for nt-ptmp */ mISDNport->l2link = (mISDNport->ntmode && !mISDNport->ptp)?1:0; @@ -3233,8 +3298,11 @@ void mISDNport_close(struct mISDNport *mISDNport) struct mISDNport **mISDNportp; class Port *port; class PmISDN *isdnport; +#ifdef SOCKET_MISDN +#else net_stack_t *nst; unsigned char buf[32]; +#endif int i; /* remove all port instance that are linked to this mISDNport */ @@ -3271,7 +3339,11 @@ void mISDNport_close(struct mISDNport *mISDNport) i = 0; while(i < mISDNport->b_num) { +#ifdef SOCKET_MISDN + if (mISDNport->b_socket[i] > -1) +#else if (mISDNport->b_addr[i]) +#endif { _bchannel_destroy(mISDNport, i); PDEBUG(DEBUG_BCHANNEL, "freeing %s port %d bchannel (index %d).\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, i); @@ -3338,17 +3410,15 @@ void mISDNport_close(struct mISDNport *mISDNport) void mISDN_port_info(void) { int ret; - int i, ii, p; + int i, ii; int useable, nt, te, pri, bri, pots; - unsigned char buff[1025]; - iframe_t *frm = (iframe_t *)buff; #ifdef SOCKET_MISDN struct mISDN_devinfo devinfo; - int socket; + int sock; /* open mISDN */ - socket = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE); - if (socket < 0) + sock = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE); + if (sock < 0) { fprintf(stderr, "Cannot open mISDN due to %s. (Does your Kernel support socket based mISDN?)\n", strerror(errno)); exit(EXIT_FAILURE); @@ -3356,13 +3426,16 @@ void mISDN_port_info(void) /* get number of stacks */ i = 1; - ret = ioctl(socket, IMGETCOUNT, &ii); + ret = ioctl(sock, IMGETCOUNT, &ii); if (ret < 0) { fprintf(stderr, "Cannot get number of mISDN devices. (ioctl IMGETCOUNT failed ret=%d)\n", ret); goto done; } #else + int p; + unsigned char buff[1025]; + iframe_t *frm = (iframe_t *)buff; stack_info_t *stinf; int device; @@ -3392,7 +3465,7 @@ void mISDN_port_info(void) #ifdef SOCKET_MISDN devinfo.id = i - 1; - ret = ioctl(socket, IMGETDEVINFO, &devinfo); + ret = ioctl(sock, IMGETDEVINFO, &devinfo); if (ret <= 0) { fprintf(stderr, "Cannot get device information for port %d. (ioctl IMGETDEVINFO failed ret=%d)\n", i, ret); @@ -3439,8 +3512,8 @@ void mISDN_port_info(void) nt = 1; } #endif - if ((te || nt) && (bri || pri || ports)) - usable = 1; + if ((te || nt) && (bri || pri || pots)) + useable = 1; if (te && bri) printf("TE-mode BRI S/T interface line (for phone lines)"); @@ -3454,18 +3527,18 @@ void mISDN_port_info(void) printf("FXS POTS interface port (for analog lines)"); if (nt && pots) printf("FXO POTS interface port (for analog phones)"); - if (ports) + if (pots) { - usable = 0; + useable = 0; printf("\n -> Analog interfaces are not supported."); } else - if (!usable) + if (!useable) { printf("unsupported interface protocol bits 0x%016x", devinfo.Dprotocols); } printf("\n"); - printf(" - %d B-channels\n", devinfo.nfbchan); + printf(" - %d B-channels\n", devinfo.nrbchan); #else ret = mISDN_get_stack_info(device, i, buff, sizeof(buff)); if (ret <= 0) @@ -3592,7 +3665,7 @@ void mISDN_port_info(void) done: #ifdef SOCKET_MISDN - close(sd); + close(sock); #else /* close mISDN */ if ((ret = mISDN_close(device))) @@ -3608,7 +3681,8 @@ void PmISDN::txfromup(unsigned char *data, int length) { #ifdef SOCKET_MISDN unsigned char buf[MISDN_HEADER_LEN+((length>ISDN_LOAD)?length:ISDN_LOAD)]; - struct mISDNhead *frm = (struct mISDNhead *)buf; + struct mISDNhead *hh = (struct mISDNhead *)buf; + int ret; if (p_m_b_index < 0) return; @@ -3636,11 +3710,22 @@ void PmISDN::txfromup(unsigned char *data, int length) */ if (p_m_load==0 && ISDN_LOAD>0) { - - memcpy(buf+mISDN_HEADER_LEN, data, ISDN_LOAD); +#ifdef SOCKET_MISDN + hh->prim = DL_DATA_REQ; + hh->id = 0; + memcpy(buf+MISDN_HEADER_LEN, data, ISDN_LOAD); + ret = sendto(p_m_mISDNport->b_socket[p_m_b_index], buf, MISDN_HEADER_LEN+ISDN_LOAD, 0, NULL, 0); + if (!ret) + PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_socket[p_m_b_index]); +#else + frm->prim = DL_DATA | REQUEST; + frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN; + frm->dinfo = 0; frm->len = ISDN_LOAD; - mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC); - p_m_load += frm->len; + memcpy(buf+mISDN_HEADER_LEN, data, ISDN_LOAD); + mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+ISDN_LOAD, TIMEOUT_1SEC); +#endif + p_m_load += ISDN_LOAD; } /* drop if load would exceed ISDN_MAXLOAD @@ -3651,12 +3736,12 @@ void PmISDN::txfromup(unsigned char *data, int length) /* make and send frame */ #ifdef SOCKET_MISDN - frm->prim = DL_DATA_REQ; - frm->id = 0; + hh->prim = DL_DATA_REQ; + hh->id = 0; memcpy(buf+MISDN_HEADER_LEN, data, length); ret = sendto(p_m_mISDNport->b_socket[p_m_b_index], buf, MISDN_HEADER_LEN+length, 0, NULL, 0); if (!ret) - PERROR("Failed to send to socket %d\n", handle); + PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_socket[p_m_b_index]); #else frm->prim = DL_DATA | REQUEST; frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN; diff --git a/mISDN.h b/mISDN.h index 4e0d40d..a7ef696 100644 --- a/mISDN.h +++ b/mISDN.h @@ -49,6 +49,7 @@ struct mISDNport { #ifdef SOCKET_MISDN int b_socket[128]; #else + int procids[256]; /* keep track of free ids */ int b_stid[128]; unsigned long b_addr[128]; #endif @@ -56,7 +57,6 @@ struct mISDNport { double b_timer[128]; /* timer for state machine */ unsigned long b_remote_id[128]; /* the socket currently exported */ unsigned long b_remote_ref[128]; /* the ref currently exported */ - int procids[128]; /* keep track of free ids */ int locally; /* local causes are sent as local causes not remote */ }; extern mISDNport *mISDNport_first; @@ -92,11 +92,11 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi void enc_ie_cause_standalone(unsigned char **ntmode, msg_t *msg, int location, int cause); int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg); int stack2manager_nt(void *dat, void *arg); +void setup_queue(struct mISDNport *mISDNport, int link); msg_t *create_l2msg(int prim, int dinfo, int size); #endif void ph_control(struct mISDNport *mISDNport, class PmISDN *isdnport, unsigned long handle, unsigned long c1, unsigned long c2, char *trace_name, int trace_value); void ph_control_block(struct mISDNport *mISDNport, unsigned long handle, unsigned long c1, void *c2, int c2_len, char *trace_name, int trace_value); -void setup_queue(struct mISDNport *mISDNport, int link); void chan_trace_header(struct mISDNport *mISDNport, class PmISDN *port, char *msgtext, int direction); void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long prim, int direction); void bchannel_event(struct mISDNport *mISDNport, int i, int event); @@ -110,7 +110,7 @@ class PmISDN : public Port PmISDN(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive); ~PmISDN(); #ifdef SOCKET_MISDN - void bchannel_receive(unsigned char *frm, int len); + void bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len); #else void bchannel_receive(iframe_t *frm); #endif diff --git a/q931.h b/q931.h deleted file mode 100644 index 7e4173e..0000000 --- a/q931.h +++ /dev/null @@ -1,95 +0,0 @@ -/*****************************************************************************\ -** ** -** PBX4Linux ** -** ** -**---------------------------------------------------------------------------** -** Copyright: Andreas Eversberg ** -** ** -** information elements support header ** -** ** -\*****************************************************************************/ - - -#ifndef SOCKET_MISDN - -#define MT_ALERTING 0x01 -#define MT_CALL_PROCEEDING 0x02 -#define MT_CONNECT 0x07 -#define MT_CONNECT_ACKNOWLEDGE 0x0f -#define MT_PROGRESS 0x03 -#define MT_SETUP 0x05 -#define MT_SETUP_ACKNOWLEDGE 0x0d -#define MT_RESUME 0x26 -#define MT_RESUME_ACKNOWLEDGE 0x2e -#define MT_RESUME_REJECT 0x22 -#define MT_SUSPEND 0x25 -#define MT_SUSPEND_ACKNOWLEDGE 0x2d -#define MT_SUSPEND_REJECT 0x21 -#define MT_USER_INFORMATION 0x20 -#define MT_DISCONNECT 0x45 -#define MT_RELEASE 0x4d -#define MT_RELEASE_COMPLETE 0x5a -#define MT_RESTART 0x46 -#define MT_RESTART_ACKNOWLEDGE 0x4e -#define MT_SEGMENT 0x60 -#define MT_CONGESTION_CONTROL 0x79 -#define MT_INFORMATION 0x7b -#define MT_FACILITY 0x62 -#define MT_NOTIFY 0x6e -#define MT_STATUS 0x7d -#define MT_STATUS_ENQUIRY 0x75 -#define MT_HOLD 0x24 -#define MT_HOLD_ACKNOWLEDGE 0x28 -#define MT_HOLD_REJECT 0x30 -#define MT_RETRIEVE 0x31 -#define MT_RETRIEVE_ACKNOWLEDGE 0x33 -#define MT_RETRIEVE_REJECT 0x37 - -#define IE_SEGMENT 0x00 -#define IE_BEARER 0x04 -#define IE_CAUSE 0x08 -#define IE_CALL_ID 0x10 -#define IE_CALL_STATE 0x14 -#define IE_CHANNEL_ID 0x18 -#define IE_FACILITY 0x1c -#define IE_PROGRESS 0x1e -#define IE_NET_FAC 0x20 -#define IE_NOTIFY 0x27 -#define IE_DISPLAY 0x28 -#define IE_DATE 0x29 -#define IE_KEYPAD 0x2c -#define IE_SIGNAL 0x34 -#define IE_INFORATE 0x40 -#define IE_E2E_TDELAY 0x42 -#define IE_TDELAY_SEL 0x43 -#define IE_PACK_BINPARA 0x44 -#define IE_PACK_WINSIZE 0x45 -#define IE_PACK_SIZE 0x46 -#define IE_CUG 0x47 -#define IE_REV_CHARGE 0x4a -#define IE_CONNECT_PN 0x4c -#define IE_CONNECT_SUB 0x4d -#define IE_CALLING_PN 0x6c -#define IE_CALLING_SUB 0x6d -#define IE_CALLED_PN 0x70 -#define IE_CALLED_SUB 0x71 -#define IE_REDIR_NR 0x74 -#define IE_REDIR_DN 0x76 -#define IE_TRANS_SEL 0x78 -#define IE_RESTART_IND 0x79 -#define IE_LLC 0x7c -#define IE_HLC 0x7d -#define IE_USER_USER 0x7e -#define IE_ESCAPE 0x7f -#define IE_CNIP 0x80 /* siemens centrex extension */ -#define IE_SHIFT 0x90 -#define IE_MORE_DATA 0xa0 -#define IE_COMPLETE 0xa1 -#define IE_CONGESTION 0xb0 -#define IE_REPEAT 0xd0 - -#endif - -#define CENTREX_FAC 0x88 -#define CENTREX_ID 0xa1 - diff --git a/trace.h b/trace.h index 43578e6..d6bc25d 100644 --- a/trace.h +++ b/trace.h @@ -93,10 +93,10 @@ #define L3_RETRIEVE_REJECT_REQ 0x00033700 #define L3_RETRIEVE_REJECT_IND 0x00033702 #ifdef SOCKET_MISDN -#define L3_ASSIGN_REQ 0x0003f000 -#define L3_ASSIGN_IND 0x0003f002 -#define L3_FREE_REQ 0x0003f100 -#define L3_FREE_IND 0x0003f102 +#define L3_NEW_L3ID_REQ 0x0003f000 +#define L3_NEW_L3ID_IND 0x0003f002 +#define L3_RELEASE_L3ID_REQ 0x0003f100 +#define L3_RELEASE_L3ID_IND 0x0003f102 #else #define L3_NEW_CR_REQ 0x0003f000 #define L3_NEW_CR_IND 0x0003f002 -- 2.13.6