X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.cpp;h=d67d0e8770d33a41086f9932a51dfeec3210a1b3;hp=50746ecfb99331124fc4061a7487bd5494dbf6a5;hb=refs%2Fheads%2Fbackup2;hpb=da91d7d85fe092122e35ece52695f98345738359 diff --git a/mISDN.cpp b/mISDN.cpp index 50746ec..d67d0e8 100644 --- a/mISDN.cpp +++ b/mISDN.cpp @@ -11,9 +11,6 @@ #include "main.h" #include "myisdn.h" - -#include -int __af_isdn = MISDN_AF_ISDN; #include #undef offsetof @@ -40,7 +37,9 @@ struct mISDNport *mISDNport_first; unsigned char mISDN_rand[256]; int mISDN_rand_count = 0; +#ifdef OLD_MT_ASSIGN unsigned int mt_assign_pid = ~0; +#endif int mISDNsocket = -1; static int upqueue_pipe[2]; @@ -50,6 +49,17 @@ int upqueue_avail = 0; static int mISDN_upqueue(struct lcr_fd *fd, unsigned int what, void *instance, int i); static int mISDN_timeout(struct lcr_timer *timer, void *instance, int i); +static int my_mISDNlib_debug(const char *file, int line, const char *func, int level, const char *fmt, va_list va) +{ + int ret = 0; + + if (debug_fp > 0) + ret = vfprintf(debug_fp, fmt, va); + return ret; +} + +static struct mi_ext_fn_s myfn; + int mISDN_initialize(void) { char filename[256]; @@ -62,7 +72,10 @@ int mISDN_initialize(void) } /* init mlayer3 */ - init_layer3(4); // buffer of 4 + // set debug printout function + myfn.prt_debug = my_mISDNlib_debug; + + init_layer3(4, &myfn); // buffer of 4 /* open debug, if enabled and not only stack debugging */ if (options.deb) { @@ -70,11 +83,10 @@ int mISDN_initialize(void) debug_fp = fopen(filename, "a"); } - if (options.deb & DEBUG_STACK) { - SPRINT(filename, "%s/debug_mISDN.log", LOG_DIR); - mISDN_debug_init(0xfffffeff, filename, filename, filename); - } else - mISDN_debug_init(0, NULL, NULL, NULL); + if (options.deb & DEBUG_STACK) + mISDN_set_debug_level(0xfffffeff); + else + mISDN_set_debug_level(0); if (pipe(upqueue_pipe) < 0) FATAL("Failed to open pipe\n"); @@ -89,8 +101,6 @@ void mISDN_deinitialize(void) { cleanup_layer3(); - mISDN_debug_close(); - if (debug_fp) fclose(debug_fp); debug_fp = NULL; @@ -106,12 +116,12 @@ void mISDN_deinitialize(void) upqueue_avail = 0; } -int load_timer(struct lcr_timer *timer, void *instance, int index); +static int load_timer(struct lcr_timer *timer, void *instance, int index); /* * constructor */ -PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive, int mode) : Port(type, portname, settings) +PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_settings *settings, struct interface *interface, int channel, int exclusive, int mode) : Port(type, portname, settings, interface) { p_m_mISDNport = mISDNport; p_m_portnum = mISDNport->portnum; @@ -127,17 +137,18 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti p_m_mute = 0; p_m_txdata = 0; p_m_delay = 0; + p_m_tx_dejitter = 0; + p_m_preload = ISDN_LOAD; + p_m_disable_dejitter = 0; p_m_echo = 0; p_m_tone = 0; p_m_rxoff = 0; - p_m_joindata = 0; p_m_inband_send_on = 0; p_m_inband_receive_on = 0; p_m_dtmf = !mISDNport->ifport->nodtmf; + p_m_dtmf_threshold = mISDNport->ifport->dtmf_threshold; memset(&p_m_timeout, 0, sizeof(p_m_timeout)); add_timer(&p_m_timeout, mISDN_timeout, this, 0); - p_m_remote_ref = 0; /* channel shall be exported to given remote */ - p_m_remote_id = 0; /* remote admin socket */ SCPY(p_m_pipeline, mISDNport->ifport->interface->pipeline); /* audio */ @@ -337,15 +348,20 @@ void ph_control(struct mISDNport *mISDNport, class PmISDN *isdnport, int sock, u struct mISDNhead *ctrl = (struct mISDNhead *)buffer; unsigned int *d = (unsigned int *)(buffer+MISDN_HEADER_LEN); int ret; + int len = 8; if (sock < 0) return; + if (c1 == DTMF_TONE_START && c2 == 0) { + len = 4; + } + ctrl->prim = PH_CONTROL_REQ; ctrl->id = 0; *d++ = c1; *d++ = c2; - ret = sendto(sock, buffer, MISDN_HEADER_LEN+sizeof(int)*2, 0, NULL, 0); + ret = sendto(sock, buffer, MISDN_HEADER_LEN+len, 0, NULL, 0); if (ret <= 0) PERROR("Failed to send to socket %d\n", sock); chan_trace_header(mISDNport, isdnport, "BCHANNEL control", DIRECTION_OUT); @@ -389,6 +405,8 @@ static int _bchannel_create(struct mISDNport *mISDNport, int i) int ret; struct sockaddr_mISDN addr; + memset(&addr, 0, sizeof(addr)); + if (mISDNport->b_sock[i].inuse) { PERROR("Error: Socket already created for index %d\n", i); return(0); @@ -477,6 +495,8 @@ static void _bchannel_configure(struct mISDNport *mISDNport, int i) ph_control(mISDNport, port, handle, (port->p_m_txdata)?DSP_TXDATA_ON:DSP_TXDATA_OFF, 0, "DSP-TXDATA", port->p_m_txdata); if (port->p_m_delay && mode == B_MODE_TRANSPARENT) ph_control(mISDNport, port, handle, DSP_DELAY, port->p_m_delay, "DSP-DELAY", port->p_m_delay); + if (port->p_m_tx_dejitter && mode == B_MODE_TRANSPARENT) + ph_control(mISDNport, port, handle, DSP_TX_DEJITTER, port->p_m_tx_dejitter, "DSP-TX_DEJITTER", port->p_m_tx_dejitter); if (port->p_m_tx_gain && mode == B_MODE_TRANSPARENT) ph_control(mISDNport, port, handle, DSP_VOL_CHANGE_TX, port->p_m_tx_gain, "DSP-TX_GAIN", port->p_m_tx_gain); if (port->p_m_rx_gain && mode == B_MODE_TRANSPARENT) @@ -494,7 +514,7 @@ static void _bchannel_configure(struct mISDNport *mISDNport, int i) // if (port->p_m_txmix && mode == B_MODE_TRANSPARENT) // ph_control(mISDNport, port, handle, DSP_MIX_ON, 0, "DSP-MIX", 1); if (port->p_m_dtmf && mode == B_MODE_TRANSPARENT) - ph_control(mISDNport, port, handle, DTMF_TONE_START, 0, "DSP-DTMF", 1); + ph_control(mISDNport, port, handle, DTMF_TONE_START, port->p_m_dtmf_threshold, "DSP-DTMF", 1); if (port->p_m_crypt && mode == B_MODE_TRANSPARENT) ph_control_block(mISDNport, port, handle, DSP_BF_ENABLE_KEY, port->p_m_crypt_key, port->p_m_crypt_key_len, "DSP-CRYPT", port->p_m_crypt_key_len); } @@ -555,22 +575,6 @@ It may be linked to a Port class, that likes to reactivate it. See above. After deactivating bchannel, and if not used, the bchannel becomes idle again. -Also the bchannel may be exported, but only if the state is or becomes idle: - -- B_STATE_EXPORTING -The bchannel assignment has been sent to the remove application. - -- B_STATE_REMOTE -The bchannel assignment is acknowledged by the remote application. - -- B_STATE_IMPORTING -The bchannel is re-imported by mISDN port object. - -- B_STATE_IDLE -See above. -After re-importing bchannel, and if not used, the bchannel becomes idle again. - - A bchannel can have the following events: - B_EVENT_USE @@ -585,33 +589,8 @@ The bchannel is not required by Port class anymore - B_EVENT_DEACTIVATED The bchannel becomes inactive. -- B_EVENT_EXPORTED -The bchannel is now used by remote application. - -- B_EVENT_IMPORTED -The bchannel is not used by remote application. - -- B_EVENT_EXPORTREQUEST -The bchannel shall be exported to the remote application. - -- B_EVENT_IMPORTREQUEST -The bchannel is released from the remote application. - All actions taken on these events depend on the current bchannel's state and if it is linked to a Port class. -if an export request is receive by remote application, p_m_remote_* is set. -the b_remote_*[index] indicates if and where the channel is exported to. (set from the point on, where export is initiated, until imported is acknowledged.) -- set on export request from remote application (if port is assigned) -- set on channel use, if requested by remote application (p_m_remote_*) -- cleared on drop request - -the bchannel will be exported with ref and stack given. remote application uses the ref to link bchannel to the call. -the bchannel will be imported with stack given only. remote application must store stack id with the bchannel process. -the bchannel import/export is acknowledged with stack given. - -if exporting, b_remote_*[index] is set to the remote socket id. -if importing has been acknowledged. b_remote_*[index] is cleared. - */ /* @@ -626,19 +605,15 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) class PmISDN *b_port = mISDNport->b_port[i]; int state = mISDNport->b_state[i]; int timer = -1; // no change - unsigned int p_m_remote_ref = 0; - unsigned int p_m_remote_id = 0; +#if 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; - unsigned int portid = (mISDNport->portnum<<8) + i+1+(i>=15); 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; @@ -646,6 +621,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) 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; } +#endif switch(event) { case B_EVENT_USE: @@ -654,140 +630,39 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) FATAL("bchannel must be linked to a Port class\n"); switch(state) { case B_STATE_IDLE: - if (p_m_remote_ref) { - /* export bchannel */ - message_bchannel_to_remote(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, 0); - chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); - add_trace("type", NULL, "assign"); - add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); - end_trace(); - state = B_STATE_EXPORTING; - mISDNport->b_remote_id[i] = p_m_remote_id; - mISDNport->b_remote_ref[i] = p_m_remote_ref; - } else { - /* create stack and send activation request */ - if (_bchannel_create(mISDNport, i)) { - _bchannel_activate(mISDNport, i, 1, 0); - state = B_STATE_ACTIVATING; - timer = B_TIMER_ACTIVATING; - } + /* create stack and send activation request */ + if (_bchannel_create(mISDNport, i)) { + _bchannel_activate(mISDNport, i, 1, 0); + state = B_STATE_ACTIVATING; + timer = B_TIMER_ACTIVATING; } break; case B_STATE_ACTIVATING: - case B_STATE_EXPORTING: /* do nothing, because it is already activating */ break; - case B_STATE_DEACTIVATING: - case B_STATE_IMPORTING: - /* do nothing, because we must wait until we can reactivate */ - break; - default: /* problems that might ocurr: * B_EVENT_USE is received when channel already in use. - * bchannel exported, but not freed by other port - */ - PERROR("Illegal event %d at state %d, please correct.\n", event, state); - } - break; - - case B_EVENT_EXPORTREQUEST: - /* special case where the bchannel is requested by remote */ - if (!p_m_remote_ref) { - PERROR("export request without remote channel set, please correct.\n"); - break; - } - switch(state) { - case B_STATE_IDLE: - /* 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_remote(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, 0); - chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); - add_trace("type", NULL, "assign"); - add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); - end_trace(); - state = B_STATE_EXPORTING; - mISDNport->b_remote_id[i] = p_m_remote_id; - mISDNport->b_remote_ref[i] = p_m_remote_ref; - break; - - case B_STATE_ACTIVATING: - case B_STATE_EXPORTING: - /* do nothing, because it is already activating */ - break; - - case B_STATE_DEACTIVATING: - case B_STATE_IMPORTING: - /* do nothing, because we must wait until we can reactivate */ - break; - - case B_STATE_ACTIVE: - /* bchannel is active, so we deactivate */ - _bchannel_activate(mISDNport, i, 0, 0); - state = B_STATE_DEACTIVATING; - timer = B_TIMER_DEACTIVATING; - break; - - default: - /* problems that might ocurr: - * ... when channel already in use. - * bchannel exported, but not freed by other port */ PERROR("Illegal event %d at state %d, please correct.\n", event, state); } break; - case B_EVENT_IMPORTREQUEST: - /* special case where the bchannel is released by remote */ - if (p_m_remote_ref) { - PERROR("import request with remote channel set, please correct.\n"); - break; - } - switch(state) { - case B_STATE_IDLE: - case B_STATE_ACTIVE: - /* bchannel is not exported */ - break; - - case B_STATE_ACTIVATING: - case B_STATE_EXPORTING: - /* do nothing because we must wait until bchanenl is active before deactivating */ - break; - - case B_STATE_REMOTE: - /* bchannel is exported, so we re-import */ - message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0, 0); - chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); - add_trace("type", NULL, "remove"); - add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); - end_trace(); - state = B_STATE_IMPORTING; - break; - - case B_STATE_DEACTIVATING: - case B_STATE_IMPORTING: - /* we may have taken an already deactivating bchannel, but do not require it anymore, so we do nothing */ - break; - - default: - PERROR("Illegal event %d at state %d, please correct.\n", event, state); - } - break; case B_EVENT_ACTIVATED: timer = 0; switch(state) { case B_STATE_ACTIVATING: - if (b_port && !p_m_remote_id) { + if (b_port) { /* bchannel is active and used by Port class, so we configure bchannel */ _bchannel_configure(mISDNport, i); state = B_STATE_ACTIVE; b_port->p_m_load = 0; + b_port->update_load(); } else { - /* bchannel is active, but exported OR not used anymore (or has wrong stack config), so we deactivate */ + /* bchannel is active, but not used anymore (or has wrong stack config), so we deactivate */ _bchannel_activate(mISDNport, i, 0, 0); state = B_STATE_DEACTIVATING; timer = B_TIMER_DEACTIVATING; @@ -799,31 +674,6 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) } break; - case B_EVENT_EXPORTED: - switch(state) { - case B_STATE_EXPORTING: - if (b_port && p_m_remote_ref && p_m_remote_ref==mISDNport->b_remote_ref[i]) { - /* remote export done */ - state = B_STATE_REMOTE; - } else { - /* bchannel is now exported, but we need bchannel back - * 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_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0, 0); - chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); - add_trace("type", NULL, "remove"); - add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); - end_trace(); - state = B_STATE_IMPORTING; - } - break; - - default: - PERROR("Illegal event %d at state %d, please correct.\n", event, state); - } - break; - case B_EVENT_DROP: if (!b_port) FATAL("bchannel must be linked to a Port class\n"); @@ -833,7 +683,6 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) break; case B_STATE_ACTIVATING: - case B_STATE_EXPORTING: /* do nothing because we must wait until bchanenl is active before deactivating */ break; @@ -844,18 +693,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) timer = B_TIMER_DEACTIVATING; break; - case B_STATE_REMOTE: - /* bchannel is exported, so we re-import */ - message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0, 0); - chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); - add_trace("type", NULL, "remove"); - add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); - end_trace(); - state = B_STATE_IMPORTING; - break; - case B_STATE_DEACTIVATING: - case B_STATE_IMPORTING: /* we may have taken an already deactivating bchannel, but do not require it anymore, so we do nothing */ break; @@ -875,22 +713,11 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) _bchannel_destroy(mISDNport, i); state = B_STATE_IDLE; if (b_port) { - /* bchannel is now deactivate, but is requied by Port class, so we reactivate / export */ - if (p_m_remote_ref) { - message_bchannel_to_remote(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, 0); - chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); - add_trace("type", NULL, "assign"); - add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); - end_trace(); - state = B_STATE_EXPORTING; - mISDNport->b_remote_id[i] = p_m_remote_id; - mISDNport->b_remote_ref[i] = p_m_remote_ref; - } else { - if (_bchannel_create(mISDNport, i)) { - _bchannel_activate(mISDNport, i, 1, 0); - state = B_STATE_ACTIVATING; - timer = B_TIMER_ACTIVATING; - } + /* bchannel is now deactivate, but is requied by Port class, so we reactivate */ + if (_bchannel_create(mISDNport, i)) { + _bchannel_activate(mISDNport, i, 1, 0); + state = B_STATE_ACTIVATING; + timer = B_TIMER_ACTIVATING; } } break; @@ -900,39 +727,6 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event) } break; - case B_EVENT_IMPORTED: - switch(state) { - case B_STATE_IMPORTING: - state = B_STATE_IDLE; - mISDNport->b_remote_id[i] = 0; - mISDNport->b_remote_ref[i] = 0; - if (b_port) { - /* bchannel is now imported, but is requied by Port class, so we reactivate / export */ - if (p_m_remote_ref) { - message_bchannel_to_remote(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, 0); - chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE); - add_trace("type", NULL, "assign"); - add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff); - end_trace(); - state = B_STATE_EXPORTING; - mISDNport->b_remote_id[i] = p_m_remote_id; - mISDNport->b_remote_ref[i] = p_m_remote_ref; - } else { - if (_bchannel_create(mISDNport, i)) { - _bchannel_activate(mISDNport, i, 1, 0); - state = B_STATE_ACTIVATING; - timer = B_TIMER_ACTIVATING; - } - } - } - break; - - default: - /* ignore, because not assigned */ - ; - } - break; - case B_EVENT_TIMEOUT: timer = 0; switch(state) { @@ -1071,101 +865,6 @@ void PmISDN::drop_bchannel(void) p_m_b_exclusive = 0; } -/* process bchannel export/import message from join */ -void message_bchannel_from_remote(class JoinRemote *joinremote, int type, unsigned int handle) -{ - class Endpoint *epoint; - class Port *port; - class PmISDN *isdnport; - struct mISDNport *mISDNport; - int i, ii; - - switch(type) { - case BCHANNEL_REQUEST: - /* find the port object for the join object ref */ - if (!(epoint = find_epoint_id(joinremote->j_epoint_id))) { - PDEBUG(DEBUG_BCHANNEL, "join %d has no endpoint (anymore)\n", joinremote->j_serial); - return; - } - if (!epoint->ep_portlist) { - PDEBUG(DEBUG_BCHANNEL, "join %d has no port (anymore in portlist)\n", joinremote->j_serial); - return; - } - if (epoint->ep_portlist->next) { - PERROR("join %d has enpoint %d with more than one port. this shall not happen to remote joins.\n", joinremote->j_serial, epoint->ep_serial); - } - if (!(port = find_port_id(epoint->ep_portlist->port_id))) { - PDEBUG(DEBUG_BCHANNEL, "join %d has no port (anymore as object)\n", joinremote->j_serial); - return; - } - if ((port->p_type&PORT_CLASS_MASK) != PORT_CLASS_mISDN) { - PERROR("join %d has port %d not of mISDN type. This shall not happen.\n", joinremote->j_serial, port->p_serial); - } - isdnport = (class PmISDN *)port; - - /* assign */ - if (isdnport->p_m_remote_id) { - PERROR("join %d recevied bchannel request from remote, but channel is already assinged.\n", joinremote->j_serial); - break; - } - mISDNport = isdnport->p_m_mISDNport; - i = isdnport->p_m_b_index; - chan_trace_header(mISDNport, isdnport, "MESSAGE_BCHANNEL (from remote application)", DIRECTION_NONE); - add_trace("type", NULL, "export request"); - end_trace(); - isdnport->p_m_remote_ref = joinremote->j_serial; - isdnport->p_m_remote_id = joinremote->j_remote_id; - if (mISDNport && i>=0) { - bchannel_event(mISDNport, i, B_EVENT_EXPORTREQUEST); - } - break; - - case BCHANNEL_RELEASE: - case BCHANNEL_ASSIGN_ACK: - case BCHANNEL_REMOVE_ACK: - /* find mISDNport for stack ID */ - mISDNport = mISDNport_first; - while(mISDNport) { - i = 0; - ii = mISDNport->b_num; - while(i < ii) { - if ((unsigned int)(mISDNport->portnum<<8)+i+1+(i>=15) == handle) - break; - i++; - } - if (i != ii) - break; - mISDNport = mISDNport->next; - } - if (!mISDNport) { - PERROR("received assign/remove ack for bchannel's handle=%x, but handle does not exist in any mISDNport structure.\n", handle); - break; - } - - if (type!=BCHANNEL_RELEASE) { - /* ack */ - chan_trace_header(mISDNport, mISDNport->b_port[i], "MESSAGE_BCHANNEL (from remote application)", DIRECTION_NONE); - add_trace("type", NULL, (type==BCHANNEL_ASSIGN_ACK)?"assign_ack":"remove_ack"); - end_trace(); - bchannel_event(mISDNport, i, (type==BCHANNEL_ASSIGN_ACK)?B_EVENT_EXPORTED:B_EVENT_IMPORTED); - } else { - /* release */ - isdnport = mISDNport->b_port[i]; - chan_trace_header(mISDNport, isdnport, "MESSAGE_BCHANNEL (from remote application)", DIRECTION_NONE); - add_trace("type", NULL, "import request"); - end_trace(); - if (isdnport) { - isdnport->p_m_remote_ref = 0; - isdnport->p_m_remote_id = 0; - } - bchannel_event(mISDNport, i, B_EVENT_IMPORTREQUEST); - } - break; - default: - PERROR("received wrong bchannel message type %d from remote\n", type); - } -} - /* * handler @@ -1192,31 +891,31 @@ times have no skew. * levels there are two levels: -ISDN_LOAD will give the load that have to be kept in dsp. -ISDN_MAXLOAD will give the maximum load before dropping. +p_m_preload will give the load that have to be kept in dsp. +ISDN_MAXLOAD (2*p_m_preload) will give the maximum load before dropping. * procedure for low priority data see txfromup() for procedure in short: remote data is ignored during high priority tones * procedure for high priority data -whenever load is below ISDN_LOAD, load is filled up to ISDN_LOAD +whenever load is below p_m_preload, load is filled up to p_m_preload if no more data is available, load becomes empty again. 'load' variable: -0 ISDN_LOAD ISDN_MAXLOAD +0 p_m_preload ISDN_MAXLOAD +--------------------+----------------------+ | | | +--------------------+----------------------+ -on empty load or on load below ISDN_LOAD, the load is inceased to ISDN_LOAD: -0 ISDN_LOAD ISDN_MAXLOAD +on empty load or on load below p_m_preload, the load is inceased to p_m_preload: +0 p_m_preload ISDN_MAXLOAD +--------------------+----------------------+ |TTTTTTTTTTTTTTTTTTTT| | +--------------------+----------------------+ -on empty load, remote-audio causes the load with the remote audio to be increased to ISDN_LOAD. -0 ISDN_LOAD ISDN_MAXLOAD +on empty load, remote-audio causes the load with the remote audio to be increased to p_m_preload. +0 p_m_preload ISDN_MAXLOAD +--------------------+----------------------+ |TTTTTTTTTTTTTTTTTTTTRRRRR | +--------------------+----------------------+ @@ -1224,10 +923,6 @@ on empty load, remote-audio causes the load with the remote audio to be increase */ void PmISDN::update_load(void) { - /* don't trigger load event if: */ - if (!p_tone_name[0] && !p_m_crypt_msg_loops && !p_m_inband_send_on) - return; - /* don't trigger load event if event already active */ if (p_m_loadtimer.active) return; @@ -1235,7 +930,7 @@ void PmISDN::update_load(void) schedule_timer(&p_m_loadtimer, 0, 0); /* no delay the first time */ } -int load_timer(struct lcr_timer *timer, void *instance, int index) +static int load_timer(struct lcr_timer *timer, void *instance, int index) { class PmISDN *isdnport = (class PmISDN *)instance; @@ -1261,7 +956,10 @@ void PmISDN::load_tx(void) p_m_last_tv_msec = current_time.tv_usec/1000; /* process only if we have samples and we are active */ - if (elapsed && p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) { + if (p_m_mISDNport->b_state[p_m_b_index] != B_STATE_ACTIVE) + return; + + if (elapsed) { /* update load */ if (elapsed < p_m_load) p_m_load -= elapsed; @@ -1269,10 +967,10 @@ void PmISDN::load_tx(void) p_m_load = 0; /* to send data, tone must be on */ - if ((p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on) /* what tones? */ - && (p_m_load < ISDN_LOAD) /* not too much load? */ + if ((p_tone_name[0] || p_dov_tx || p_m_crypt_msg_loops || p_m_inband_send_on) /* what tones? */ + && (p_m_load < p_m_preload) /* not too much load? */ && (p_state==PORT_STATE_CONNECT || p_m_mISDNport->tones || p_m_inband_send_on)) { /* connected or inband-tones? */ - int tosend = ISDN_LOAD - p_m_load, length; + int tosend = p_m_preload - p_m_load, length; unsigned char buf[MISDN_HEADER_LEN+tosend]; struct mISDNhead *frm = (struct mISDNhead *)buf; unsigned char *p = buf+MISDN_HEADER_LEN; @@ -1309,26 +1007,29 @@ void PmISDN::load_tx(void) tosend -= length; } + /* copy dov */ + if (p_dov_tx) { + tosend -= dov_tx(p, tosend); + } + /* copy tones */ if (p_tone_name[0] && tosend) { tosend -= read_audio(p, tosend); } /* send data */ - if (ISDN_LOAD - p_m_load - tosend > 0) { + if (p_m_preload - p_m_load - tosend > 0) { frm->prim = PH_DATA_REQ; frm->id = 0; - ret = sendto(p_m_mISDNport->b_sock[p_m_b_index].fd, buf, MISDN_HEADER_LEN+ISDN_LOAD-p_m_load-tosend, 0, NULL, 0); + ret = sendto(p_m_mISDNport->b_sock[p_m_b_index].fd, buf, MISDN_HEADER_LEN+p_m_preload-p_m_load-tosend, 0, NULL, 0); if (ret <= 0) - PERROR("Failed to send to socket %d (samples = %d)\n", p_m_mISDNport->b_sock[p_m_b_index].fd, ISDN_LOAD-p_m_load-tosend); - p_m_load += ISDN_LOAD - p_m_load - tosend; + PERROR("Failed to send to socket %d (samples = %d)\n", p_m_mISDNport->b_sock[p_m_b_index].fd, p_m_preload-p_m_load-tosend); + p_m_load += p_m_preload - p_m_load - tosend; } } } - if (p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on || p_m_load) { - schedule_timer(&p_m_loadtimer, 0, ISDN_TRANSMIT*125); - } + schedule_timer(&p_m_loadtimer, 0, PORT_TRANSMIT * 125); } /* handle timeouts */ @@ -1353,8 +1054,6 @@ static int mISDN_timeout(struct lcr_timer *timer, void *instance, int i) void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len) { unsigned int cont = *((unsigned int *)data); - unsigned char *data_temp; - unsigned int length_temp; struct lcr_msg *message; unsigned char *p; int l; @@ -1372,10 +1071,23 @@ void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len end_trace(); if (!p_m_dtmf) return; - message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DTMF); - message->param.dtmf = cont & DTMF_TONE_MASK; - PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION DTMF digit '%c'\n", p_name, message->param.dtmf); - message_put(message); + if (p_type == PORT_TYPE_POTS_FXS_IN && p_state == PORT_STATE_IN_OVERLAP) { + class Pfxs *pfxs = (class Pfxs *)this; + if (!pfxs->p_m_fxs_allow_dtmf) { + PDEBUG(DEBUG_PORT, "PmISDN(%s) DTMF for FXS currently disabled\n", p_name); + return; + } + SCCAT(p_dialinginfo.id, cont & DTMF_TONE_MASK); + message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_INFORMATION); + message->param.information.id[0] = cont & DTMF_TONE_MASK; + PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION INFORMATION digit '%s'\n", p_name, message->param.information.id); + message_put(message); + } else { + message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DTMF); + message->param.dtmf = cont & DTMF_TONE_MASK; + PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION DTMF digit '%c'\n", p_name, message->param.dtmf); + message_put(message); + } return; } switch(cont) { @@ -1428,6 +1140,8 @@ void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len // printf(".");fflush(stdout);return; if (p_record) record(data, len, 1); // from up + if (p_tap) + tap(data, len, 1); // from up return; } if (hh->prim != PH_DATA_IND && hh->prim != DL_DATA_IND) { @@ -1435,10 +1149,17 @@ void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len return; } + /* dov is processed */ + if (p_dov_rx) + dov_rx(data, len); + /* inband is processed */ if (p_m_inband_receive_on) inband_receive(data, len); + /* send to remote, if bridged */ + bridge_tx(data, len); + /* calls will not process any audio data unless * the call is connected OR tones feature is enabled. */ @@ -1465,6 +1186,8 @@ void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len /* record data */ if (p_record) record(data, len, 0); // from down + if (p_tap) + tap(data, len, 0); // from down /* randomize and listen to crypt message if enabled */ if (p_m_crypt_listen) { @@ -1476,24 +1199,6 @@ void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len cryptman_listen_bch(data, len); } - - p = data; - - /* send data to epoint */ - if (p_m_joindata && ACTIVE_EPOINT(p_epointlist)) { /* only if we have an epoint object */ - length_temp = len; - data_temp = p; - while(length_temp) { - message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DATA); - message->param.data.len = (length_temp>sizeof(message->param.data.data))?sizeof(message->param.data.data):length_temp; - memcpy(message->param.data.data, data_temp, message->param.data.len); - message_put(message); - if (length_temp <= sizeof(message->param.data.data)) - break; - data_temp += sizeof(message->param.data.data); - length_temp -= sizeof(message->param.data.data); - } - } } @@ -1521,9 +1226,9 @@ void PmISDN::set_tone(const char *dir, const char *tone) /* if no directory is given (by extension), we use interface.conf or options.conf */ if (!dir || !dir[0]) { - if (p_m_mISDNport->ifport->tones_dir[0]) - dir = p_m_mISDNport->ifport->tones_dir; - else if (options.tones_dir[0]) + if (p_tones_interface[0]) + dir = p_tones_interface; + else dir = options.tones_dir; } @@ -1661,15 +1366,6 @@ void PmISDN::message_mISDNsignal(unsigned int epoint_id, int message_id, union p set_conf(oldconf, newconf); break; - case mISDNSIGNAL_JOINDATA: - if (p_m_joindata != param->mISDNsignal.joindata) { - p_m_joindata = param->mISDNsignal.joindata; - PDEBUG(DEBUG_BCHANNEL, "we change to joindata=%d.\n", p_m_joindata); - update_rxoff(); - } else - PDEBUG(DEBUG_BCHANNEL, "we already have joindata=%d.\n", p_m_joindata); - break; - case mISDNSIGNAL_DELAY: if (p_m_delay != param->mISDNsignal.delay) { p_m_delay = param->mISDNsignal.delay; @@ -1735,7 +1431,6 @@ void PmISDN::message_crypt(unsigned int epoint_id, int message_id, union paramet p_m_crypt_msg_current = 0; /* reset */ p_m_crypt_msg_loops = 6; /* enable */ update_rxoff(); - update_load(); #if 0 /* disable txmix, or we get corrupt data due to audio process */ if (p_m_txmix && p_m_b_index>=0 && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT) { @@ -1751,37 +1446,72 @@ void PmISDN::message_crypt(unsigned int epoint_id, int message_id, union paramet } +/* MESSAGE_VOOTP */ +void PmISDN::message_vootp(unsigned int epoint_id, int message_id, union parameter *param) +{ + struct lcr_msg *message; + + message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_UPDATEBRIDGE); + message_put(message); + +#if 0 +does not make sense, since remote port may dejitter + if (param->vootp.enable) { + PDEBUG(DEBUG_ISDN, "PmISDN(%s) received vootp enable order, so we disable de-jitter.\n", p_name); + p_m_disable_dejitter = 1; + } +#endif + update_rxoff(); +} + /* * endpoint sends messages to the port */ int PmISDN::message_epoint(unsigned int epoint_id, int message_id, union parameter *param) { - if (Port::message_epoint(epoint_id, message_id, param)) - return(1); - + /* messages also handled by base class */ switch(message_id) { - case MESSAGE_DATA: /* tx-data from upper layer */ - txfromup(param->data.data, param->data.len); - return(1); + case MESSAGE_VOOTP: /* crypt control command */ + PDEBUG(DEBUG_ISDN, "PmISDN(%s) received VoOTP encryption\n", p_name); + message_vootp(epoint_id, message_id, param); + break; + } + if (Port::message_epoint(epoint_id, message_id, param)) { + if (message_id == MESSAGE_BRIDGE) + update_rxoff(); + return 1; + } + + /* messages not handled by base class */ + switch(message_id) { case MESSAGE_mISDNSIGNAL: /* user command */ PDEBUG(DEBUG_ISDN, "PmISDN(%s) received special ISDN SIGNAL %d.\n", p_name, param->mISDNsignal.message); message_mISDNsignal(epoint_id, message_id, param); - return(1); + return 1; case MESSAGE_CRYPT: /* crypt control command */ PDEBUG(DEBUG_ISDN, "PmISDN(%s) received encryption command '%d'.\n", p_name, param->crypt.type); message_crypt(epoint_id, message_id, param); - return(1); + return 1; + + case MESSAGE_DISABLE_DEJITTER: + PDEBUG(DEBUG_ISDN, "PmISDN(%s) received de-jitter disable order.\n", p_name); + p_m_disable_dejitter = 1; + p_m_preload = param->queue; + update_rxoff(); + return 1; } - return(0); + return 0; } void PmISDN::update_rxoff(void) { + int tx_dejitter = 0; + /* call bridges in user space OR crypto OR recording */ - if (p_m_joindata || p_m_crypt_msg_loops || p_m_crypt_listen || p_record || p_m_inband_receive_on) { + if (p_bridge || p_m_crypt_msg_loops || p_m_crypt_listen || p_record || p_tap || p_m_inband_receive_on || p_dov_rx) { /* rx IS required */ if (p_m_rxoff) { /* turn on RX */ @@ -1802,8 +1532,8 @@ void PmISDN::update_rxoff(void) ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_RECEIVE_OFF, 0, "DSP-RXOFF", 1); } } - /* recording */ - if (p_record) { + /* recording / tapping */ + if (p_record || p_tap) { /* txdata IS required */ if (!p_m_txdata) { /* turn on RX */ @@ -1824,6 +1554,16 @@ void PmISDN::update_rxoff(void) ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_TXDATA_OFF, 0, "DSP-TXDATA", 0); } } + /* dejitter on bridge */ + if (p_bridge && !p_m_disable_dejitter) + tx_dejitter = 1; + if (p_m_tx_dejitter != tx_dejitter) { + p_m_tx_dejitter = tx_dejitter; + PDEBUG(DEBUG_BCHANNEL, "we change dejitter mode to %s.\n", (p_m_tx_dejitter) ? "on" : "off"); + if (p_m_b_index > -1) + if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT) + ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_TX_DEJITTER, p_m_tx_dejitter, "DSP-TX_DEJITTER", p_m_tx_dejitter); + } } static int mISDN_upqueue(struct lcr_fd *fd, unsigned int what, void *instance, int i) @@ -1832,7 +1572,7 @@ static int mISDN_upqueue(struct lcr_fd *fd, unsigned int what, void *instance, i struct mbuffer *mb; struct l3_msg *l3m; char byte; - int ret; + int __attribute__((__unused__)) ret; /* unset global semaphore */ upqueue_avail = 0; @@ -1845,98 +1585,96 @@ static int mISDN_upqueue(struct lcr_fd *fd, unsigned int what, void *instance, i mISDNport = mISDNport_first; while(mISDNport) { /* handle queued up-messages (d-channel) */ - if (!mISDNport->isloopback) { - while ((mb = mdequeue(&mISDNport->upqueue))) { - l3m = &mb->l3; - switch(l3m->type) { - case MPH_ACTIVATE_IND: - if (mISDNport->l1link != 1) { - l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_IND, DIRECTION_IN); - end_trace(); - mISDNport->l1link = 1; - } + while ((mb = mdequeue(&mISDNport->upqueue))) { + l3m = &mb->l3; + switch(l3m->type) { + case MPH_ACTIVATE_IND: + if (mISDNport->l1link != 1) { + l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_IND, DIRECTION_IN); + end_trace(); + mISDNport->l1link = 1; + } + break; + + case MPH_DEACTIVATE_IND: + if (mISDNport->l1link != 0) { + l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_IND, DIRECTION_IN); + end_trace(); + mISDNport->l1link = 0; + } + break; + + case MPH_INFORMATION_IND: + PDEBUG(DEBUG_ISDN, "Received MPH_INFORMATION_IND for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); + switch (l3m->pid) { + case L1_SIGNAL_LOS_ON: + mISDNport->los = 1; break; - - case MPH_DEACTIVATE_IND: - if (mISDNport->l1link != 0) { - l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_IND, DIRECTION_IN); - end_trace(); - mISDNport->l1link = 0; - } + case L1_SIGNAL_LOS_OFF: + mISDNport->los = 0; + break; + case L1_SIGNAL_AIS_ON: + mISDNport->ais = 1; + break; + case L1_SIGNAL_AIS_OFF: + mISDNport->ais = 0; + break; + case L1_SIGNAL_RDI_ON: + mISDNport->rdi = 1; + break; + case L1_SIGNAL_RDI_OFF: + mISDNport->rdi = 0; + break; + case L1_SIGNAL_SLIP_TX: + mISDNport->slip_tx++; break; + case L1_SIGNAL_SLIP_RX: + mISDNport->slip_rx++; + break; + } + break; - case MPH_INFORMATION_IND: - PDEBUG(DEBUG_ISDN, "Received MPH_INFORMATION_IND for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); - switch (l3m->pid) { - case L1_SIGNAL_LOS_ON: - mISDNport->los = 1; - break; - case L1_SIGNAL_LOS_OFF: - mISDNport->los = 0; - break; - case L1_SIGNAL_AIS_ON: - mISDNport->ais = 1; - break; - case L1_SIGNAL_AIS_OFF: - mISDNport->ais = 0; - break; - case L1_SIGNAL_RDI_ON: - mISDNport->rdi = 1; - break; - case L1_SIGNAL_RDI_OFF: - mISDNport->rdi = 0; - break; - case L1_SIGNAL_SLIP_TX: - mISDNport->slip_tx++; - break; - case L1_SIGNAL_SLIP_RX: - mISDNport->slip_rx++; - break; + case MT_L2ESTABLISH: + l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_IND, DIRECTION_IN); + add_trace("tei", NULL, "%d", l3m->pid); + end_trace(); + mISDNport->l2link = 1; + if (l3m->pid < 128) + mISDNport->l2mask[l3m->pid >> 3] |= (1 << (l3m->pid & 7)); + if ((!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) { + if (mISDNport->l2establish.active) { + unsched_timer(&mISDNport->l2establish); + PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n"); } - break; + } + break; - case MT_L2ESTABLISH: - l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_IND, DIRECTION_IN); + case MT_L2RELEASE: + if (l3m->pid < 128) + mISDNport->l2mask[l3m->pid >> 3] &= ~(1 << (l3m->pid & 7)); + if (!mISDNport->l2establish.active) { + l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN); add_trace("tei", NULL, "%d", l3m->pid); end_trace(); - mISDNport->l2link = 1; - if (l3m->pid < 128) - mISDNport->l2mask[l3m->pid >> 3] |= (1 << (l3m->pid & 7)); - if ((!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) { - if (mISDNport->l2establish.active) { - unsched_timer(&mISDNport->l2establish); - PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n"); - } - } - break; - - case MT_L2RELEASE: - if (l3m->pid < 128) - mISDNport->l2mask[l3m->pid >> 3] &= ~(1 << (l3m->pid & 7)); - if (!mISDNport->l2establish.active) { - l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN); - add_trace("tei", NULL, "%d", l3m->pid); - end_trace(); - /* down if not nt-ptmp */ - if (!mISDNport->ntmode || mISDNport->ptp) - mISDNport->l2link = 0; - } - if (!mISDNport->isloopback && (!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) { - if (!mISDNport->l2establish.active && mISDNport->l2hold) { - PDEBUG(DEBUG_ISDN, "set timer and establish.\n"); - schedule_timer(&mISDNport->l2establish, 5, 0); - mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL); - } + /* down if not nt-ptmp */ + if (!mISDNport->ntmode || mISDNport->ptp) + mISDNport->l2link = 0; + } + if ((!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) { + if (!mISDNport->l2establish.active && mISDNport->l2hold) { + PDEBUG(DEBUG_ISDN, "set timer and establish.\n"); + schedule_timer(&mISDNport->l2establish, 5, 0); + mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL); } - break; - - default: - /* l3-data is sent to LCR */ - stack2manager(mISDNport, l3m->type, l3m->pid, l3m); } - /* free message */ - free_l3_msg(l3m); + break; + + default: + /* l3-data is sent to LCR */ + stack2manager(mISDNport, l3m->type, l3m->pid, l3m); } + /* free message */ + free_l3_msg(l3m); } mISDNport = mISDNport->next; } @@ -1948,8 +1686,8 @@ static int l2establish_timeout(struct lcr_timer *timer, void *instance, int i) { struct mISDNport *mISDNport = (struct mISDNport *)instance; - if (!mISDNport->isloopback && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) { -// PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum); + if (mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) { + PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum); mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL); schedule_timer(&mISDNport->l2establish, 5, 0); /* 5 seconds */ } @@ -2018,7 +1756,6 @@ static int b_sock_callback(struct lcr_fd *fd, unsigned int what, void *instance, static int b_timer_timeout(struct lcr_timer *timer, void *instance, int i) { struct mISDNport *mISDNport = (struct mISDNport *)instance; -puts("fires"); bchannel_event(mISDNport, i, B_EVENT_TIMEOUT); @@ -2036,6 +1773,7 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3 struct mISDNport *mISDNport = (struct mISDNport *)ml3->priv; struct mbuffer *mb; +#ifdef OLD_MT_ASSIGN /* special MT_ASSIGN handling: * * if we request a PID from mlayer, we always do it while lcr is locked. @@ -2053,6 +1791,7 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3 mt_assign_pid = pid; return(0); } +#endif /* queue message, create, if required */ if (!l3m) { l3m = alloc_l3_msg(); @@ -2069,7 +1808,7 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3 // this is no problem. upqueue_avail = 1; char byte = 0; - int ret; + int __attribute__((__unused__)) ret; ret = write(upqueue_pipe[1], &byte, 1); } return 0; @@ -2080,6 +1819,8 @@ int mISDN_getportbyname(int sock, int cnt, char *portname) struct mISDN_devinfo devinfo; int port = 0, ret; + memset(&devinfo, 0, sizeof(devinfo)); + /* resolve name */ while (port < cnt) { devinfo.id = port; @@ -2096,6 +1837,45 @@ int mISDN_getportbyname(int sock, int cnt, char *portname) return (port); } +#ifdef ISDN_P_FXS_POTS +/* handle frames from pots */ +static int pots_sock_callback(struct lcr_fd *fd, unsigned int what, void *instance, int i) +{ + struct mISDNport *mISDNport = (struct mISDNport *)instance; + unsigned char buffer[2048+MISDN_HEADER_LEN]; + struct mISDNhead *hh = (struct mISDNhead *)buffer; + unsigned int cont; + int ret; + + ret = recv(fd->fd, buffer, sizeof(buffer), 0); + if (ret < 0) { + PERROR("read error frame, errno %d\n", errno); + return 0; + } + if (ret < (int)MISDN_HEADER_LEN) { + PERROR("read short frame, got %d, expected %d\n", ret, (int)MISDN_HEADER_LEN); + return 0; + } + switch(hh->prim) { + case PH_CONTROL_IND: + cont = *((unsigned int *)(buffer + MISDN_HEADER_LEN)); + /* l1-control is sent to LCR */ + if (mISDNport->ntmode) + stack2manager_fxs(mISDNport, cont); + else + PERROR("FXO not supported!\n"); + break; + case PH_ACTIVATE_REQ: + break; + + default: + PERROR("child message not handled: prim(0x%x) socket(%d) msg->len(%d)\n", hh->prim, fd->fd, ret-MISDN_HEADER_LEN); + } + + return 0; +} +#endif + /* * global function to add a new card (port) */ @@ -2108,7 +1888,6 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) int force_nt = ifport->nt; int l1hold = ifport->l1hold; int l2hold = ifport->l2hold; - int loop = 0; int ss5 = ifport->ss5; int i, cnt; int pri, bri, pots; @@ -2117,24 +1896,7 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) struct mISDN_devinfo devinfo; unsigned int protocol, prop; -#if defined WITH_GSM_BS && defined WITH_GSM_MS - loop = ifport->gsm_ms | ifport->gsm_bs; -#else -#ifdef WITH_GSM_BS - loop = ifport->gsm_bs; -#endif -#ifdef WITH_GSM_MS - loop = ifport->gsm_ms; -#endif -#endif -//printf("%s == %s\n", ifport->portname, options.loopback_int); - if (!strcmp(ifport->portname, options.loopback_lcr)) - loop = 1; - - if (loop) { - if (mISDNloop_open()) - return NULL; - } + memset(&devinfo, 0, sizeof(devinfo)); /* check port counts */ ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt); @@ -2150,10 +1912,7 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) if (port < 0) { port = mISDN_getportbyname(mISDNsocket, cnt, ifport->portname); if (port < 0) { - if (loop) - PERROR_RUNTIME("Port name '%s' not found, did you load loopback interface?.\n", ifport->portname); - else - PERROR_RUNTIME("Port name '%s' not found, use 'misdn_info' tool to list all existing ports.\n", ifport->portname); + PERROR_RUNTIME("Port name '%s' not found, use 'misdn_info' tool to list all existing ports.\n", ifport->portname); return(NULL); } // note: 'port' has still the port number @@ -2187,32 +1946,29 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) pri = 1; nt = 1; } -#ifdef ISDN_P_FXS - if (devinfo.Dprotocols & (1 << ISDN_P_FXS)) { +#ifdef ISDN_P_FXS_POTS + if (devinfo.Dprotocols & (1 << ISDN_P_FXO_POTS)) { pots = 1; te = 1; } -#endif -#ifdef ISDN_P_FXO - if (devinfo.Dprotocols & (1 << ISDN_P_FXO)) { + if (devinfo.Dprotocols & (1 << ISDN_P_FXS_POTS)) { pots = 1; nt = 1; } #endif if (force_nt && !nt) { - PERROR_RUNTIME("Port %d does not support NT-mode\n", port); + if (!pots) + PERROR_RUNTIME("Port %d does not support NT-mode\n", port); + else + PERROR_RUNTIME("Port %d does not support FXS-mode\n", port); return(NULL); } if (bri && pri) { PERROR_RUNTIME("Port %d supports BRI and PRI?? What kind of controller is that?. (Can't use this!)\n", port); return(NULL); } - if (pots && !bri && !pri) { - PERROR_RUNTIME("Port %d supports POTS, LCR does not!\n", port); - return(NULL); - } - if (!bri && !pri) { - PERROR_RUNTIME("Port %d does not support BRI nor PRI!\n", port); + if (!bri && !pri && !pots) { + PERROR_RUNTIME("Port %d does not support BRI nor PRI nor POTS!\n", port); return(NULL); } if (!nt && !te) { @@ -2225,6 +1981,10 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) /* if TE an NT is supported (and not forced to NT), turn off NT */ if (te && nt) nt = 0; + if (pots && te) { + PERROR_RUNTIME("Port %d uses FXO-mode, but not supported by LCR!\n", port); + return(NULL); + } /* check for double use of port */ if (nt) { @@ -2267,21 +2027,14 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) mISDNportp = &((*mISDNportp)->next); mISDNport = (struct mISDNport *)MALLOC(sizeof(struct mISDNport)); add_timer(&mISDNport->l2establish, l2establish_timeout, mISDNport, 0); - if (loop | ss5) { - /* loop/ss5 link is always active */ + if (ss5) { + /* ss5 link is always active */ mISDNport->l1link = 1; mISDNport->l2link = 1; } else { mISDNport->l1link = -1; mISDNport->l2link = -1; } -#ifdef WITH_GSM_BS - mISDNport->gsm_bs = ifport->gsm_bs; -#endif -#ifdef WITH_GSM_MS - mISDNport->gsm_ms = ifport->gsm_ms; -#endif - mISDNport->isloopback = loop; pmemuse++; *mISDNportp = mISDNport; @@ -2293,7 +2046,7 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) if (ss5) { /* try to keep interface enabled */ l1hold = 1; - l2hold = 1; + l2hold = 0; } /* set l2hold */ switch (l2hold) { @@ -2312,55 +2065,59 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) } /* allocate ressources of port */ - protocol = (nt)?L3_PROTOCOL_DSS1_NET:L3_PROTOCOL_DSS1_USER; - prop = (1 << MISDN_FLG_L2_CLEAN); - if (ptp) // ptp forced - prop |= (1 << MISDN_FLG_PTP); - if (nt) // supports hold/retrieve on nt-mode - prop |= (1 << MISDN_FLG_NET_HOLD); - if (l1hold) // supports layer 1 hold - prop |= (1 << MISDN_FLG_L1_HOLD); - if (l2hold) // supports layer 2 hold - prop |= (1 << MISDN_FLG_L2_HOLD); - /* open layer 3 and init upqueue */ - if (loop) { - unsigned long on = 1; - struct sockaddr_mISDN addr; - - if (devinfo.nrbchan < 8) { - printf("loop port %d has a low number of bchannels. (only %d) remember that all interfaces that requires a loopback could run out of channels\n", port, devinfo.nrbchan); -// mISDNport_close(mISDNport); -// return(NULL); - } - - if ((mISDNport->lcr_sock = socket(PF_ISDN, SOCK_DGRAM, (bri) ? ISDN_P_TE_S0 : ISDN_P_TE_E1)) < 0) { - PERROR_RUNTIME("loop port %d failed to open socket.\n", port); + if (!pots) { + /* ISDN */ + protocol = (nt)?L3_PROTOCOL_DSS1_NET:L3_PROTOCOL_DSS1_USER; + prop = (1 << MISDN_FLG_L2_CLEAN); + if (ptp) // ptp forced + prop |= (1 << MISDN_FLG_PTP); + if (nt) // supports hold/retrieve on nt-mode + prop |= (1 << MISDN_FLG_NET_HOLD); + if (l1hold) // supports layer 1 hold + prop |= (1 << MISDN_FLG_L1_HOLD); + if (l2hold) // supports layer 2 hold + prop |= (1 << MISDN_FLG_L2_HOLD); + /* open layer 3 and init upqueue */ + /* queue must be initializes, because l3-thread may send messages during open_layer3() */ + mqueue_init(&mISDNport->upqueue); + mISDNport->ml3 = open_layer3(port, protocol, prop , do_layer3, mISDNport); + if (!mISDNport->ml3) { + mqueue_purge(&mISDNport->upqueue); + PERROR_RUNTIME("open_layer3() failed for port %d\n", port); + start_trace(port, + ifport->interface, + NULL, + NULL, + DIRECTION_NONE, + CATEGORY_CH, + 0, + "PORT (open failed)"); + end_trace(); mISDNport_close(mISDNport); return(NULL); } - /* set nonblocking io */ - if (ioctl(mISDNport->lcr_sock, FIONBIO, &on) < 0) { - PERROR_RUNTIME("loop port %d failed to set socket into nonblocking io.\n", port); - mISDNport_close(mISDNport); - return(NULL); + } else { +#ifdef ISDN_P_FXS_POTS + /* POTS */ + int sock, ret; + struct sockaddr_mISDN addr; + struct mISDNhead act; + + /* open socket */ + /* queue must be initializes, because even pots interfaces are checked at mISDN_upqueue loop */ + mqueue_init(&mISDNport->upqueue); + sock = socket(PF_ISDN, SOCK_DGRAM, (nt) ? ISDN_P_FXS_POTS : ISDN_P_FXO_POTS); + if (sock < 0) { + PERROR_RUNTIME("Cannot open mISDN due to '%s'.\n", strerror(errno)); + return NULL; } /* bind socket to dchannel */ - memset(&addr, 0, sizeof(addr)); addr.family = AF_ISDN; addr.dev = port; addr.channel = 0; - if (bind(mISDNport->lcr_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - PERROR_RUNTIME("loop port %d failed to bind socket. (errno %d)\n", port, errno); - mISDNport_close(mISDNport); - return(NULL); - } - } else { - /* queue must be initializes, because l3-thread may send messages during open_layer3() */ - mqueue_init(&mISDNport->upqueue); - mISDNport->ml3 = open_layer3(port, protocol, prop , do_layer3, mISDNport); - if (!mISDNport->ml3) { - mqueue_purge(&mISDNport->upqueue); - PERROR_RUNTIME("open_layer3() failed for port %d\n", port); + ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr)); + if (ret < 0) { + PERROR_RUNTIME("Error: Failed to bind pots control channel\n"); start_trace(port, ifport->interface, NULL, @@ -2370,15 +2127,23 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) 0, "PORT (open failed)"); end_trace(); - mISDNport_close(mISDNport); return(NULL); } + act.prim = PH_ACTIVATE_REQ; + act.id = 0; + ret = sendto(sock, &act, MISDN_HEADER_LEN, 0, NULL, 0); + if (ret <= 0) + PERROR("Failed to send to socket %d\n", sock); + mISDNport->pots_sock.fd = sock; + register_fd(&mISDNport->pots_sock, LCR_FD_READ, pots_sock_callback, mISDNport, i); +#endif } SCPY(mISDNport->name, devinfo.name); mISDNport->b_num = devinfo.nrbchan; mISDNport->portnum = port; mISDNport->ntmode = nt; + mISDNport->pots = pots; mISDNport->tespecial = ifport->tespecial; mISDNport->pri = pri; mISDNport->ptp = ptp; @@ -2394,7 +2159,7 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) } /* if ptp, pull up the link */ - if (!mISDNport->isloopback && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) { + if (!pots && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) { mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL); l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT); add_trace("tei", NULL, "%d", 0); @@ -2402,8 +2167,8 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) schedule_timer(&mISDNport->l2establish, 5, 0); /* 5 seconds */ } - /* for nt-mode ptmp the link is always up */ - if (mISDNport->ntmode && !mISDNport->ptp) + /* for POTS or nt-mode ptmp the link is always up */ + if (pots || (mISDNport->ntmode && !mISDNport->ptp)) mISDNport->l2link = 1; PDEBUG(DEBUG_BCHANNEL, "using 'mISDN_dsp.o' module\n"); @@ -2416,7 +2181,10 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport) CATEGORY_CH, 0, "PORT (open)"); - add_trace("mode", NULL, (mISDNport->ntmode)?"network":"terminal"); + if (!pots) + add_trace("mode", NULL, (mISDNport->ntmode)?"network":"terminal"); + else + add_trace("mode", NULL, (mISDNport->ntmode)?"FXS":"FXO"); add_trace("channels", NULL, "%d", mISDNport->b_num); if (mISDNport->ss5) add_trace("ccitt#5", NULL, "enabled"); @@ -2507,18 +2275,18 @@ void mISDNport_close(struct mISDNport *mISDNport) del_timer(&mISDNport->l2establish); /* close layer 3, if open */ - if (!mISDNport->isloopback && mISDNport->ml3) { + if (mISDNport->ml3) { close_layer3(mISDNport->ml3); } - /* close gsm socket, if open */ - if (mISDNport->isloopback && mISDNport->lcr_sock > -1) { - close(mISDNport->lcr_sock); + /* close layer 1, if open */ + if (mISDNport->pots_sock.fd) { + unregister_fd(&mISDNport->pots_sock); + close(mISDNport->pots_sock.fd); } /* purge upqueue */ - if (!mISDNport->isloopback) - mqueue_purge(&mISDNport->upqueue); + mqueue_purge(&mISDNport->upqueue); /* remove from list */ mISDNportp = &mISDNport_first; @@ -2541,45 +2309,52 @@ void mISDNport_close(struct mISDNport *mISDNport) /* - * enque data from upper buffer + * enque data from remote port */ -void PmISDN::txfromup(unsigned char *data, int length) +int PmISDN::bridge_rx(unsigned char *data, int length) { - unsigned char buf[MISDN_HEADER_LEN+((length>ISDN_LOAD)?length:ISDN_LOAD)]; + unsigned char buf[MISDN_HEADER_LEN+((length>p_m_preload)?length:p_m_preload)]; struct mISDNhead *hh = (struct mISDNhead *)buf; int ret; + if ((ret = Port::bridge_rx(data, length))) + return ret; + if (p_m_b_index < 0) - return; + return -EIO; if (p_m_mISDNport->b_state[p_m_b_index] != B_STATE_ACTIVE) - return; + return -EINVAL; /* check if high priority tones exist * ignore data in this case */ - if (p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on) - return; + if (p_tone_name[0] || p_dov_tx || p_m_crypt_msg_loops || p_m_inband_send_on) + return -EBUSY; /* preload procedure * if transmit buffer in DSP module is empty, * preload it to DSP_LOAD to prevent jitter gaps. + * + * if load runs empty, preload again. */ - if (p_m_load == 0 && ISDN_LOAD > 0) { + if (p_m_disable_dejitter && p_m_load == 0 && p_m_preload > 0) { +//printf("preload=%d\n", p_m_preload); hh->prim = PH_DATA_REQ; hh->id = 0; - memset(buf+MISDN_HEADER_LEN, (options.law=='a')?0x2a:0xff, ISDN_LOAD); - ret = sendto(p_m_mISDNport->b_sock[p_m_b_index].fd, buf, MISDN_HEADER_LEN+ISDN_LOAD, 0, NULL, 0); + memset(buf+MISDN_HEADER_LEN, silence, p_m_preload); + ret = sendto(p_m_mISDNport->b_sock[p_m_b_index].fd, buf, MISDN_HEADER_LEN+p_m_preload, 0, NULL, 0); if (ret <= 0) PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_sock[p_m_b_index].fd); - p_m_load += ISDN_LOAD; - schedule_timer(&p_m_loadtimer, 0, ISDN_TRANSMIT*125); + p_m_load += p_m_preload; + schedule_timer(&p_m_loadtimer, 0, PORT_TRANSMIT * 125); } /* drop if load would exceed ISDN_MAXLOAD * this keeps the delay not too high */ - if (p_m_load+length > ISDN_MAXLOAD) - return; +//printf("load=%d len=%d 2*preload=%d\n", p_m_load, length, p_m_preload << 1); + if (p_m_disable_dejitter && p_m_preload > 0 && p_m_load+length > (p_m_preload << 1)) + return -EINVAL; /* make and send frame */ hh->prim = PH_DATA_REQ; @@ -2589,6 +2364,8 @@ void PmISDN::txfromup(unsigned char *data, int length) if (ret <= 0) PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_sock[p_m_b_index].fd); p_m_load += length; + + return 0; } int PmISDN::inband_send(unsigned char *buffer, int len) @@ -2601,8 +2378,6 @@ void PmISDN::inband_send_on(void) { PDEBUG(DEBUG_PORT, "turning inband signalling send on.\n"); p_m_inband_send_on = 1; - /* trigger inband transmit */ - update_load(); } void PmISDN::inband_send_off(void)