X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.cpp;h=4f6f67870747677bc8bcd8c8679825549df9039c;hp=40d52040552807dc4500ebf63fea78e999aa4e21;hb=7b78740c6e5e4ad585d36c157333b8c5018dcc82;hpb=559ff64e3062b70f27ddceba825f40642a6c5725 diff --git a/mISDN.cpp b/mISDN.cpp index 40d5204..4f6f678 100644 --- a/mISDN.cpp +++ b/mISDN.cpp @@ -53,26 +53,26 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti p_m_b_channel = 0; p_m_b_exclusive = 0; p_m_b_reserve = 0; - p_m_b_addr = 0; - p_m_b_stid = 0; p_m_jittercheck = 0; p_m_delete = 0; p_m_hold = 0; p_m_txvol = p_m_rxvol = 0; p_m_conf = 0; -#warning set delay by routing parameter or interface config + p_m_txdata = 0; p_m_delay = 0; p_m_echo = 0; p_m_tone = 0; p_m_rxoff = 0; - p_m_txmix = 0; - p_m_txmix_on = 0; - p_m_nodata = 1; /* may be 1, because call always notifies us */ - p_m_dtmf = !options.nodtmf; + p_m_calldata = 0; + p_m_dtmf = !mISDNport->ifport->nodtmf; p_m_timeout = 0; p_m_timer = 0; -#warning denke auch an die andere seite. also das setup sollte dies weitertragen + /* audio from up */ + p_m_fromup_buffer_readp = 0; + p_m_fromup_buffer_writep = 0; + + /* crypt */ p_m_crypt = 0; p_m_crypt_listen = 0; p_m_crypt_msg_loops = 0; @@ -96,9 +96,8 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti mISDNport->b_reserved++; } - } else /* reserve channel */ - if (channel) // only if constructor was called with a channel resevation + if (channel > 0) // only if constructor was called with a channel resevation seize_bchannel(channel, exclusive); /* we increase the number of objects: */ @@ -115,7 +114,7 @@ PmISDN::~PmISDN() struct message *message; /* remove bchannel relation */ - free_bchannel(); + drop_bchannel(); /* release epoint */ while (p_epointlist) @@ -136,9 +135,128 @@ PmISDN::~PmISDN() /* + * trace + */ +void chan_trace_header(struct mISDNport *mISDNport, class PmISDN *port, char *msgtext, int direction) +{ + /* init trace with given values */ + start_trace(mISDNport?mISDNport->portnum:0, + (mISDNport)?((mISDNport->ifport)?mISDNport->ifport->interface:NULL):NULL, + port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype):NULL, + port?port->p_dialinginfo.id:NULL, + direction, + CATEGORY_CH, + port?port->p_serial:0, + msgtext); +} + + +/* + * layer trace header + */ +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}, + + {NULL, 0}, +}; +static char *isdn_prim[4] = { + " REQUEST", + " CONFIRM", + " INDICATION", + " RESPONSE", +}; +void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long prim, int direction) +{ + int i; + char msgtext[64] = "<>"; + + /* select message and primitive text */ + i = 0; + while(isdn_message[i].name) + { + if (isdn_message[i].value == (prim&0xffffff00)) + { + SCPY(msgtext, isdn_message[i].name); + break; + } + i++; + } + SCAT(msgtext, isdn_prim[prim&0x00000003]); + + /* add direction */ + if (direction && (prim&0xffffff00)!=CC_NEW_CR && (prim&0xffffff00)!=CC_RELEASE_CR) + { + if (mISDNport) + { + if (mISDNport->ntmode) + { + if (direction == DIRECTION_OUT) + SCAT(msgtext, " N->U"); + else + SCAT(msgtext, " N<-U"); + } else + { + if (direction == DIRECTION_OUT) + SCAT(msgtext, " U->N"); + else + SCAT(msgtext, " U<-N"); + } + } + } + + /* init trace with given values */ + start_trace(mISDNport?mISDNport->portnum:0, + mISDNport?mISDNport->ifport->interface:NULL, + port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype):NULL, + port?port->p_dialinginfo.id:NULL, + direction, + CATEGORY_CH, + port?port->p_serial:0, + msgtext); +} + + +/* * send control information to the channel (dsp-module) */ -void ph_control(unsigned long b_addr, int c1, int c2) +void ph_control(struct mISDNport *mISDNport, class PmISDN *isdnport, unsigned long b_addr, int c1, int c2, char *trace_name, int trace_value) { unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+sizeof(int)]; iframe_t *ctrl = (iframe_t *)buffer; @@ -147,13 +265,16 @@ void ph_control(unsigned long b_addr, int c1, int c2) ctrl->prim = PH_CONTROL | REQUEST; ctrl->addr = b_addr | FLG_MSG_DOWN; ctrl->dinfo = 0; - ctrl->len = sizeof(unsigned long)*2; + ctrl->len = sizeof(int)*2; *d++ = c1; *d++ = c2; mISDN_write(mISDNdevice, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC); + chan_trace_header(mISDNport, isdnport, "BCHANNEL control", DIRECTION_OUT); + add_trace(trace_name, NULL, "%d", trace_value); + end_trace(); } -void ph_control_block(unsigned long b_addr, int c1, void *c2, int c2_len) +void ph_control_block(struct mISDNport *mISDNport, class PmISDN *isdnport, unsigned long b_addr, int c1, void *c2, int c2_len, char *trace_name, int trace_value) { unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+c2_len]; iframe_t *ctrl = (iframe_t *)buffer; @@ -162,200 +283,385 @@ void ph_control_block(unsigned long b_addr, int c1, void *c2, int c2_len) ctrl->prim = PH_CONTROL | REQUEST; ctrl->addr = b_addr | FLG_MSG_DOWN; ctrl->dinfo = 0; - ctrl->len = sizeof(unsigned long)*2; + ctrl->len = sizeof(int)+c2_len; *d++ = c1; memcpy(d, c2, c2_len); mISDN_write(mISDNdevice, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC); + chan_trace_header(mISDNport, isdnport, "BCHANNEL control", DIRECTION_OUT); + add_trace(trace_name, NULL, "%d", trace_value); + end_trace(); } /* - * activate / deactivate bchannel + * subfunction for bchannel_event + * create stack */ -static void bchannel_activate(struct mISDNport *mISDNport, int i) +static int _bchannel_create(struct mISDNport *mISDNport, int i) { - iframe_t act; + unsigned char buff[1024]; + layer_info_t li; + mISDN_pid_t pid; + int ret; - /* we must activate if we are deactivated */ - if (mISDNport->b_state[i] == B_STATE_IDLE) + if (!mISDNport->b_stid[i]) { - /* activate bchannel */ - PDEBUG(DEBUG_BCHANNEL, "activating bchannel (index %d), because currently idle (address 0x%x).\n", i, mISDNport->b_addr[i]); - act.prim = DL_ESTABLISH | REQUEST; - act.addr = mISDNport->b_addr[i] | FLG_MSG_DOWN; - act.dinfo = 0; - act.len = 0; - mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC); - mISDNport->b_state[i] = B_STATE_ACTIVATING; - return; + PERROR("Error: no stack for index %d\n", i); + return(0); + } + if (mISDNport->b_addr[i]) + { + PERROR("Error: stack already created for index %d\n", i); + return(0); } - /* if we are active, we configure our channel */ - if (mISDNport->b_state[i] == B_STATE_ACTIVE) + /* create new layer */ + PDEBUG(DEBUG_BCHANNEL, "creating new layer for bchannel %d (index %d).\n" , i+1+(i>=15), i); + memset(&li, 0, sizeof(li)); + memset(&pid, 0, sizeof(pid)); + li.object_id = -1; + li.extentions = 0; + li.st = mISDNport->b_stid[i]; + UCPY(li.name, "B L4"); + li.pid.layermask = ISDN_LAYER((4)); + li.pid.protocol[4] = ISDN_PID_L4_B_USER; + ret = mISDN_new_layer(mISDNdevice, &li); + if (ret) + { + failed_new_layer: + PERROR("mISDN_new_layer() failed to add bchannel %d (index %d)\n", i+1+(i>=15), i); + goto failed; + } + mISDNport->b_addr[i] = li.id; + if (!li.id) { - unsigned char buffer[mISDN_HEADER_LEN+ISDN_PRELOAD]; - iframe_t *pre = (iframe_t *)buffer; /* preload data */ - unsigned char *p = (unsigned char *)&pre->data.p; + goto failed_new_layer; + } + PDEBUG(DEBUG_BCHANNEL, "new layer (b_addr=0x%x)\n", mISDNport->b_addr[i]); + + /* create new stack */ + pid.protocol[1] = ISDN_PID_L1_B_64TRANS; + pid.protocol[2] = ISDN_PID_L2_B_TRANS; + pid.protocol[3] = ISDN_PID_L3_B_DSP; + pid.protocol[4] = ISDN_PID_L4_B_USER; + pid.layermask = ISDN_LAYER((1)) | ISDN_LAYER((2)) | ISDN_LAYER((3)) | ISDN_LAYER((4)); + ret = mISDN_set_stack(mISDNdevice, mISDNport->b_stid[i], &pid); + if (ret) + { + stack_error: + PERROR("mISDN_set_stack() failed (ret=%d) to add bchannel (index %d) stid=0x%x\n", ret, i, mISDNport->b_stid[i]); + mISDN_write_frame(mISDNdevice, buff, mISDNport->b_addr[i], MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); + goto failed; + } + ret = mISDN_get_setstack_ind(mISDNdevice, mISDNport->b_addr[i]); + if (ret) + goto stack_error; + + /* get layer id */ + mISDNport->b_addr[i] = mISDN_get_layerid(mISDNdevice, mISDNport->b_stid[i], 4); + if (!mISDNport->b_addr[i]) + goto stack_error; + chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL create stack", DIRECTION_OUT); + add_trace("channel", NULL, "%d", i+1+(i>=15)); + add_trace("stack", "id", "0x%8x", mISDNport->b_stid[i]); + add_trace("stack", "address", "0x%8x", mISDNport->b_addr[i]); + end_trace(); - /* it is an error if this channel is not associated with a port object */ - if (!mISDNport->b_port[i]) - { - PERROR("bchannel index i=%d not associated with a port object\n", i); - return; - } + return(1); - /* configure dsp features */ - if (mISDNport->b_port[i]->p_m_delay) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we set delay to delay=%d.\n", mISDNport->b_port[i]->p_m_delay); - ph_control(mISDNport->b_addr[i], CMX_DELAY, mISDNport->b_port[i]->p_m_delay); - } - if (mISDNport->b_port[i]->p_m_txvol) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we change tx-volume to shift=%d.\n", mISDNport->b_port[i]->p_m_txvol); - ph_control(mISDNport->b_addr[i], VOL_CHANGE_TX, mISDNport->b_port[i]->p_m_txvol); - } - if (mISDNport->b_port[i]->p_m_rxvol) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we change rx-volume to shift=%d.\n", mISDNport->b_port[i]->p_m_rxvol); - ph_control(mISDNport->b_addr[i], VOL_CHANGE_RX, mISDNport->b_port[i]->p_m_rxvol); - } -//tone if (mISDNport->b_port[i]->p_m_conf && !mISDNport->b_port[i]->p_m_tone) - if (mISDNport->b_port[i]->p_m_conf) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we change conference to conf=%d.\n", mISDNport->b_port[i]->p_m_conf); - ph_control(mISDNport->b_addr[i], CMX_CONF_JOIN, mISDNport->b_port[i]->p_m_conf); - } - if (mISDNport->b_port[i]->p_m_echo) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we set echo to echo=%d.\n", mISDNport->b_port[i]->p_m_echo); - ph_control(mISDNport->b_addr[i], CMX_ECHO_ON, 0); - } - if (mISDNport->b_port[i]->p_m_tone) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we set tone to tone=%d.\n", mISDNport->b_port[i]->p_m_tone); - ph_control(mISDNport->b_addr[i], TONE_PATT_ON, mISDNport->b_port[i]->p_m_tone); - } - if (mISDNport->b_port[i]->p_m_rxoff) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we set rxoff to rxoff=%d.\n", mISDNport->b_port[i]->p_m_rxoff); - ph_control(mISDNport->b_addr[i], CMX_RECEIVE_OFF, 0); - } - if (mISDNport->b_port[i]->p_m_txmix) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we set txmix to txmix=%d.\n", mISDNport->b_port[i]->p_m_txmix); - ph_control(mISDNport->b_addr[i], CMX_MIX_ON, 0); - } - if (mISDNport->b_port[i]->p_m_dtmf) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we set dtmf to dtmf=%d.\n", mISDNport->b_port[i]->p_m_dtmf); - ph_control(mISDNport->b_addr[i], DTMF_TONE_START, 0); - } - if (mISDNport->b_port[i]->p_m_crypt) - { - PDEBUG(DEBUG_BCHANNEL, "during activation, we set crypt to crypt=%d.\n", mISDNport->b_port[i]->p_m_crypt); - ph_control_block(mISDNport->b_addr[i], BF_ENABLE_KEY, mISDNport->b_port[i]->p_m_crypt_key, mISDNport->b_port[i]->p_m_crypt_key_len); - } +failed: + mISDNport->b_addr[i] = 0; + return(0); +} - /* preload tx-buffer */ - pre->len = mISDNport->b_port[i]->read_audio(p, ISDN_PRELOAD, 1); - if (pre->len > 0) - { - PDEBUG(DEBUG_BCHANNEL, "port is activated, we fill our buffer (ISDN_PRELOAD = %d).\n", pre->len); - /* flip bits */ -#if 0 - q = p + pre->len; - while(p != q) - *p++ = flip[*p]; -#endif - pre->prim = DL_DATA | REQUEST; - pre->addr = mISDNport->b_addr[i] | FLG_MSG_DOWN; - pre->dinfo = 0; - mISDN_write(mISDNdevice, pre, mISDN_HEADER_LEN+pre->len, TIMEOUT_1SEC); - } + +/* + * subfunction for bchannel_event + * activate request + */ +static void _bchannel_activate(struct mISDNport *mISDNport, int i) +{ + iframe_t act; + + /* activate bchannel */ + chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL activate", DIRECTION_OUT); + add_trace("channel", NULL, "%d", i+1+(i>=15)); + end_trace(); + act.prim = DL_ESTABLISH | REQUEST; + act.addr = mISDNport->b_addr[i] | FLG_MSG_DOWN; + act.dinfo = 0; + act.len = 0; + mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC); +} + + +/* + * subfunction for bchannel_event + * set features + */ +static void _bchannel_configure(struct mISDNport *mISDNport, int i) +{ + struct PmISDN *port; + int addr; + + port = mISDNport->b_port[i]; + addr = mISDNport->b_addr[i]; + if (!port) + { + PERROR("bchannel index i=%d not associated with a port object\n", i); + return; } + + /* set dsp features */ + if (port->p_m_txdata) + ph_control(mISDNport, port, addr, (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, addr, CMX_DELAY, port->p_m_delay, "DSP-DELAY", port->p_m_delay); + if (port->p_m_txvol) + ph_control(mISDNport, port, addr, VOL_CHANGE_TX, port->p_m_txvol, "DSP-TXVOL", port->p_m_txvol); + if (port->p_m_rxvol) + ph_control(mISDNport, port, addr, VOL_CHANGE_RX, port->p_m_rxvol, "DSP-RXVOL", port->p_m_rxvol); + if (port->p_m_conf) + ph_control(mISDNport, port, addr, CMX_CONF_JOIN, port->p_m_conf, "DSP-CONF", port->p_m_conf); + if (port->p_m_echo) + ph_control(mISDNport, port, addr, CMX_ECHO_ON, 0, "DSP-ECHO", 1); + if (port->p_m_tone) + ph_control(mISDNport, port, addr, TONE_PATT_ON, port->p_m_tone, "DSP-TONE", port->p_m_tone); + if (port->p_m_rxoff) + ph_control(mISDNport, port, addr, CMX_RECEIVE_OFF, 0, "DSP-RXOFF", 1); +// if (port->p_m_txmix) +// ph_control(mISDNport, port, addr, CMX_MIX_ON, 0, "DSP-MIX", 1); + if (port->p_m_dtmf) + ph_control(mISDNport, port, addr, DTMF_TONE_START, 0, "DSP-DTMF", 1); + if (port->p_m_crypt) + ph_control_block(mISDNport, port, addr, BF_ENABLE_KEY, port->p_m_crypt_key, port->p_m_crypt_key_len, "DSP-CRYPT", port->p_m_crypt_key_len); } -static void bchannel_deactivate(struct mISDNport *mISDNport, int i) +/* + * subfunction for bchannel_event + * deactivate + */ +static void _bchannel_deactivate(struct mISDNport *mISDNport, int i) { iframe_t dact; + + chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL deactivate", DIRECTION_OUT); + add_trace("channel", NULL, "%d", i+1+(i>=15)); + end_trace(); + dact.prim = DL_RELEASE | REQUEST; + dact.addr = mISDNport->b_addr[i] | FLG_MSG_DOWN; + dact.dinfo = 0; + dact.len = 0; + mISDN_write(mISDNdevice, &dact, mISDN_HEADER_LEN+dact.len, TIMEOUT_1SEC); +} + +/* + * subfunction for bchannel_event + * destroy stack + */ +static void _bchannel_destroy(struct mISDNport *mISDNport, int i) +{ + unsigned char buff[1024]; + + chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL remove stack", DIRECTION_OUT); + add_trace("channel", NULL, "%d", i+1+(i>=15)); + add_trace("stack", "id", "0x%8x", mISDNport->b_stid[i]); + add_trace("stack", "address", "0x%8x", mISDNport->b_addr[i]); + end_trace(); + /* remove our stack only if set */ + PDEBUG(DEBUG_BCHANNEL, "free stack (b_addr=0x%x)\n", mISDNport->b_addr[i]); + mISDN_clear_stack(mISDNdevice, mISDNport->b_stid[i]); + if (mISDNport->b_addr[i]) + mISDN_write_frame(mISDNdevice, buff, mISDNport->b_addr[i] | FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); + mISDNport->b_addr[i] = 0; +} + + +/* +bchannel procedure +------------------ + +A bchannel goes through the following states in this order: + +- B_STATE_IDLE +No one is using the bchannel. +It is available and not linked to Port class, nor reserved. + +- B_STATE_ACTIVATING +The bchannel stack is created and an activation request is sent. +It MAY be linked to Port class, but already unlinked due to Port class removal. + +- B_STATE_ACTIVE +The bchannel is active and cofigured to the Port class needs. +Also it is linked to a Port class, otherwhise it would be deactivated. - if (mISDNport->b_state[i] == B_STATE_ACTIVE) +- B_STATE_DEACTIVATING +The bchannel is in deactivating state, due to deactivation request. +It may be linked to a Port class, that likes to reactivate it. + +- B_STATE_IDLE +See above. +After deactivating bchannel, and if not used, the bchannel becomes idle again. + + +A bchannel can have the following events: + +- B_EVENT_ACTIVATE +A bchannel is required by a Port class. + +- B_EVENT_ACTIVATED +The bchannel beomes active. + +- B_EVENT_DEACTIVATE +The bchannel is not required by Port class anymore + +- B_EVENT_DEACTIVATED +The bchannel becomes inactive. + +All actions taken on these events depend on the current bchannel's state and if it is linked to a Port class. + +*/ + +/* + * process bchannel events + * - mISDNport is a pointer to the port's structure + * - i is the index of the bchannel + * - event is the B_EVENT_* value + * - port is the PmISDN class pointer + */ +void bchannel_event(struct mISDNport *mISDNport, int i, int event) +{ + int state = mISDNport->b_state[i]; + + switch(event) { - /* reset dsp features */ - if (mISDNport->b_port[i]) + case B_EVENT_ACTIVATE: + /* port must be linked in order to allow activation */ + if (!mISDNport->b_port[i]) { - if (mISDNport->b_port[i]->p_m_delay) - { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset delay from delay=%d.\n", mISDNport->b_port[i]->p_m_delay); - ph_control(mISDNport->b_addr[i], CMX_JITTER, 0); - } - if (mISDNport->b_port[i]->p_m_txvol) - { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset tx-volume from shift=%d.\n", mISDNport->b_port[i]->p_m_txvol); - ph_control(mISDNport->b_addr[i], VOL_CHANGE_TX, 0); - } - if (mISDNport->b_port[i]->p_m_rxvol) - { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset rx-volume from shift=%d.\n", mISDNport->b_port[i]->p_m_rxvol); - ph_control(mISDNport->b_addr[i], VOL_CHANGE_RX, 0); - } - if (mISDNport->b_port[i]->p_m_conf) - { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we release conference from conf=%d.\n", mISDNport->b_port[i]->p_m_conf); - ph_control(mISDNport->b_addr[i], CMX_CONF_SPLIT, 0); - } - if (mISDNport->b_port[i]->p_m_echo) - { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset echo from echo=%d.\n", mISDNport->b_port[i]->p_m_echo); - ph_control(mISDNport->b_addr[i], CMX_ECHO_OFF, 0); - } - if (mISDNport->b_port[i]->p_m_tone) - { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset tone from tone=%d.\n", mISDNport->b_port[i]->p_m_tone); - ph_control(mISDNport->b_addr[i], TONE_PATT_OFF, 0); - } - if (mISDNport->b_port[i]->p_m_rxoff) + PERROR("SOFTWARE ERROR: bchannel must be linked to a Port class\n"); + exit(-1); + } + switch(state) + { + case B_STATE_IDLE: + /* create stack and send activation request */ + if (_bchannel_create(mISDNport, i)) { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset rxoff from rxoff=%d.\n", mISDNport->b_port[i]->p_m_rxoff); - ph_control(mISDNport->b_addr[i], CMX_RECEIVE_ON, 0); + _bchannel_activate(mISDNport, i); + state = B_STATE_ACTIVATING; } - if (mISDNport->b_port[i]->p_m_txmix) + break; + + case B_STATE_ACTIVATING: + /* do nothing, because it is already activating */ + break; + + case B_STATE_DEACTIVATING: + /* do nothing, because we must wait until we can reactivate */ + break; + + default: + PERROR("Illegal event %d at state %d, please correct.\n", event, state); + } + break; + + case B_EVENT_ACTIVATED: + switch(state) + { + case B_STATE_ACTIVATING: + if (mISDNport->b_port[i]) { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset txmix from txmix=%d.\n", mISDNport->b_port[i]->p_m_txmix); - ph_control(mISDNport->b_addr[i], CMX_MIX_OFF, 0); - } - if (mISDNport->b_port[i]->p_m_dtmf) + /* bchannel is active and used by Port class, so we configure bchannel */ + _bchannel_configure(mISDNport, i); + state = B_STATE_ACTIVE; + } else { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset dtmf from dtmf=%d.\n", mISDNport->b_port[i]->p_m_dtmf); - ph_control(mISDNport->b_addr[i], DTMF_TONE_STOP, 0); + /* bchannel is active, but not used anymore (or has wrong stack config), so we deactivate */ + _bchannel_deactivate(mISDNport, i); + state = B_STATE_DEACTIVATING; } - if (mISDNport->b_port[i]->p_m_crypt) + break; + + default: + PERROR("Illegal event %d at state %d, please correct.\n", event, state); + } + break; + + case B_EVENT_DEACTIVATE: + if (!mISDNport->b_port[i]) + { + PERROR("SOFTWARE ERROR: bchannel must be linked to a Port class\n"); + exit(-1); + } + switch(state) + { + case B_STATE_IDLE: + /* bchannel is idle due to an error, so we do nothing */ + break; + + case B_STATE_ACTIVATING: + /* do nothing because we must wait until bchanenl is active before deactivating */ + break; + + case B_STATE_ACTIVE: + /* bchannel is active, so we deactivate */ + _bchannel_deactivate(mISDNport, i); + state = B_STATE_DEACTIVATING; + break; + + case B_STATE_DEACTIVATING: + /* 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_DEACTIVATED: + switch(state) + { + case B_STATE_IDLE: + /* ignore due to deactivation confirm after unloading */ + break; + + case B_STATE_DEACTIVATING: + _bchannel_destroy(mISDNport, i); + state = B_STATE_IDLE; + if (mISDNport->b_port[i]) { - PDEBUG(DEBUG_BCHANNEL, "during deactivation, we reset crypt from crypt=%d.\n", mISDNport->b_port[i]->p_m_dtmf); - ph_control(mISDNport->b_addr[i], BF_DISABLE, 0); + /* bchannel is now deactivate, but is requied by Port class, so we reactivate */ + if (_bchannel_create(mISDNport, i)) + { + _bchannel_activate(mISDNport, i); + state = B_STATE_ACTIVATING; + } } + break; + + default: + PERROR("Illegal event %d at state %d, please correct.\n", event, state); } - /* deactivate bchannel */ - PDEBUG(DEBUG_BCHANNEL, "deactivating bchannel (index %d), because currently active.\n", i); - dact.prim = DL_RELEASE | REQUEST; - dact.addr = mISDNport->b_addr[i] | FLG_MSG_DOWN; - dact.dinfo = 0; - dact.len = 0; - mISDN_write(mISDNdevice, &dact, mISDN_HEADER_LEN+dact.len, TIMEOUT_1SEC); - mISDNport->b_state[i] = B_STATE_DEACTIVATING; - return; + break; + + default: + PERROR("Illegal event %d, please correct.\n", event); } + + mISDNport->b_state[i] = state; } + + /* * check for available channel and reserve+set it. * give channel number or SEL_CHANNEL_ANY or SEL_CHANNEL_NO * give exclusiv flag * returns -(cause value) or x = channel x or 0 = no channel + * NOTE: no activation is done here */ -denke ans aktivieren und deaktivieren int PmISDN::seize_bchannel(int channel, int exclusive) { int i; @@ -409,32 +715,34 @@ int PmISDN::seize_bchannel(int channel, int exclusive) return(-34); /* no free channel */ seize: + PDEBUG(DEBUG_BCHANNEL, "PmISDN(%s) seizing bchannel %d (index %d)\n", p_name, channel, i); + /* link Port */ p_m_mISDNport->b_port[i] = this; p_m_b_index = i; p_m_b_channel = channel; p_m_b_exclusive = exclusive; - p_m_b_stid = p_m_mISDNport->b_stid[i]; - p_m_b_addr = p_m_mISDNport->b_addr[i]; p_m_jittercheck = 0; /* reserve channel */ - if (p_m_b_reserve == 0) // already reserved + if (!p_m_b_reserve) { p_m_b_reserve = 1; - mISDNport->b_reserved++; + p_m_mISDNport->b_reserved++; } - PDEBUG(DEBUG_BCHANNEL, "PmISDN(%s) seizing bchannel %d (index %d)\n", p_name, channel, i); - return(channel); } /* * drop reserved channel and unset it. + * deactivation is also done */ void PmISDN::drop_bchannel(void) { + if (p_m_b_index < 0) + return; + /* unreserve channel */ if (p_m_b_reserve) p_m_mISDNport->b_reserved--; @@ -446,20 +754,140 @@ void PmISDN::drop_bchannel(void) PDEBUG(DEBUG_BCHANNEL, "PmISDN(%s) dropping bchannel\n", p_name); + if (p_m_mISDNport->b_state[p_m_b_index] != B_STATE_IDLE) + bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_DEACTIVATE); p_m_mISDNport->b_port[p_m_b_index] = NULL; p_m_b_index = -1; p_m_b_channel = 0; p_m_b_exclusive = 0; - p_m_b_addr = 0; - p_m_b_stid = 0; } + /* * handler */ int PmISDN::handler(void) { struct message *message; + int elapsed, length; + int ret; + int inbuffer; + + if ((ret = Port::handler())) + return(ret); + + inbuffer = (p_m_fromup_buffer_writep - p_m_fromup_buffer_readp) & FROMUP_BUFFER_MASK; + /* send tone data to isdn device only if we have data */ + if (p_tone_name[0] || p_m_crypt_msg_loops || inbuffer) + { + /* calculate how much to transmit */ + if (!p_last_tv_sec) + { + elapsed = ISDN_PRELOAD; /* preload for the first time */ + } else + { + elapsed = 8000 * (now_tv.tv_sec - p_last_tv_sec) + + 8 * (now_tv.tv_usec/1000 - p_last_tv_msec); + /* gap was greater preload, so only fill up to preload level */ + if (elapsed > ISDN_PRELOAD) + { + elapsed = ISDN_PRELOAD; + } + } + if (elapsed >= ISDN_TRANSMIT) + { + unsigned char buf[mISDN_HEADER_LEN+ISDN_PRELOAD]; + iframe_t *frm = (iframe_t *)buf; + unsigned char *p = buf+mISDN_HEADER_LEN; + + p_last_tv_sec = now_tv.tv_sec; + p_last_tv_msec = now_tv.tv_usec/1000; + + /* read tones or fill with silence */ + length = read_audio(p, elapsed); + + /* + * get data from up + * the fromup_buffer data is written to the beginning of the buffer + * the part that is filles with tones (length) is skipped, so tones have priority + * the length value is increased by the number of data copied from fromup_buffer + */ + if (inbuffer) + { + printf("nix\n"); + /* inbuffer might be less than we skip due to audio */ + if (inbuffer <= length) + { + /* clear buffer */ + p_m_fromup_buffer_readp = p_m_fromup_buffer_writep; + inbuffer = 0; + } else + { + /* skip what we already have with tones */ + p_m_fromup_buffer_readp = (p_m_fromup_buffer_readp + length) & FROMUP_BUFFER_MASK; + inbuffer -= length; + p += length; + } + /* if we have more in buffer, than we send this time */ + if (inbuffer > (elapsed-length)) + inbuffer = elapsed - length; + /* set length to what we actually have */ + length = length + inbuffer; + /* now fill up with fromup_buffer */ + while (inbuffer) + { + *p++ = p_m_fromup_buffer[p_m_fromup_buffer_readp]; + p_m_fromup_buffer_readp = (p_m_fromup_buffer_readp + 1) & FROMUP_BUFFER_MASK; + inbuffer--; + } + } + + /* overwrite buffer with crypto stuff */ + if (p_m_crypt_msg_loops) + { + printf("nix2\n"); + /* send pending message */ + int tosend; + + /* how much do we have to send */ + tosend = p_m_crypt_msg_len - p_m_crypt_msg_current; + if (tosend > elapsed) + tosend = elapsed; + + /* our length increases, if less */ + if (length < tosend) + length = tosend; + + /* copy message (part) to buffer */ + memcpy(p, p_m_crypt_msg+p_m_crypt_msg_current, tosend); + p_m_crypt_msg_current += tosend; + if (p_m_crypt_msg_current == p_m_crypt_msg_len) + { + p_m_crypt_msg_current = 0; + p_m_crypt_msg_loops--; + } + } + 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; + mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC); + + if (p_debug_nothingtosend) + { + p_debug_nothingtosend = 0; + PDEBUG((DEBUG_PORT | DEBUG_BCHANNEL), "PmISDN(%s) start sending, because we have tones and/or remote audio.\n", p_name); + } + return(1); + } + } else + { + if (!p_debug_nothingtosend) + { + p_debug_nothingtosend = 1; + PDEBUG((DEBUG_PORT | DEBUG_BCHANNEL), "PmISDN(%s) stop sending, because we have only silence.\n", p_name); + } + } // NOTE: deletion is done by the child class @@ -490,10 +918,6 @@ void PmISDN::bchannel_receive(iframe_t *frm) unsigned char *data_temp; unsigned long length_temp; struct message *message; - struct timeval tv; - struct timezone tz; - long long jitter_now; - int newlen; unsigned char *p; int l; unsigned long cont; @@ -522,39 +946,75 @@ void PmISDN::bchannel_receive(iframe_t *frm) if (frm->prim == (PH_CONTROL | INDICATION)) { + if (frm->len < 4) + { + PERROR("SHORT READ OF PH_CONTROL INDICATION\n"); + return; + } cont = *((unsigned long *)&frm->data.p); // PDEBUG(DEBUG_PORT, "PmISDN(%s) received a PH_CONTROL INDICATION 0x%x\n", p_name, cont); if ((cont&(~DTMF_TONE_MASK)) == DTMF_TONE_VAL) { + chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); + add_trace("DTMF", NULL, "%c", cont & DTMF_TONE_MASK); + end_trace(); 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 DTMF digit '%c'\n", p_name, message->param.dtmf); + PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION DTMF digit '%c'\n", p_name, message->param.dtmf); message_put(message); + return; } switch(cont) { case BF_REJECT: + chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); + add_trace("DSP-CRYPT", NULL, "error"); + end_trace(); message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CRYPT); message->param.crypt.type = CC_ERROR_IND; - PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL reject of blowfish.\n", p_name); + PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION reject of blowfish.\n", p_name); message_put(message); break; case BF_ACCEPT: + chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); + add_trace("DSP-CRYPT", NULL, "ok"); + end_trace(); message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_CRYPT); message->param.crypt.type = CC_ACTBF_CONF; - PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL accept of blowfish.\n", p_name); + PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION accept of blowfish.\n", p_name); message_put(message); break; + + case CMX_TX_DATA: + if (!p_m_txdata) + { + /* if rx is off, it may happen that fifos send us pending informations, we just ignore them */ + PDEBUG(DEBUG_BCHANNEL, "PmISDN(%s) ignoring rx data, because 'txdata' is turned off\n", p_name); + return; + } + if (p_record) + record((unsigned char *)(cont+1), frm->len - 4, 1); // from up + break; + + default: + chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); + add_trace("unknown", NULL, "0x%x", cont); + end_trace(); } return; + } + if (frm->prim != (PH_DATA | INDICATION) && frm->prim != (DL_DATA | INDICATION)) + { + PERROR("Bchannel received unknown primitve: 0x%x\n", frm->prim); + return; } /* calls will not process any audio data unless * the call is connected OR tones feature is enabled. */ if (p_state!=PORT_STATE_CONNECT - && !p_m_mISDNport->is_tones) + && !p_m_mISDNport->tones) return; #if 0 @@ -572,6 +1032,10 @@ void PmISDN::bchannel_receive(iframe_t *frm) return; } + /* record data */ + if (p_record) + record((unsigned char *)&frm->data.p, frm->len, 0); // from down + /* randomize and listen to crypt message if enabled */ if (p_m_crypt_listen) { @@ -584,38 +1048,10 @@ void PmISDN::bchannel_receive(iframe_t *frm) cryptman_listen_bch((unsigned char *)&frm->data.p, frm->len); } - /* prevent jitter */ - gettimeofday(&tv, &tz); - jitter_now = tv.tv_sec; - jitter_now = jitter_now*8000 + tv.tv_usec/125; - if (p_m_jittercheck == 0) - { - p_m_jittercheck = jitter_now; - p_m_jitterdropped = 0; - } else - p_m_jittercheck += frm->len; - if (p_m_jittercheck < jitter_now) - { -// PERROR("jitter: ignoring slow data\n"); - p_m_jittercheck = jitter_now; - } else - if (p_m_jittercheck-ISDN_JITTERLIMIT > jitter_now) - { - p_m_jitterdropped += frm->len; - p_m_jittercheck -= frm->len; - /* must exit here */ - return; - } else - if (p_m_jitterdropped) - { - PERROR("jitter: dropping, caused by fast data: %lld\n", p_m_jitterdropped); - p_m_jitterdropped = 0; - } - p = (unsigned char *)&frm->data.p; /* send data to epoint */ - if (ACTIVE_EPOINT(p_epointlist)) /* only if we have an epoint object */ + if (p_m_calldata && ACTIVE_EPOINT(p_epointlist)) /* only if we have an epoint object */ { //printf("we are port %s and sending to epoint %d\n", p_m_cardname, p_epoint->serial); length_temp = frm->len; @@ -625,9 +1061,6 @@ void PmISDN::bchannel_receive(iframe_t *frm) 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->param.data.compressed = 1; - message->param.data.port_id = p_serial; - message->param.data.port_type = p_type; message_put(message); if (length_temp <= sizeof(message->param.data.data)) break; @@ -635,63 +1068,6 @@ void PmISDN::bchannel_receive(iframe_t *frm) length_temp -= sizeof(message->param.data.data); } } - /* return the same number of tone data, as we recieved */ - newlen = read_audio(p, frm->len, 1); - /* send tone data to isdn device only if we have data, otherwhise we send nothing */ - if (newlen>0 && (p_tone_fh>=0 || p_tone_fetched || !p_m_nodata || p_m_crypt_msg_loops)) - { -//printf("jolly: sending.... %d %d %d %d %d\n", newlen, p_tone_fh, p_tone_fetched, p_m_nodata, p_m_crypt_msg_loops); - if (p_m_txmix_on) - { - p_m_txmix_on -= newlen; - if (p_m_txmix_on <= 0) - { - p_m_txmix_on = 0; - p_m_txmix = !p_m_nodata; - PDEBUG(DEBUG_BCHANNEL, "after sending message, we set txmix to txmix=%d.\n", p_m_txmix); - if (p_m_txmix) - ph_control(p_m_b_addr, CMX_MIX_ON, 0); - } - } - if (p_m_crypt_msg_loops) - { - /* send pending message */ - int tosend; - - tosend = p_m_crypt_msg_len - p_m_crypt_msg_current; - if (tosend > newlen) - tosend = newlen; - memcpy(p, p_m_crypt_msg+p_m_crypt_msg_current, tosend); - p_m_crypt_msg_current += tosend; - if (p_m_crypt_msg_current == p_m_crypt_msg_len) - { - p_m_crypt_msg_current = 0; - p_m_crypt_msg_loops--; -// we need to disable rxmix some time after sending the loops... - if (!p_m_crypt_msg_loops && p_m_txmix) - { - p_m_txmix_on = 8000; /* one sec */ - } - } - } - frm->prim = frm->prim & 0xfffffffc | REQUEST; - frm->addr = p_m_b_addr | FLG_MSG_DOWN; - frm->len = newlen; - mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC); - - if (p_debug_nothingtosend) - { - p_debug_nothingtosend = 0; - PDEBUG((DEBUG_PORT | DEBUG_BCHANNEL), "PmISDN(%s) start sending, because we have tones and/or remote audio.\n", p_name); - } - } else - { - if (!p_debug_nothingtosend) - { - p_debug_nothingtosend = 1; - PDEBUG((DEBUG_PORT | DEBUG_BCHANNEL), "PmISDN(%s) stop sending, because we have only silence.\n", p_name); - } - } #if 0 /* response to the data indication */ rsp.prim = frm->prim & 0xfffffffc | RESPONSE; @@ -715,7 +1091,7 @@ void PmISDN::set_echotest(int echo) PDEBUG(DEBUG_ISDN, "we set echo to echo=%d.\n", p_m_echo); if (p_m_b_channel) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) - ph_control(p_m_b_addr, p_m_echo?CMX_ECHO_ON:CMX_ECHO_OFF, 0); + ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_echo?CMX_ECHO_ON:CMX_ECHO_OFF, 0, "DSP-ECHO", p_m_echo); } } @@ -743,7 +1119,7 @@ void PmISDN::set_tone(char *dir, char *tone) 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); - ph_control(p_m_b_addr, TONE_PATT_OFF, 0); + ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], TONE_PATT_OFF, 0, "DSP-TONE", 0); } p_m_tone = 0; Port::set_tone(dir, tone); @@ -825,7 +1201,7 @@ void PmISDN::set_tone(char *dir, char *tone) PDEBUG(DEBUG_ISDN, "we set tone to id=%d.\n", p_m_tone); if (p_m_b_channel) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) - ph_control(p_m_b_addr, p_m_tone?TONE_PATT_ON:TONE_PATT_OFF, p_m_tone); + ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_tone?TONE_PATT_ON:TONE_PATT_OFF, p_m_tone, "DSP-TONE", p_m_tone); } /* turn user-space tones off in cases of no tone OR dsp tone */ Port::set_tone("",NULL); @@ -845,7 +1221,7 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union PDEBUG(DEBUG_BCHANNEL, "we change tx-volume to shift=%d.\n", p_m_txvol); if (p_m_b_channel) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) - ph_control(p_m_b_addr, VOL_CHANGE_TX, p_m_txvol); + 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); } if (p_m_rxvol != param->mISDNsignal.rxvol) { @@ -853,7 +1229,7 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union PDEBUG(DEBUG_BCHANNEL, "we change rx-volume to shift=%d.\n", p_m_rxvol); if (p_m_b_channel) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) - ph_control(p_m_b_addr, VOL_CHANGE_RX, p_m_rxvol); + 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); } break; @@ -866,49 +1242,32 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union PDEBUG(DEBUG_BCHANNEL, "we change conference to conf=%d.\n", p_m_conf); if (p_m_b_channel) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) - ph_control(p_m_b_addr, (p_m_conf)?CMX_CONF_JOIN:CMX_CONF_SPLIT, p_m_conf); + ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], (p_m_conf)?CMX_CONF_JOIN:CMX_CONF_SPLIT, p_m_conf, "DSP-CONF", p_m_conf); } /* we must set, even if currently tone forbids conf */ p_m_conf = param->mISDNsignal.conf; //if (dddebug) PDEBUG(DEBUG_ISDN, "dddebug = %d\n", dddebug->type); break; - case mISDNSIGNAL_NODATA: - p_m_nodata = param->mISDNsignal.nodata; - if (p_m_txmix == p_m_nodata) /* txmix != !nodata */ + case mISDNSIGNAL_CALLDATA: + if (p_m_calldata != param->mISDNsignal.calldata) { - p_m_txmix = !p_m_nodata; - PDEBUG(DEBUG_BCHANNEL, "we change mix mode to txmix=%d (nodata=%d).\n", p_m_txmix, p_m_nodata); - if (p_m_b_channel) - if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) - ph_control(p_m_b_addr, p_m_txmix?CMX_MIX_ON:CMX_MIX_OFF, 0); + p_m_calldata = param->mISDNsignal.calldata; + PDEBUG(DEBUG_BCHANNEL, "we change to calldata=%d.\n", p_m_calldata); } break; - -#if 0 - case mISDNSIGNAL_RXOFF: - if (p_m_rxoff != param->mISDNsignal.rxoff) + + case mISDNSIGNAL_DELAY: + if (p_m_delay != param->mISDNsignal.delay) { - p_m_rxoff = param->mISDNsignal.rxoff; - PDEBUG(DEBUG_BCHANNEL, "we change receive mode to rxoff=%d.\n", p_m_rxoff); + p_m_delay = param->mISDNsignal.delay; + PDEBUG(DEBUG_BCHANNEL, "we change delay mode to delay=%d.\n", p_m_delay); if (p_m_b_channel) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) - ph_control(p_m_b_addr, p_m_rxoff?CMX_RECEIVE_OFF:CMX_RECEIVE_ON, 0); + 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); } break; - case mISDNSIGNAL_DTMF: - if (p_m_dtmf != param->mISDNsignal.dtmf) - { - p_m_dtmf = param->mISDNsignal.dtmf; - PDEBUG(DEBUG_BCHANNEL, "we change dtmf mode to dtmf=%d.\n", p_m_dtmf); - if (p_m_b_channel) - if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) - ph_control(p_m_b_addr, p_m_dtmf?DTMF_TONE_START:DTMF_TONE_STOP, 0); - } - break; - -#endif default: PERROR("PmISDN(%s) unsupported signal message %d.\n", p_name, param->mISDNsignal.message); } @@ -937,7 +1296,7 @@ void PmISDN::message_crypt(unsigned long epoint_id, int message_id, union parame PDEBUG(DEBUG_BCHANNEL, "we set encryption to crypt=%d. (0 means OFF)\n", p_m_crypt); if (p_m_b_channel) if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) - ph_control_block(p_m_b_addr, p_m_crypt?BF_ENABLE_KEY:BF_DISABLE, p_m_crypt_key, p_m_crypt_key_len); + ph_control_block(p_m_mISDNport, this, p_m_mISDNport->b_addr[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); break; case CC_DACT_REQ: /* deactivate session encryption */ @@ -963,12 +1322,14 @@ void PmISDN::message_crypt(unsigned long epoint_id, int message_id, union parame } p_m_crypt_msg_current = 0; /* reset */ p_m_crypt_msg_loops = 3; /* enable */ +#if 0 /* disable txmix, or we get corrupt data due to audio process */ if (p_m_txmix) { PDEBUG(DEBUG_BCHANNEL, "for sending CR_MESSAGE_REQ, we reset txmix from txmix=%d.\n", p_m_txmix); - ph_control(p_m_b_addr, CMX_MIX_OFF, 0); + ph_control(p_m_mISDNport, this, p_mISDNport->b_addr[p_m_b_index], CMX_MIX_OFF, 0, "DSP-TXMIX", 0); } +#endif break; default: @@ -987,6 +1348,10 @@ int PmISDN::message_epoint(unsigned long epoint_id, int message_id, union parame switch(message_id) { + case MESSAGE_DATA: /* tx-data from upper layer */ + txfromup(param->data.data, param->data.len); + return(1); + 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); @@ -1022,14 +1387,15 @@ int mISDN_handler(void) mISDNport = mISDNport_first; while(mISDNport) { - /* process turning off rx */ + /* process turning on/off rx */ i = 0; while(i < mISDNport->b_num) { - if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE) + isdnport=mISDNport->b_port[i]; + if (isdnport) { - isdnport=mISDNport->b_port[i]; - if (isdnport->p_tone_name[0] || isdnport->p_tone_fh>=0 || isdnport->p_tone_fetched || !isdnport->p_m_nodata || isdnport->p_m_crypt_msg_loops || isdnport->p_m_crypt_listen || isdnport->p_record) + /* call bridges in user space OR crypto OR recording */ + if (isdnport->p_m_calldata || isdnport->p_m_crypt_msg_loops || isdnport->p_m_crypt_listen || isdnport->p_record) { /* rx IS required */ if (isdnport->p_m_rxoff) @@ -1037,7 +1403,9 @@ int mISDN_handler(void) /* turn on RX */ isdnport->p_m_rxoff = 0; PDEBUG(DEBUG_BCHANNEL, "%s: receive data is required, so we turn them on\n"); - ph_control(isdnport->p_m_b_addr, CMX_RECEIVE_ON, 0); + 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_RECEIVE_ON, 0, "DSP-RXOFF", 0); + return(1); } } else { @@ -1047,10 +1415,37 @@ int mISDN_handler(void) /* turn off RX */ isdnport->p_m_rxoff = 1; PDEBUG(DEBUG_BCHANNEL, "%s: receive data is not required, so we turn them off\n"); - ph_control(isdnport->p_m_b_addr, CMX_RECEIVE_OFF, 0); + 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_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_addr[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_addr[isdnport->p_m_b_index], CMX_TXDATA_OFF, 0, "DSP-TXDATA", 0); + return(1); } } - isdnport->p_m_jittercheck = 0; /* reset jitter detection check */ } i++; } @@ -1084,6 +1479,9 @@ int mISDN_handler(void) act.len = 0; mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC); } + l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | REQUEST, DIRECTION_OUT); + end_trace(); + return(1); } } if ((dmsg = msg_dequeue(&mISDNport->downqueue))) @@ -1108,6 +1506,10 @@ int mISDN_handler(void) mISDNport = mISDNport->next; } + /* no device, no read */ + if (mISDNdevice < 0) + return(0); + /* get message from kernel */ if (!(msg = alloc_msg(MAX_MSG_SIZE))) return(1); @@ -1132,253 +1534,265 @@ int mISDN_handler(void) /* global prim */ switch(frm->prim) { + case MGR_DELLAYER | CONFIRM: case MGR_INITTIMER | CONFIRM: case MGR_ADDTIMER | CONFIRM: case MGR_DELTIMER | CONFIRM: case MGR_REMOVETIMER | CONFIRM: -// if (options.deb & DEBUG_ISDN) -// PDEBUG(DEBUG_ISDN, "timer-confirm\n"); free_msg(msg); return(1); } - /* find the port */ - mISDNport = mISDNport_first; - while(mISDNport) + /* handle timer events from mISDN for NT-stack + * note: they do not associate with a stack */ + if (frm->prim == (MGR_TIMER | INDICATION)) { - if ((frm->prim==(MGR_TIMER | INDICATION)) && mISDNport->ntmode) - { - itimer_t *it = mISDNport->nst.tlist; + itimer_t *it; - /* find timer */ - while(it) + /* find mISDNport */ + mISDNport = mISDNport_first; + while(mISDNport) + { + /* nt mode only */ + if (mISDNport->ntmode) { - if (it->id == (int)frm->addr) + it = mISDNport->nst.tlist; + /* find timer */ + while(it) + { + if (it->id == (int)frm->addr) + break; + it = it->next; + } + if (it) break; - it = it->next; } - if (it) - { - mISDN_write_frame(mISDNdevice, msg->data, mISDNport->upper_id | FLG_MSG_DOWN, - MGR_TIMER | RESPONSE, 0, 0, NULL, TIMEOUT_1SEC); + mISDNport = mISDNport->next; + } + if (mISDNport) + { + mISDN_write_frame(mISDNdevice, msg->data, mISDNport->upper_id | FLG_MSG_DOWN, + MGR_TIMER | RESPONSE, 0, 0, NULL, TIMEOUT_1SEC); - PDEBUG(DEBUG_ISDN, "timer-indication %s port %d it=%p\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, it); - test_and_clear_bit(FLG_TIMER_RUNING, (long unsigned int *)&it->Flags); - ret = it->function(it->data); - break; - } - /* we will continue here because we have a timer for a different mISDNport */ + PDEBUG(DEBUG_ISDN, "timer-indication port %d it=%p\n", mISDNport->portnum, it); + test_and_clear_bit(FLG_TIMER_RUNING, (long unsigned int *)&it->Flags); + ret = it->function(it->data); + } else + { + PDEBUG(DEBUG_ISDN, "timer-indication not handled\n"); } -//printf("comparing frm->addr %x with upper_id %x\n", frm->addr, mISDNport->upper_id); - if ((frm->addr&STACK_ID_MASK) == (unsigned int)(mISDNport->upper_id&STACK_ID_MASK)) + goto out; + } + + /* find the mISDNport that belongs to the stack */ + mISDNport = mISDNport_first; + while(mISDNport) + { + if ((frm->addr&MASTER_ID_MASK) == (unsigned int)(mISDNport->upper_id&MASTER_ID_MASK)) + break; + mISDNport = mISDNport->next; + } + if (!mISDNport) + { + PERROR("message belongs to no mISDNport: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len); + goto out; + } + + /* master stack */ + if (!(frm->addr&FLG_CHILD_STACK)) + { + /* d-message */ + switch(frm->prim) { - /* d-message */ - switch(frm->prim) - { - case MGR_SHORTSTATUS | INDICATION: - case MGR_SHORTSTATUS | CONFIRM: - switch(frm->dinfo) { - case SSTATUS_L1_ACTIVATED: - PDEBUG(DEBUG_ISDN, "Received SSTATUS_L1_ACTIVATED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); - goto ss_act; - case SSTATUS_L1_DEACTIVATED: - PDEBUG(DEBUG_ISDN, "Received SSTATUS_L1_DEACTIVATED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); - goto ss_deact; - case SSTATUS_L2_ESTABLISHED: - PDEBUG(DEBUG_ISDN, "Received SSTATUS_L2_ESTABLISHED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); - goto ss_estab; - case SSTATUS_L2_RELEASED: - PDEBUG(DEBUG_ISDN, "Received SSTATUS_L2_RELEASED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); - goto ss_rel; - } - break; + case MGR_SHORTSTATUS | INDICATION: + case MGR_SHORTSTATUS | CONFIRM: + switch(frm->dinfo) { + case SSTATUS_L1_ACTIVATED: + l1l2l3_trace_header(mISDNport, NULL, PH_ACTIVATE | (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); + end_trace(); + goto ss_deact; + case SSTATUS_L2_ESTABLISHED: + l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | (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); + end_trace(); + goto ss_rel; + } + break; - case PH_ACTIVATE | CONFIRM: - case PH_ACTIVATE | INDICATION: - PDEBUG(DEBUG_ISDN, "Received PH_ACTIVATED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); - if (mISDNport->ntmode) - { - mISDNport->l1link = 1; - setup_queue(mISDNport, 1); - goto l1_msg; - } - ss_act: + case PH_ACTIVATE | CONFIRM: + case PH_ACTIVATE | INDICATION: + l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN); + end_trace(); + if (mISDNport->ntmode) + { mISDNport->l1link = 1; setup_queue(mISDNport, 1); - break; + goto l1_msg; + } + ss_act: + mISDNport->l1link = 1; + setup_queue(mISDNport, 1); + break; - case PH_DEACTIVATE | CONFIRM: - case PH_DEACTIVATE | INDICATION: - PDEBUG(DEBUG_ISDN, "Received PH_DEACTIVATED for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); - if (mISDNport->ntmode) - { - mISDNport->l1link = 0; - setup_queue(mISDNport, 0); - goto l1_msg; - } - ss_deact: + case PH_DEACTIVATE | CONFIRM: + case PH_DEACTIVATE | INDICATION: + l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN); + end_trace(); + if (mISDNport->ntmode) + { mISDNport->l1link = 0; setup_queue(mISDNport, 0); - break; - - case PH_CONTROL | CONFIRM: - case PH_CONTROL | INDICATION: - PDEBUG(DEBUG_ISDN, "Received PH_CONTROL for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); - break; + goto l1_msg; + } + ss_deact: + mISDNport->l1link = 0; + setup_queue(mISDNport, 0); + break; - case DL_ESTABLISH | INDICATION: - case DL_ESTABLISH | CONFIRM: -// PDEBUG(DEBUG_ISDN, "addr 0x%x established data link (DL) TE portnum=%d (DL_ESTABLISH)\n", frm->addr, mISDNport->portnum); - if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */ - ss_estab: -// if (mISDNport->ntmode) -// break; - if (mISDNport->l2establish) - { - mISDNport->l2establish = 0; - PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n"); - } - mISDNport->l2link = 1; - break; + case PH_CONTROL | CONFIRM: + case PH_CONTROL | INDICATION: + PDEBUG(DEBUG_ISDN, "Received PH_CONTROL for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name); + break; - case DL_RELEASE | INDICATION: - case DL_RELEASE | CONFIRM: -// PDEBUG(DEBUG_ISDN, "addr 0x%x released data link (DL) TE portnum=%d (DL_RELEASE)\n", frm->addr, mISDNport->portnum); - if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */ - ss_rel: -// if (mISDNport->ntmode) -// break; - mISDNport->l2link = 0; - if (mISDNport->ptp) - { - time(&mISDNport->l2establish); - PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n"); - } - break; + case DL_ESTABLISH | INDICATION: + case DL_ESTABLISH | CONFIRM: + l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN); + end_trace(); + if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */ + ss_estab: + if (mISDNport->l2establish) + { + mISDNport->l2establish = 0; + PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n"); + } + mISDNport->l2link = 1; + break; - default: - l1_msg: - PDEBUG(DEBUG_STACK, "GOT d-msg from %s port %d prim 0x%x dinfo 0x%x addr 0x%x\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, frm->prim, frm->dinfo, frm->addr); - if (frm->dinfo==(signed long)0xffffffff && frm->prim==(PH_DATA|CONFIRM)) - { - PERROR("SERIOUS BUG, dinfo == 0xffffffff, prim == PH_DATA | CONFIRM !!!!\n"); - } - /* d-message */ - if (mISDNport->ntmode) - { - /* l1-data enters the nt-mode library */ - nst = &mISDNport->nst; - if (nst->l1_l2(nst, msg)) - free_msg(msg); - return(1); - } else - { - /* l3-data is sent to pbx */ - if (stack2manager_te(mISDNport, msg)) - free_msg(msg); - return(1); - } + case DL_RELEASE | INDICATION: + case DL_RELEASE | CONFIRM: + l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN); + end_trace(); + if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */ + 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: + l1_msg: + PDEBUG(DEBUG_STACK, "GOT d-msg from %s port %d prim 0x%x dinfo 0x%x addr 0x%x\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, frm->prim, frm->dinfo, frm->addr); + if (frm->dinfo==(signed long)0xffffffff && frm->prim==(PH_DATA|CONFIRM)) + { + PERROR("SERIOUS BUG, dinfo == 0xffffffff, prim == PH_DATA | CONFIRM !!!!\n"); + } + /* d-message */ + if (mISDNport->ntmode) + { + /* l1-data enters the nt-mode library */ + nst = &mISDNport->nst; + if (nst->l1_l2(nst, msg)) + free_msg(msg); + return(1); + } else + { + /* l3-data is sent to pbx */ + if (stack2manager_te(mISDNport, msg)) + free_msg(msg); + return(1); + } } -//PDEBUG(DEBUG_ISDN, "flg:%d upper_id=%x addr=%x\n", (frm->addr&FLG_CHILD_STACK), (mISDNport->b_addr[0])&(~IF_CHILDMASK), (frm->addr)&(~IF_CHILDMASK)); - /* check if child, and if parent stack match */ - if ((frm->addr&FLG_CHILD_STACK) && (((unsigned int)(mISDNport->b_addr[0])&(~CHILD_ID_MASK)&STACK_ID_MASK) == ((frm->addr)&(~CHILD_ID_MASK)&STACK_ID_MASK))) + } else + /* child stack */ + { + /* b-message */ + switch(frm->prim) { - /* b-message */ - switch(frm->prim) - { - /* we don't care about confirms, we use rx data to sync tx */ - case PH_DATA | CONFIRM: - case DL_DATA | CONFIRM: - break; + /* we don't care about confirms, we use rx data to sync tx */ + case PH_DATA | CONFIRM: + case DL_DATA | CONFIRM: + break; - /* we receive audio data, we respond to it AND we send tones */ - case PH_DATA | INDICATION: - case DL_DATA | INDICATION: - case PH_CONTROL | INDICATION: - i = 0; - while(i < mISDNport->b_num) - { - if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK)) - break; - i++; - } - if (i == mISDNport->b_num) - { - PERROR("unhandled b-message (address 0x%x).\n", frm->addr); + /* we receive audio data, we respond to it AND we send tones */ + case PH_DATA | INDICATION: + case DL_DATA | INDICATION: + case PH_CONTROL | INDICATION: + i = 0; + while(i < mISDNport->b_num) + { + if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK)) break; - } - if (mISDNport->b_port[i]) - { -//PERROR("port sech: %s data\n", mISDNport->b_port[i]->p_name); - mISDNport->b_port[i]->bchannel_receive(frm); - } else - PDEBUG(DEBUG_BCHANNEL, "b-channel is not associated to an ISDNPort (address 0x%x), ignoring.\n", frm->addr); + i++; + } + if (i == mISDNport->b_num) + { + PERROR("unhandled b-message (address 0x%x).\n", frm->addr); break; + } + if (mISDNport->b_port[i]) + { +//PERROR("port sech: %s data\n", mISDNport->b_port[i]->p_name); + mISDNport->b_port[i]->bchannel_receive(frm); + } else + PDEBUG(DEBUG_BCHANNEL, "b-channel is not associated to an ISDNPort (address 0x%x), ignoring.\n", frm->addr); + break; - case PH_ACTIVATE | INDICATION: - case DL_ESTABLISH | INDICATION: - case PH_ACTIVATE | CONFIRM: - case DL_ESTABLISH | CONFIRM: - PDEBUG(DEBUG_BCHANNEL, "DL_ESTABLISH confirm: bchannel is now activated (address 0x%x).\n", frm->addr); - i = 0; - while(i < mISDNport->b_num) - { - if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK)) - break; - i++; - } - if (i == mISDNport->b_num) - { - PERROR("unhandled b-establish (address 0x%x).\n", frm->addr); + case PH_ACTIVATE | INDICATION: + case DL_ESTABLISH | INDICATION: + case PH_ACTIVATE | CONFIRM: + case DL_ESTABLISH | CONFIRM: + PDEBUG(DEBUG_BCHANNEL, "DL_ESTABLISH confirm: bchannel is now activated (address 0x%x).\n", frm->addr); + i = 0; + while(i < mISDNport->b_num) + { + if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK)) break; - } - mISDNport->b_state[i] = B_STATE_ACTIVE; - if (!mISDNport->b_port[i]) - bchannel_deactivate(mISDNport, i); - else - bchannel_activate(mISDNport, i); + i++; + } + if (i == mISDNport->b_num) + { + PERROR("unhandled b-establish (address 0x%x).\n", frm->addr); break; + } + bchannel_event(mISDNport, i, B_EVENT_ACTIVATED); + break; - case PH_DEACTIVATE | INDICATION: - case DL_RELEASE | INDICATION: - case PH_DEACTIVATE | CONFIRM: - case DL_RELEASE | CONFIRM: - PDEBUG(DEBUG_BCHANNEL, "DL_RELEASE confirm: bchannel is now de-activated (address 0x%x).\n", frm->addr); - i = 0; - while(i < mISDNport->b_num) - { - if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK)) - break; - i++; - } - if (i == mISDNport->b_num) - { - PERROR("unhandled b-release (address 0x%x).\n", frm->addr); + case PH_DEACTIVATE | INDICATION: + case DL_RELEASE | INDICATION: + case PH_DEACTIVATE | CONFIRM: + case DL_RELEASE | CONFIRM: + PDEBUG(DEBUG_BCHANNEL, "DL_RELEASE confirm: bchannel is now de-activated (address 0x%x).\n", frm->addr); + i = 0; + while(i < mISDNport->b_num) + { + if ((unsigned int)(mISDNport->b_addr[i]&STACK_ID_MASK) == (frm->addr&STACK_ID_MASK)) break; - } - mISDNport->b_state[i] = B_STATE_IDLE; - if (mISDNport->b_port[i]) - bchannel_activate(mISDNport, i); - else - bchannel_deactivate(mISDNport, i); + i++; + } + if (i == mISDNport->b_num) + { + PERROR("unhandled b-release (address 0x%x).\n", frm->addr); break; } + bchannel_event(mISDNport, i, B_EVENT_DEACTIVATED); break; - } - mISDNport = mISDNport->next; - } - if (!mISDNport) - { - if (frm->prim == (MGR_TIMER | INDICATION)) - PERROR("unhandled timer indication message: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len); - else - PERROR("unhandled message: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len); -// PERROR("test: is_child: %x of stack %x == %x (baddr %x frm %x)\n", (frm->addr&FLG_CHILD_STACK), ((unsigned int)(mISDNport_first->b_addr[0])&(~CHILD_ID_MASK)&STACK_ID_MASK), ((frm->addr)&(~CHILD_ID_MASK)&STACK_ID_MASK), mISDNport_first->b_addr[0], frm->addr); + default: + PERROR("child message not handled: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len); + } } + out: free_msg(msg); return(1); } @@ -1387,7 +1801,7 @@ int mISDN_handler(void) /* * global function to add a new card (port) */ -struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp) +struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, struct interface *interface) { int ret; unsigned char buff[1025]; @@ -1395,14 +1809,12 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp) stack_info_t *stinf; struct mISDNport *mISDNport, **mISDNportp; int i, cnt; - layer_info_t li; // interface_info_t ii; net_stack_t *nst; manager_t *mgr; - mISDN_pid_t pid; + layer_info_t li; int pri = 0; int nt = 0; - iframe_t dact; /* open mISDNdevice if not already open */ if (mISDNdevice < 0) @@ -1459,20 +1871,6 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp) PDEBUG(DEBUG_ISDN, "NT-mode BRI S/T interface port\n"); nt = 1; break; - case ISDN_PID_L0_TE_U: - PDEBUG(DEBUG_ISDN, "TE-mode BRI U interface line\n"); - break; - case ISDN_PID_L0_NT_U: - PDEBUG(DEBUG_ISDN, "NT-mode BRI U interface port\n"); - nt = 1; - break; - case ISDN_PID_L0_TE_UP2: - PDEBUG(DEBUG_ISDN, "TE-mode BRI Up2 interface line\n"); - break; - case ISDN_PID_L0_NT_UP2: - PDEBUG(DEBUG_ISDN, "NT-mode BRI Up2 interface port\n"); - nt = 1; - break; case ISDN_PID_L0_TE_E1: PDEBUG(DEBUG_ISDN, "TE-mode PRI E1 interface line\n"); pri = 1; @@ -1538,7 +1936,7 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp) /* add mISDNport structure */ mISDNportp = &mISDNport_first; while(*mISDNportp) - mISDNportp = &mISDNport->next; + mISDNportp = &((*mISDNportp)->next); mISDNport = (struct mISDNport *)calloc(1, sizeof(struct mISDNport)); if (!mISDNport) { @@ -1573,6 +1971,7 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp) while(i < stinf->childcnt) { mISDNport->b_stid[i] = stinf->child[i]; + mISDNport->b_state[i] = B_STATE_IDLE; PDEBUG(DEBUG_ISDN, "b_stid[%d] = 0x%x.\n", i, mISDNport->b_stid[i]); i++; } @@ -1700,70 +2099,16 @@ struct mISDNport *mISDN_port_open(int port, int ptp, int ptmp) PDEBUG(DEBUG_BCHANNEL, "using 'mISDN_dsp.o' module\n"); - /* add all bchannel layers */ - i = 0; - while(i < mISDNport->b_num) - { - /* create new layer */ - PDEBUG(DEBUG_BCHANNEL, "creating bchannel %d (index %d).\n" , i+1+(i>=15), i); - memset(&li, 0, sizeof(li)); - memset(&pid, 0, sizeof(pid)); - li.object_id = -1; - li.extentions = 0; - li.st = mISDNport->b_stid[i]; - UCPY(li.name, "B L4"); - li.pid.layermask = ISDN_LAYER((4)); - li.pid.protocol[4] = ISDN_PID_L4_B_USER; - ret = mISDN_new_layer(mISDNdevice, &li); - if (ret) - { - failed_new_layer: - PERROR("mISDN_new_layer() failed to add bchannel %d (index %d)\n", i+1+(i>=15), i); - goto closeport; - } - mISDNport->b_addr[i] = li.id; - if (!li.id) - { - goto failed_new_layer; - } - PDEBUG(DEBUG_BCHANNEL, "new layer (b_addr=0x%x)\n", mISDNport->b_addr[i]); - - /* create new stack */ - pid.protocol[1] = ISDN_PID_L1_B_64TRANS; - pid.protocol[2] = ISDN_PID_L2_B_TRANS; - pid.protocol[3] = ISDN_PID_L3_B_DSP; - pid.protocol[4] = ISDN_PID_L4_B_USER; - pid.layermask = ISDN_LAYER((1)) | ISDN_LAYER((2)) | ISDN_LAYER((3)) | ISDN_LAYER((4)); - ret = mISDN_set_stack(mISDNdevice, mISDNport->b_stid[i], &pid); - if (ret) - { - stack_error: - PERROR("mISDN_set_stack() failed (ret=%d) to add bchannel (index %d) stid=0x%x\n", ret, i, mISDNport->b_stid[i]); - mISDN_write_frame(mISDNdevice, buff, mISDNport->b_addr[i], MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); - mISDNport->b_addr[i] = 0; -// mISDNport->b_addr_low[i] = 0; - goto closeport; - } - ret = mISDN_get_setstack_ind(mISDNdevice, mISDNport->b_addr[i]); - if (ret) - goto stack_error; - - /* get layer id */ - mISDNport->b_addr[i] = mISDN_get_layerid(mISDNdevice, mISDNport->b_stid[i], 4); - if (!mISDNport->b_addr[i]) - goto stack_error; - /* deactivate bchannel if already enabled due to crash */ - PDEBUG(DEBUG_BCHANNEL, "deactivating bchannel (index %d) as a precaution.\n", i); - dact.prim = DL_RELEASE | REQUEST; - dact.addr = mISDNport->b_addr[i] | FLG_MSG_DOWN; - dact.dinfo = 0; - dact.len = 0; - mISDN_write(mISDNdevice, &dact, mISDN_HEADER_LEN+dact.len, TIMEOUT_1SEC); - - i++; - } - PDEBUG(DEBUG_ISDN, "- port %d %s (%s) %d b-channels\n", mISDNport->portnum, (mISDNport->ntmode)?"NT-mode":"TE-mode", (mISDNport->ptp)?"Point-To-Point":"Multipoint", mISDNport->b_num); - printlog("opening port %d %s (%s) %d b-channels\n", mISDNport->portnum, (mISDNport->ntmode)?"NT-mode":"TE-mode", (mISDNport->ptp)?"Point-To-Point":"Multipoint", mISDNport->b_num); + start_trace(mISDNport->portnum, + interface, + NULL, + NULL, + DIRECTION_NONE, + CATEGORY_CH, + 0, + "PORT (open)"); + add_trace("channels", NULL, "%d", mISDNport->b_num); + end_trace(); return(mISDNport); } @@ -1785,7 +2130,7 @@ void mISDNport_close(struct mISDNport *mISDNport) { struct mISDNport **mISDNportp; class Port *port; - classs PmISDN *pmISDN; + class PmISDN *isdnport; net_stack_t *nst; unsigned char buf[32]; int i; @@ -1796,29 +2141,38 @@ void mISDNport_close(struct mISDNport *mISDNport) { if ((port->p_type&PORT_CLASS_MASK) == PORT_CLASS_mISDN) { - pmISDN = (class PmISDN)*port; - if (pmISDN->p_m_mISDNport) + isdnport = (class PmISDN *)port; + if (isdnport->p_m_mISDNport) { - PDEBUG(DEBUG_ISDN, "port %s uses mISDNport %d, destroying it.\n", pnISDN->p_name, mISDNport->portnum); - delete pmISDN; + PDEBUG(DEBUG_ISDN, "port %s uses mISDNport %d, destroying it.\n", isdnport->p_name, mISDNport->portnum); + delete isdnport; } } port = port->next; } - printlog("closing port %d\n", mISDNport->portnum); + /* only if we are already part of interface */ + if (mISDNport->ifport) + { + start_trace(mISDNport->portnum, + mISDNport->ifport->interface, + NULL, + NULL, + DIRECTION_NONE, + CATEGORY_CH, + 0, + "PORT (close)"); + end_trace(); + } /* free bchannels */ i = 0; while(i < mISDNport->b_num) { - bchannel_deactivate(mISDNport, i); - PDEBUG(DEBUG_BCHANNEL, "freeing %s port %d bchannel (index %d).\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, i); - if (mISDNport->b_stid[i]) + if (mISDNport->b_addr[i]) { - mISDN_clear_stack(mISDNdevice, mISDNport->b_stid[i]); - if (mISDNport->b_addr[i]) - mISDN_write_frame(mISDNdevice, buf, mISDNport->b_addr[i] | FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); + _bchannel_destroy(mISDNport, i); + PDEBUG(DEBUG_BCHANNEL, "freeing %s port %d bchannel (index %d).\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, i); } i++; } @@ -1846,9 +2200,8 @@ void mISDNport_close(struct mISDNport *mISDNport) PDEBUG(DEBUG_BCHANNEL, "freeing d-stack.\n"); if (mISDNport->d_stid) { -// mISDN_clear_stack(mISDNdevice, mISDNport->d_stid); - if (mISDNport->lower_id) - mISDN_write_frame(mISDNdevice, buf, mISDNport->lower_id, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); + if (mISDNport->upper_id) + mISDN_write_frame(mISDNdevice, buf, mISDNport->upper_id | FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); } /* remove from list */ @@ -1858,12 +2211,13 @@ void mISDNport_close(struct mISDNport *mISDNport) if (*mISDNportp == mISDNport) { *mISDNportp = (*mISDNportp)->next; + mISDNportp = NULL; break; } mISDNportp = &((*mISDNportp)->next); } - if (!(*mISDNportp)) + if (mISDNportp) { PERROR("software error, mISDNport not in list\n"); exit(-1); @@ -1948,20 +2302,6 @@ void mISDN_port_info(void) printf(" HFC multiport card"); #endif break; - case ISDN_PID_L0_TE_U: - printf("TE-mode BRI U interface line"); - break; - case ISDN_PID_L0_NT_U: - nt = 1; - printf("NT-mode BRI U interface port"); - break; - case ISDN_PID_L0_TE_UP2: - printf("TE-mode BRI Up2 interface line"); - break; - case ISDN_PID_L0_NT_UP2: - nt = 1; - printf("NT-mode BRI Up2 interface port"); - break; case ISDN_PID_L0_TE_E1: pri = 1; printf("TE-mode PRI E1 interface line (for phone lines)"); @@ -2073,3 +2413,31 @@ void mISDN_port_info(void) } +/* + * enque data from upper buffer + */ +void PmISDN::txfromup(unsigned char *data, int length) +{ + int avail; + /* no data */ + if (!length) + return; + + /* get free samples in buffer */ + avail = ((p_m_fromup_buffer_readp - p_m_fromup_buffer_writep - 1) & FROMUP_BUFFER_MASK); + if (avail < length) + { + PDEBUG(DEBUG_PORT, "Port(%d): fromup_buffer overflows, this shall not happen under normal conditions\n", p_serial); + return; + } + + /* write data to buffer and return */ + while(length) + { + p_m_fromup_buffer[p_m_fromup_buffer_writep] = *data++; + p_m_fromup_buffer_writep = (p_m_fromup_buffer_writep + 1) & FROMUP_BUFFER_MASK; + length--; + } + return; // must return, because length is 0 +} +