X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.cpp;h=2ee2c491bbeb82ff6b84a43cdf1404f8d32a58f8;hp=63b2c2a9d1dba67b60cf14e001cde98aeacd487b;hb=258c2e57a441f1fd8ed779bb2d88992aba3c1e65;hpb=ce197cab91d66c14f11d818f343720a785dd616e diff --git a/mISDN.cpp b/mISDN.cpp index 63b2c2a..2ee2c49 100644 --- a/mISDN.cpp +++ b/mISDN.cpp @@ -5,37 +5,73 @@ **---------------------------------------------------------------------------** ** Copyright: Andreas Eversberg ** ** ** -** mISDN port abstraction for dss1 and sip ** +** mISDN port abstraction for dss1 ** ** ** \*****************************************************************************/ - #include "main.h" -#include -#include -#include -#include -#include -#include -#ifdef SOCKET_MISDN -#include -#include -#include -#include -#include -#include -#include -#include -#else +#include "myisdn.h" +#ifndef SOCKET_MISDN +// old mISDN extern "C" { -#include +#include } + +#ifndef CMX_TXDATA_ON +#define OLD_MISDN +#endif +#ifndef CMX_TXDATA_OFF +#define OLD_MISDN +#endif +#ifndef CMX_DELAY +#define OLD_MISDN +#endif +#ifndef PIPELINE_CFG +#define OLD_MISDN +#endif +#ifndef CMX_TX_DATA +#define OLD_MISDN +#endif + +#ifdef OLD_MISDN +#warning +#warning ********************************************************* +#warning * +#warning * It seems that you use an older version of mISDN. +#warning * Features like voice recording or echo will not work. +#warning * Also it causes problems with loading modules and may +#warning * not work at all. +#warning * +#warning * Please upgrade to newer version. A working version can +#warning * be found at www.linux-call-router.de. +#warning * +#warning * Do not use the mISDN_1_1 branch, it does not have all +#warning * the features that are required. Use the master branch +#warning * instead. +#warning * +#warning ********************************************************* +#warning +#error #endif #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 +#define B_TIMER_ACTIVATING 1 // seconds +#define B_TIMER_DEACTIVATING 1 // seconds + /* list of mISDN ports */ struct mISDNport *mISDNport_first; @@ -43,11 +79,15 @@ struct mISDNport *mISDNport_first; unsigned char mISDN_rand[256]; int mISDN_rand_count = 0; -#ifdef MISDN_SOCKET +#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) @@ -56,18 +96,19 @@ int mISDN_initialize(void) return(-1); } - /* initialize stuff of the NT lib */ + /* open debug, if enabled and not only stack debugging */ + if (options.deb && (options.deb != DEBUG_STACK)) + { + SPRINT(filename, "%s/debug.log", INSTALL_DATA); + debug_fp = fopen(filename, "a"); + } + if (options.deb & DEBUG_STACK) { - global_debug = 0xffffffff & ~DBGM_MSG; -// global_debug = DBGM_L3DATA; + SPRINT(filename, "%s/debug_mISDN.log", INSTALL_DATA); + mISDN_debug_init(0xffffffff, filename, filename, filename); } else - global_debug = DBGM_MAN; - SPRINT(debug_log, "%s/debug.log", INSTALL_DATA); - if (options.deb & DEBUG_LOG) - mISDN_debug_init(global_debug, debug_log, debug_log, debug_log); - else - mISDN_debug_init(global_debug, NULL, NULL, NULL); + mISDN_debug_init(0, NULL, NULL, NULL); /* init mlayer3 */ init_layer3(4); // buffer of 4 @@ -81,6 +122,10 @@ void mISDN_deinitialize(void) mISDN_debug_close(); + if (debug_fp) + fclose(debug_fp); + debug_fp = NULL; + if (mISDNsocket > -1) close(mISDNsocket); } @@ -142,8 +187,9 @@ void mISDN_deinitialize(void) unsigned char buff[1025]; 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); @@ -168,7 +214,8 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti p_m_b_reserve = 0; p_m_delete = 0; p_m_hold = 0; - p_m_txvol = p_m_rxvol = 0; + p_m_tx_gain = mISDNport->ifport->interface->tx_gain; + p_m_rx_gain = mISDNport->ifport->interface->rx_gain; p_m_conf = 0; p_m_txdata = 0; p_m_delay = 0; @@ -181,7 +228,8 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti p_m_timer = 0; p_m_remote_ref = 0; /* channel shall be exported to given remote */ p_m_remote_id = 0; /* channel shall be exported to given remote */ - + SCPY(p_m_pipeline, mISDNport->ifport->interface->pipeline); + /* audio */ p_m_load = 0; p_m_last_tv_sec = 0; @@ -194,13 +242,18 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti p_m_crypt_msg_len = 0; p_m_crypt_msg[0] = '\0'; p_m_crypt_msg_current = 0; - p_m_crypt_key[0] = '\0'; p_m_crypt_key_len = 0; p_m_crypt_listen = 0; p_m_crypt_listen_state = 0; p_m_crypt_listen_len = 0; p_m_crypt_listen_msg[0] = '\0'; p_m_crypt_listen_crc = 0; + if (mISDNport->ifport->interface->bf_len >= 4 && mISDNport->ifport->interface->bf_len <= 56) + { + memcpy(p_m_crypt_key, mISDNport->ifport->interface->bf_key, p_m_crypt_key_len); + p_m_crypt_key_len = mISDNport->ifport->interface->bf_len; + p_m_crypt = 1; + } /* if any channel requested by constructor */ if (channel == CHANNEL_ANY) @@ -272,41 +325,46 @@ static struct isdn_message { char *name; unsigned long value; } isdn_message[] = { - {"TIMEOUT", CC_TIMEOUT}, - {"SETUP", CC_SETUP}, - {"SETUP_ACK", CC_SETUP_ACKNOWLEDGE}, - {"PROCEEDING", CC_PROCEEDING}, - {"ALERTING", CC_ALERTING}, - {"CONNECT", CC_CONNECT}, - {"CONNECT RES", CC_CONNECT}, - {"CONNECT_ACK", CC_CONNECT_ACKNOWLEDGE}, - {"DISCONNECT", CC_DISCONNECT}, - {"RELEASE", CC_RELEASE}, - {"RELEASE_COMP", CC_RELEASE_COMPLETE}, - {"INFORMATION", CC_INFORMATION}, - {"PROGRESS", CC_PROGRESS}, - {"NOTIFY", CC_NOTIFY}, - {"SUSPEND", CC_SUSPEND}, - {"SUSPEND_ACK", CC_SUSPEND_ACKNOWLEDGE}, - {"SUSPEND_REJ", CC_SUSPEND_REJECT}, - {"RESUME", CC_RESUME}, - {"RESUME_ACK", CC_RESUME_ACKNOWLEDGE}, - {"RESUME_REJ", CC_RESUME_REJECT}, - {"HOLD", CC_HOLD}, - {"HOLD_ACK", CC_HOLD_ACKNOWLEDGE}, - {"HOLD_REJ", CC_HOLD_REJECT}, - {"RETRIEVE", CC_RETRIEVE}, - {"RETRIEVE_ACK", CC_RETRIEVE_ACKNOWLEDGE}, - {"RETRIEVE_REJ", CC_RETRIEVE_REJECT}, - {"FACILITY", CC_FACILITY}, - {"STATUS", CC_STATUS}, - {"RESTART", CC_RESTART}, - {"RELEASE_CR", CC_RELEASE_CR}, - {"NEW_CR", CC_NEW_CR}, - {"DL_ESTABLISH", DL_ESTABLISH}, - {"DL_RELEASE", DL_RELEASE}, - {"PH_ACTIVATE", PH_ACTIVATE}, - {"PH_DEACTIVATE", PH_DEACTIVATE}, + {"PH_ACTIVATE", L1_ACTIVATE_REQ}, + {"PH_DEACTIVATE", L1_DEACTIVATE_REQ}, + {"DL_ESTABLISH", L2_ESTABLISH_REQ}, + {"DL_RELEASE", L2_RELEASE_REQ}, + {"UNKNOWN", L3_UNKNOWN}, + {"MT_TIMEOUT", L3_TIMEOUT_REQ}, + {"MT_SETUP", L3_SETUP_REQ}, + {"MT_SETUP_ACK", L3_SETUP_ACKNOWLEDGE_REQ}, + {"MT_PROCEEDING", L3_PROCEEDING_REQ}, + {"MT_ALERTING", L3_ALERTING_REQ}, + {"MT_CONNECT", L3_CONNECT_REQ}, + {"MT_CONNECT_ACK", L3_CONNECT_ACKNOWLEDGE_REQ}, + {"MT_DISCONNECT", L3_DISCONNECT_REQ}, + {"MT_RELEASE", L3_RELEASE_REQ}, + {"MT_RELEASE_COMP", L3_RELEASE_COMPLETE_REQ}, + {"MT_INFORMATION", L3_INFORMATION_REQ}, + {"MT_PROGRESS", L3_PROGRESS_REQ}, + {"MT_NOTIFY", L3_NOTIFY_REQ}, + {"MT_SUSPEND", L3_SUSPEND_REQ}, + {"MT_SUSPEND_ACK", L3_SUSPEND_ACKNOWLEDGE_REQ}, + {"MT_SUSPEND_REJ", L3_SUSPEND_REJECT_REQ}, + {"MT_RESUME", L3_RESUME_REQ}, + {"MT_RESUME_ACK", L3_RESUME_ACKNOWLEDGE_REQ}, + {"MT_RESUME_REJ", L3_RESUME_REJECT_REQ}, + {"MT_HOLD", L3_HOLD_REQ}, + {"MT_HOLD_ACK", L3_HOLD_ACKNOWLEDGE_REQ}, + {"MT_HOLD_REJ", L3_HOLD_REJECT_REQ}, + {"MT_RETRIEVE", L3_RETRIEVE_REQ}, + {"MT_RETRIEVE_ACK", L3_RETRIEVE_ACKNOWLEDGE_REQ}, + {"MT_RETRIEVE_REJ", L3_RETRIEVE_REJECT_REQ}, + {"MT_FACILITY", L3_FACILITY_REQ}, + {"MT_STATUS", L3_STATUS_REQ}, + {"MT_RESTART", L3_RESTART_REQ}, +#ifdef SOCKET_MISDN + {"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}, +#endif {NULL, 0}, }; @@ -316,7 +374,7 @@ static char *isdn_prim[4] = { " INDICATION", " RESPONSE", }; -void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long prim, int direction) +void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long msg, int direction) { int i; char msgtext[64] = "<>"; @@ -325,17 +383,21 @@ void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsign i = 0; while(isdn_message[i].name) { - if (isdn_message[i].value == (prim&0xffffff00)) + if (isdn_message[i].value == (msg&0xffffff00)) { SCPY(msgtext, isdn_message[i].name); break; } i++; } - SCAT(msgtext, isdn_prim[prim&0x00000003]); + SCAT(msgtext, isdn_prim[msg&0x00000003]); /* add direction */ - if (direction && (prim&0xffffff00)!=CC_NEW_CR && (prim&0xffffff00)!=CC_RELEASE_CR) +#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) { @@ -375,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; @@ -411,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; @@ -446,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]) { @@ -460,7 +521,7 @@ static int _bchannel_create(struct mISDNport *mISDNport, int i) /* open socket */ mISDNport->b_socket[i] = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_L2DSP); - if (mISDNport->b_socket[i]) + if (mISDNport->b_socket[i] < 0) { PERROR("Error: Failed to open bchannel-socket for index %d with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", i); return(0); @@ -478,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); @@ -493,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; @@ -559,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 } @@ -598,6 +662,8 @@ static void _bchannel_activate(struct mISDNport *mISDNport, int i, int activate) /* trace */ chan_trace_header(mISDNport, mISDNport->b_port[i], activate?(char*)"BCHANNEL activate":(char*)"BCHANNEL deactivate", DIRECTION_OUT); add_trace("channel", NULL, "%d", i+1+(i>=15)); + if (mISDNport->b_timer[i]) + add_trace("event", NULL, "timeout recovery"); end_trace(); } @@ -626,14 +692,20 @@ static void _bchannel_configure(struct mISDNport *mISDNport, int i) } /* set dsp features */ +#ifndef OLD_MISDN if (port->p_m_txdata) ph_control(mISDNport, port, handle, (port->p_m_txdata)?CMX_TXDATA_ON:CMX_TXDATA_OFF, 0, "DSP-TXDATA", port->p_m_txdata); if (port->p_m_delay) ph_control(mISDNport, port, handle, CMX_DELAY, port->p_m_delay, "DSP-DELAY", port->p_m_delay); - if (port->p_m_txvol) - ph_control(mISDNport, port, handle, VOL_CHANGE_TX, port->p_m_txvol, "DSP-TXVOL", port->p_m_txvol); - if (port->p_m_rxvol) - ph_control(mISDNport, port, handle, VOL_CHANGE_RX, port->p_m_rxvol, "DSP-RXVOL", port->p_m_rxvol); +#endif + if (port->p_m_tx_gain) + ph_control(mISDNport, port, handle, VOL_CHANGE_TX, port->p_m_tx_gain, "DSP-TX_GAIN", port->p_m_tx_gain); + if (port->p_m_rx_gain) + ph_control(mISDNport, port, handle, VOL_CHANGE_RX, port->p_m_rx_gain, "DSP-RX_GAIN", port->p_m_rx_gain); +#ifndef OLD_MISDN + if (port->p_m_pipeline[0]) + ph_control_block(mISDNport, port, handle, PIPELINE_CFG, port->p_m_pipeline, strlen(port->p_m_pipeline)+1, "DSP-PIPELINE", 0); +#endif if (port->p_m_conf) ph_control(mISDNport, port, handle, CMX_CONF_JOIN, port->p_m_conf, "DSP-CONF", port->p_m_conf); if (port->p_m_echo) @@ -777,18 +849,31 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) { class PmISDN *b_port = mISDNport->b_port[i]; int state = mISDNport->b_state[i]; + double timer = mISDNport->b_timer[i]; unsigned long p_m_remote_ref = 0; unsigned long p_m_remote_id = 0; + int p_m_tx_gain = 0; + int p_m_rx_gain = 0; + char *p_m_pipeline = NULL; + unsigned char *p_m_crypt_key = NULL; + int p_m_crypt_key_len = 0; + int p_m_crypt_key_type = 0; #ifdef SOCKET_MISDN - unsigned long handle = mISDNport->b_addr[i]; + unsigned long portid = (mISDNport->portnum<<8) + i+1+(i>=15); #else - int handle = mISDNport->b_addr[i]; + unsigned long portid = mISDNport->b_stid[i]; #endif if (b_port) { p_m_remote_id = b_port->p_m_remote_id; p_m_remote_ref = b_port->p_m_remote_ref; + p_m_tx_gain = b_port->p_m_tx_gain; + p_m_rx_gain = b_port->p_m_rx_gain; + p_m_pipeline = b_port->p_m_pipeline; + p_m_crypt_key = b_port->p_m_crypt_key; + p_m_crypt_key_len = b_port->p_m_crypt_key_len; + p_m_crypt_key_type = /*b_port->p_m_crypt_key_type*/1; } switch(event) @@ -803,13 +888,13 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) if (p_m_remote_ref) { /* export bchannel */ - message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, handle); + message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type); chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); add_trace("type", NULL, "assign"); #ifdef SOCKET_MISDN - add_trace("stack", "address", "%x", handle); + add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); #else - add_trace("socket", "id", "%d", handle); + add_trace("socket", "id", "%d", portid); #endif end_trace(); state = B_STATE_EXPORTING; @@ -822,6 +907,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) { _bchannel_activate(mISDNport, i, 1); state = B_STATE_ACTIVATING; + timer = now_d + B_TIMER_ACTIVATING; } } break; @@ -858,13 +944,13 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) /* in case, the bchannel is exported right after seize_bchannel */ /* export bchannel */ /* p_m_remote_id is set, when this event happens. */ - message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, handle); + message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type); chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); add_trace("type", NULL, "assign"); #ifdef SOCKET_MISDN - add_trace("stack", "address", "%x", handle); + add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); #else - add_trace("socket", "id", "%d", handle); + add_trace("socket", "id", "%d", portid); #endif end_trace(); state = B_STATE_EXPORTING; @@ -886,6 +972,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) /* bchannel is active, so we deactivate */ _bchannel_activate(mISDNport, i, 0); state = B_STATE_DEACTIVATING; + timer = now_d + B_TIMER_DEACTIVATING; break; default: @@ -898,6 +985,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) break; case B_EVENT_ACTIVATED: + timer = 0; switch(state) { case B_STATE_ACTIVATING: @@ -911,6 +999,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) /* bchannel is active, but exported OR not used anymore (or has wrong stack config), so we deactivate */ _bchannel_activate(mISDNport, i, 0); state = B_STATE_DEACTIVATING; + timer = now_d + B_TIMER_DEACTIVATING; } break; @@ -933,13 +1022,13 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) * OR bchannel is not used anymore * OR bchannel has been exported to an obsolete ref, * so reimport, to later export to new remote */ - message_bchannel_to_join(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, handle); + message_bchannel_to_join(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0); chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); add_trace("type", NULL, "remove"); #ifdef SOCKET_MISDN - add_trace("stack", "address", "%x", handle); + add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); #else - add_trace("socket", "id", "%d", handle); + add_trace("socket", "id", "%d", portid); #endif end_trace(); state = B_STATE_IMPORTING; @@ -969,17 +1058,18 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) /* bchannel is active, so we deactivate */ _bchannel_activate(mISDNport, i, 0); state = B_STATE_DEACTIVATING; + timer = now_d + B_TIMER_DEACTIVATING; break; case B_STATE_REMOTE: /* bchannel is exported, so we re-import */ - message_bchannel_to_join(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, handle); + message_bchannel_to_join(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0); chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); add_trace("type", NULL, "remove"); #ifdef SOCKET_MISDN - add_trace("stack", "address", "%x", handle); + add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); #else - add_trace("socket", "id", "%d", handle); + add_trace("socket", "id", "%d", portid); #endif end_trace(); state = B_STATE_IMPORTING; @@ -996,6 +1086,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) break; case B_EVENT_DEACTIVATED: + timer = 0; switch(state) { case B_STATE_IDLE: @@ -1010,13 +1101,13 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) /* bchannel is now deactivate, but is requied by Port class, so we reactivate / export */ if (p_m_remote_ref) { - message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, handle); + message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type); chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); add_trace("type", NULL, "assign"); #ifdef SOCKET_MISDN - add_trace("stack", "address", "%x", handle); + add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); #else - add_trace("socket", "id", "%d", handle); + add_trace("socket", "id", "%d", portid); #endif end_trace(); state = B_STATE_EXPORTING; @@ -1028,6 +1119,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) { _bchannel_activate(mISDNport, i, 1); state = B_STATE_ACTIVATING; + timer = now_d + B_TIMER_ACTIVATING; } } } @@ -1050,13 +1142,13 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) /* bchannel is now imported, but is requied by Port class, so we reactivate / export */ if (p_m_remote_ref) { - message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, handle); + message_bchannel_to_join(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type); chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); add_trace("type", NULL, "assign"); #ifdef SOCKET_MISDN - add_trace("stack", "address", "%x", handle); + add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); #else - add_trace("socket", "id", "%d", handle); + add_trace("socket", "id", "%d", portid); #endif end_trace(); state = B_STATE_EXPORTING; @@ -1068,6 +1160,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) { _bchannel_activate(mISDNport, i, 1); state = B_STATE_ACTIVATING; + timer = now_d + B_TIMER_ACTIVATING; } } } @@ -1079,11 +1172,35 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) } break; + case B_EVENT_TIMEOUT: + timer = 0; + switch(state) + { + case B_STATE_IDLE: + /* ignore due to deactivation confirm after unloading */ + break; + + case B_STATE_ACTIVATING: + _bchannel_activate(mISDNport, i, 1); + timer = now_d + B_TIMER_ACTIVATING; + break; + + case B_STATE_DEACTIVATING: + _bchannel_activate(mISDNport, i, 0); + timer = now_d + B_TIMER_DEACTIVATING; + break; + + default: + PERROR("Illegal event %d at state %d, please correct.\n", event, state); + } + break; + default: PERROR("Illegal event %d, please correct.\n", event); } mISDNport->b_state[i] = state; + mISDNport->b_timer[i] = timer; } @@ -1173,15 +1290,14 @@ seize: */ void PmISDN::drop_bchannel(void) { - if (p_m_b_index < 0) - return; - /* unreserve channel */ if (p_m_b_reserve) p_m_mISDNport->b_reserved--; p_m_b_reserve = 0; /* if not in use */ + if (p_m_b_index < 0) + return; if (!p_m_b_channel) return; @@ -1263,7 +1379,7 @@ void message_bchannel_from_join(class JoinRemote *joinremote, int type, unsigned while(i < ii) { #ifdef SOCKET_MISDN - if (mISDNport->b_socket[i] == handle) + if ((unsigned long)(mISDNport->portnum<<8)+i+1+(i>=15) == handle) #else if (mISDNport->b_addr[i] == handle) #endif @@ -1276,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 */ @@ -1383,13 +1499,15 @@ int PmISDN::handler(void) p_m_load = 0; /* to send data, tone must be active OR crypt messages must be on */ - if ((p_tone_name[0] || p_m_crypt_msg_loops) && p_m_load < ISDN_LOAD) + if ((p_tone_name[0] || p_m_crypt_msg_loops) + && (p_m_load < ISDN_LOAD) + && (p_state==PORT_STATE_CONNECT || p_m_mISDNport->tones)) { int tosend = ISDN_LOAD - p_m_load, length; #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; @@ -1416,6 +1534,7 @@ int PmISDN::handler(void) /* next loop */ p_m_crypt_msg_current = 0; p_m_crypt_msg_loops--; +// puts("eine loop weniger"); } /* new length */ @@ -1432,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; } } @@ -1472,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 @@ -1532,6 +1651,25 @@ void PmISDN::bchannel_receive(iframe_t *frm) message_put(message); break; + default: + chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); + add_trace("unknown", NULL, "0x%x", cont); + end_trace(); + } + return; + } +#ifdef SOCKET_MISDN + if (hh->prim == PH_CONTROL_IND) + { + switch(hh->id) +#else + if (frm->prim == (PH_SIGNAL | INDICATION) + || frm->prim == (PH_CONTROL | INDICATION)) + { + switch(frm->dinfo) +#endif + { +#ifndef OLD_MISDN case CMX_TX_DATA: if (!p_m_txdata) { @@ -1539,13 +1677,23 @@ void PmISDN::bchannel_receive(iframe_t *frm) PDEBUG(DEBUG_BCHANNEL, "PmISDN(%s) ignoring tx data, because 'txdata' is turned off\n", p_name); return; } + /* see below (same condition) */ + if (p_state!=PORT_STATE_CONNECT + && !p_m_mISDNport->tones) + break; +// printf(".");fflush(stdout);return; if (p_record) - record((unsigned char *)(cont+1), len - 4, 1); // from up + record(data, len, 1); // from up break; +#endif default: chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); - add_trace("unknown", NULL, "0x%x", cont); +#ifdef SOCKET_MISDN + add_trace("unknown", NULL, "0x%x", hh->id); +#else + add_trace("unknown", NULL, "0x%x", frm->dinfo); +#endif end_trace(); } return; @@ -1561,14 +1709,13 @@ void PmISDN::bchannel_receive(iframe_t *frm) #endif return; } - /* calls will not process any audio data unless * the call is connected OR interface features audio during call setup. */ //printf("%d -> %d prim=%x joindata=%d tones=%d\n", p_serial, ACTIVE_EPOINT(p_epointlist), frm->prim, p_m_joindata, p_m_mISDNport->earlyb); #ifndef DEBUG_COREBRIDGE if (p_state!=PORT_STATE_CONNECT - && !p_m_mISDNport->earlyb) + && !p_m_mISDNport->tones) return; #endif @@ -1657,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); @@ -1745,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); @@ -1765,32 +1912,32 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union switch(param->mISDNsignal.message) { case mISDNSIGNAL_VOLUME: - if (p_m_txvol != param->mISDNsignal.txvol) + if (p_m_tx_gain != param->mISDNsignal.tx_gain) { - p_m_txvol = param->mISDNsignal.txvol; - PDEBUG(DEBUG_BCHANNEL, "we change tx-volume to shift=%d.\n", p_m_txvol); - if (p_m_b_index >= 0) + 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 > -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_txvol, "DSP-TXVOL", p_m_txvol); + 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); #else - ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], VOL_CHANGE_TX, p_m_txvol, "DSP-TXVOL", p_m_txvol); + ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], VOL_CHANGE_TX, p_m_tx_gain, "DSP-TX_GAIN", p_m_tx_gain); #endif } else - PDEBUG(DEBUG_BCHANNEL, "we already have tx-volume shift=%d.\n", p_m_rxvol); - if (p_m_rxvol != param->mISDNsignal.rxvol) + PDEBUG(DEBUG_BCHANNEL, "we already have tx-volume shift=%d.\n", p_m_rx_gain); + if (p_m_rx_gain != param->mISDNsignal.rx_gain) { - p_m_rxvol = param->mISDNsignal.rxvol; - PDEBUG(DEBUG_BCHANNEL, "we change rx-volume to shift=%d.\n", p_m_rxvol); - if (p_m_b_index >= 0) + 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 > -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_rxvol, "DSP-RXVOL", p_m_rxvol); + 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); #else - ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], VOL_CHANGE_RX, p_m_rxvol, "DSP-RXVOL", p_m_rxvol); + ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], VOL_CHANGE_RX, p_m_rx_gain, "DSP-RX_GAIN", p_m_rx_gain); #endif } else - PDEBUG(DEBUG_BCHANNEL, "we already have rx-volume shift=%d.\n", p_m_rxvol); + PDEBUG(DEBUG_BCHANNEL, "we already have rx-volume shift=%d.\n", p_m_rx_gain); break; case mISDNSIGNAL_CONF: @@ -1800,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); @@ -1828,13 +1975,15 @@ 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); - if (p_m_b_index >= 0) +#ifndef OLD_MISDN + 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); #else ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_delay?CMX_DELAY:CMX_JITTER, p_m_delay, "DSP-DELAY", p_m_delay); #endif +#endif } else PDEBUG(DEBUG_BCHANNEL, "we already have delay=%d.\n", p_m_delay); break; @@ -1865,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); @@ -1896,7 +2045,7 @@ void PmISDN::message_crypt(unsigned long epoint_id, int message_id, union parame break; } p_m_crypt_msg_current = 0; /* reset */ - p_m_crypt_msg_loops = 3; /* enable */ + p_m_crypt_msg_loops = 6; /* enable */ #if 0 /* disable txmix, or we get corrupt data due to audio process */ if (p_m_txmix && p_m_b_index>=0) @@ -1947,19 +2096,182 @@ int PmISDN::message_epoint(unsigned long epoint_id, int message_id, union parame /* - * main loop for processing messages from mISDN device + * main loop for processing messages from mISDN */ +#ifdef SOCKET_MISDN +int mISDN_handler(void) +{ + int ret, work = 0; + struct mISDNport *mISDNport; + class PmISDN *isdnport; + int i; + unsigned char buffer[2048+MISDN_HEADER_LEN]; + struct mISDNhead *hh = (struct mISDNhead *)buffer; + + /* process all ports */ + mISDNport = mISDNport_first; + while(mISDNport) + { + /* process all bchannels */ + i = 0; + while(i < mISDNport->b_num) + { + /* process timer events for bchannel handling */ + if (mISDNport->b_timer[i]) + { + if (mISDNport->b_timer[i] <= now_d) + bchannel_event(mISDNport, i, B_EVENT_TIMEOUT); + } + /* handle port of bchannel */ + isdnport=mISDNport->b_port[i]; + if (isdnport) + { + /* call bridges in user space OR crypto OR recording */ + if (isdnport->p_m_joindata || isdnport->p_m_crypt_msg_loops || isdnport->p_m_crypt_listen || isdnport->p_record) + { + /* rx IS required */ + if (isdnport->p_m_rxoff) + { + /* turn on RX */ + isdnport->p_m_rxoff = 0; + PDEBUG(DEBUG_BCHANNEL, "%s: receive data is required, so we turn them on\n"); + if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE) + ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], CMX_RECEIVE_ON, 0, "DSP-RXOFF", 0); + return(1); + } + } else + { + /* rx NOT required */ + if (!isdnport->p_m_rxoff) + { + /* turn off RX */ + isdnport->p_m_rxoff = 1; + PDEBUG(DEBUG_BCHANNEL, "%s: receive data is not required, so we turn them off\n"); + if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE) + ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], CMX_RECEIVE_OFF, 0, "DSP-RXOFF", 1); + return(1); + } + } + /* recording */ + if (isdnport->p_record) + { + /* txdata IS required */ + if (!isdnport->p_m_txdata) + { + /* turn on RX */ + isdnport->p_m_txdata = 1; + PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is required, so we turn them on\n"); + if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE) + ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], CMX_TXDATA_ON, 0, "DSP-TXDATA", 1); + return(1); + } + } else + { + /* txdata NOT required */ + if (isdnport->p_m_txdata) + { + /* turn off RX */ + isdnport->p_m_txdata = 0; + PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is not required, so we turn them off\n"); + if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE) + ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], CMX_TXDATA_OFF, 0, "DSP-TXDATA", 0); + return(1); + } + } + } + + /* handle message from bchannel */ + if (mISDNport->b_socket[i] > -1) + { + 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_CNF: + break; + + /* we receive audio data, we respond to it AND we send tones */ + case PH_DATA_IND: + case DL_DATA_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_socket[i]); + break; + + case PH_ACTIVATE_IND: + case DL_ESTABLISH_IND: + 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_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], ret-MISDN_HEADER_LEN); + } + } else + { + if (ret < 0 && errno != EWOULDBLOCK) + PERROR("Read from port %d, index %d failed with return code %d\n", mISDNport->portnum, i, ret); + } + } + + i++; + } +#if 0 + if (mISDNport->l1timeout && now>mISDNport->l1timeout) + { ---} + PDEBUG(DEBUG_ISDN, "the L1 establish timer expired, we release all pending messages.\n", mISDNport->portnum); + mISDNport->l1timeout = 0; +#endif + + /* layer 2 establish timer */ + if (mISDNport->l2establish) + { + if (now-mISDNport->l2establish > 5) + { + + PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum); +#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); + } + } + + + mISDNport = mISDNport->next; + } + + /* if we received at least one b-frame, we will return 1 */ + return(work); +} +#else int mISDN_handler(void) { int ret; - msg_t *msg; - iframe_t *frm; struct mISDNport *mISDNport; class PmISDN *isdnport; - net_stack_t *nst; + int i; + msg_t *msg; + iframe_t *frm; msg_t *dmsg; mISDNuser_head_t *hh; - int i; + net_stack_t *nst; /* the que avoids loopbacks when replying to stack after receiving * from stack. */ @@ -1970,6 +2282,12 @@ int mISDN_handler(void) i = 0; while(i < mISDNport->b_num) { + /* process timer events for bchannel handling */ + if (mISDNport->b_timer[i]) + { + if (mISDNport->b_timer[i] <= now_d) + bchannel_event(mISDNport, i, B_EVENT_TIMEOUT); + } isdnport=mISDNport->b_port[i]; if (isdnport) { @@ -2008,8 +2326,10 @@ int mISDN_handler(void) /* turn on RX */ isdnport->p_m_txdata = 1; PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is required, so we turn them on\n"); +#ifndef OLD_MISDN if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE) ph_control(mISDNport, isdnport, mISDNport->b_addr[isdnport->p_m_b_index], CMX_TXDATA_ON, 0, "DSP-TXDATA", 1); +#endif return(1); } } else @@ -2020,8 +2340,10 @@ int mISDN_handler(void) /* turn off RX */ isdnport->p_m_txdata = 0; PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is not required, so we turn them off\n"); +#ifndef OLD_MISDN if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE) ph_control(mISDNport, isdnport, mISDNport->b_addr[isdnport->p_m_b_index], CMX_TXDATA_OFF, 0, "DSP-TXDATA", 0); +#endif return(1); } } @@ -2030,7 +2352,7 @@ int mISDN_handler(void) } #if 0 if (mISDNport->l1timeout && now>mISDNport->l1timeout) - { + { ---} PDEBUG(DEBUG_ISDN, "the L1 establish timer expired, we release all pending messages.\n", mISDNport->portnum); mISDNport->l1timeout = 0; #endif @@ -2048,17 +2370,18 @@ int mISDN_handler(void) if (mISDNport->nst.manager_l3(&mISDNport->nst, dmsg)) free_msg(dmsg); } else { + iframe_t act; + PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link TE portnum=%d.\n", mISDNport->portnum); time(&mISDNport->l2establish); /* establish */ - iframe_t act; act.prim = DL_ESTABLISH | REQUEST; act.addr = (mISDNport->upper_id & ~LAYER_ID_MASK) | 3 | FLG_MSG_DOWN; act.dinfo = 0; act.len = 0; mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC); } - l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | REQUEST, DIRECTION_OUT); + l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT); end_trace(); return(1); } @@ -2173,6 +2496,15 @@ int mISDN_handler(void) if (!mISDNport) { PERROR("message belongs to no mISDNport: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len); + // show a list of all mISDNports and their address +#if 0 + mISDNport = mISDNport_first; + while(mISDNport) + { + PERROR(" port %s %x -> %x\n", mISDNport->name, (frm->addr&MASTER_ID_MASK), (unsigned int)(mISDNport->upper_id&MASTER_ID_MASK)); + mISDNport = mISDNport->next; + } +#endif goto out; } @@ -2186,19 +2518,19 @@ int mISDN_handler(void) case MGR_SHORTSTATUS | CONFIRM: switch(frm->dinfo) { case SSTATUS_L1_ACTIVATED: - l1l2l3_trace_header(mISDNport, NULL, PH_ACTIVATE | (frm->prim & 0x3), DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN); end_trace(); goto ss_act; case SSTATUS_L1_DEACTIVATED: - l1l2l3_trace_header(mISDNport, NULL, PH_DEACTIVATE | (frm->prim & 0x3), DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN); end_trace(); goto ss_deact; case SSTATUS_L2_ESTABLISHED: - l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | (frm->prim & 0x3), DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ | (frm->prim & 0x3), DIRECTION_IN); end_trace(); goto ss_estab; case SSTATUS_L2_RELEASED: - l1l2l3_trace_header(mISDNport, NULL, DL_RELEASE | (frm->prim & 0x3), DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_REQ | (frm->prim & 0x3), DIRECTION_IN); end_trace(); goto ss_rel; } @@ -2206,7 +2538,7 @@ int mISDN_handler(void) case PH_ACTIVATE | CONFIRM: case PH_ACTIVATE | INDICATION: - l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN); end_trace(); if (mISDNport->ntmode) { @@ -2221,7 +2553,7 @@ int mISDN_handler(void) case PH_DEACTIVATE | CONFIRM: case PH_DEACTIVATE | INDICATION: - l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN); end_trace(); if (mISDNport->ntmode) { @@ -2241,7 +2573,7 @@ int mISDN_handler(void) case DL_ESTABLISH | INDICATION: case DL_ESTABLISH | CONFIRM: - l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH_REQ | (frm->prim & 0x3), DIRECTION_IN); end_trace(); if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */ ss_estab: @@ -2255,7 +2587,7 @@ int mISDN_handler(void) case DL_RELEASE | INDICATION: case DL_RELEASE | CONFIRM: - l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN); + l1l2l3_trace_header(mISDNport, NULL, DL_RELEASE_REQ | (frm->prim & 0x3), DIRECTION_IN); end_trace(); if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */ ss_rel: @@ -2305,6 +2637,7 @@ int mISDN_handler(void) case PH_DATA | INDICATION: case DL_DATA | INDICATION: case PH_CONTROL | INDICATION: + case PH_SIGNAL | INDICATION: i = 0; while(i < mISDNport->b_num) { @@ -2374,6 +2707,132 @@ int mISDN_handler(void) free_msg(msg); return(1); } +#endif + +#ifdef SOCKET_MISDN +int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3_msg *l3m) +{ + /* 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) + { + /* 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); + + /* d-message */ + switch(cmd) + { +#warning SOCKET TBD +#if 0 + case MGR_SHORTSTATUS_IND: + case MGR_SHORTSTATUS_CNF: + switch(frm->dinfo) { + case SSTATUS_L1_ACTIVATED: + l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_IND, DIRECTION_IN); + end_trace(); + goto ss_act; + case SSTATUS_L1_DEACTIVATED: + l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_IND, DIRECTION_IN); + end_trace(); + goto ss_deact; + case SSTATUS_L2_ESTABLISHED: + l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_IND, DIRECTION_IN); + end_trace(); + goto ss_estab; + case SSTATUS_L2_RELEASED: + l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN); + end_trace(); + goto ss_rel; + } + 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; + break; + + case MT_L1DEACTIVATE: + l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_IND, DIRECTION_IN); + end_trace(); +// ss_deact: + mISDNport->l1link = 0; + 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); + end_trace(); +// ss_estab: + if (mISDNport->l2establish) + { + mISDNport->l2establish = 0; + PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n"); + } + mISDNport->l2link = 1; + break; + + case MT_L2RELEASE: + l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN); + end_trace(); +// ss_rel: + mISDNport->l2link = 0; + if (mISDNport->ptp) + { + time(&mISDNport->l2establish); + PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n"); + } + break; + + default: + /* l3-data is sent to LCR */ + stack2manager(mISDNport, cmd, pid, l3m); + } + + /* free message */ + if (l3m) + free_l3_msg(l3m); + + /* unlock LCR */ + pthread_mutex_unlock(&mutex_lcr); + + return(0); + +} +#endif /* @@ -2382,15 +2841,14 @@ int mISDN_handler(void) 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) @@ -2399,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; @@ -2420,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)) @@ -2591,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); @@ -2737,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]); @@ -2745,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) { @@ -2756,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) @@ -2767,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) @@ -2776,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; @@ -2814,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 */ @@ -2852,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); @@ -2919,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); @@ -2937,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; @@ -2973,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); @@ -3020,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)"); @@ -3035,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) @@ -3173,7 +3665,7 @@ void mISDN_port_info(void) done: #ifdef SOCKET_MISDN - close(sd); + close(sock); #else /* close mISDN */ if ((ret = mISDN_close(device))) @@ -3187,13 +3679,24 @@ done: */ 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 *hh = (struct mISDNhead *)buf; + int ret; + + if (p_m_b_index < 0) + return; + if (!p_m_mISDNport->b_socket[p_m_b_index]) + return; +#else unsigned char buf[mISDN_HEADER_LEN+((length>ISDN_LOAD)?length:ISDN_LOAD)]; iframe_t *frm = (iframe_t *)buf; - /* configure frame */ - frm->prim = DL_DATA | REQUEST; - frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN; - frm->dinfo = 0; + if (p_m_b_index < 0) + return; + if (!p_m_mISDNport->b_addr[p_m_b_index]) + return; +#endif /* check if high priority tones exist * ignore data in this case @@ -3207,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 @@ -3220,11 +3734,22 @@ void PmISDN::txfromup(unsigned char *data, int length) if (p_m_load+length > ISDN_MAXLOAD) return; - /* load data to buffer - */ - memcpy(buf+mISDN_HEADER_LEN, data, length); + /* make and send frame */ +#ifdef SOCKET_MISDN + 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", 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 = length; + memcpy(buf+mISDN_HEADER_LEN, data, length); mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC); - p_m_load += frm->len; +#endif + p_m_load += length; }