X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=bchannel.c;h=5793795fba5951a1f1f0c81a2d45bdba34b4b0f2;hp=258893ec96337e21900bb2259b9adaac267e33df;hb=13f107bc240d351b1eb1915eff140efe1b4a95bb;hpb=44b6b77e68c2b685174c09da4467139e009130b4 diff --git a/bchannel.c b/bchannel.c index 258893e..5793795 100644 --- a/bchannel.c +++ b/bchannel.c @@ -19,27 +19,42 @@ #include #include #include -#ifdef SOCKET_MISDN #include #include #include #include -#include -#else -#include -#include -#endif +#include + +#include +int __af_isdn = MISDN_AF_ISDN; +#include +#define HAVE_ATTRIBUTE_always_inline 1 +#define HAVE_ARPA_INET_H 1 +#define HAVE_TIMERSUB 1 + +#include #include +/* Choose if you want to have chan_lcr for Asterisk 1.4.x or CallWeaver 1.2.x */ +/* #define LCR_FOR_CALLWEAVER */ + +#ifdef LCR_FOR_CALLWEAVER +#include +#include +#include +#include +#endif #include "extension.h" #include "message.h" #include "lcrsocket.h" #include "cause.h" +#include "select.h" #include "bchannel.h" #include "chan_lcr.h" #include "callerid.h" +#include "options.h" #ifndef ISDN_PID_L4_B_USER @@ -52,286 +67,135 @@ enum { BSTATE_IDLE, BSTATE_ACTIVATING, BSTATE_ACTIVE, + BSTATE_DEACTIVATING, }; -#ifdef SOCKET_MISDN +static void bchannel_send_queue(struct bchannel *bchannel); int bchannel_initialize(void) { - return(0); + return 0; } void bchannel_deinitialize(void) { } -#else -int bchannel_entity = 0; /* used for udevice */ -int bchannel_device = -1; /* the device handler and port list */ - -int bchannel_initialize(void) -{ - unsigned char buff[1025]; - iframe_t *frm = (iframe_t *)buff; - int ret; - - /* open mISDNdevice if not already open */ - if (bchannel_device < 0) - { - ret = mISDN_open(); - if (ret < 0) - { - CERROR(NULL, NULL, "cannot open mISDN device ret=%d errno=%d (%s) Check for mISDN modules!\nAlso did you create \"/dev/mISDN\"? Do: \"mknod /dev/mISDN c 46 0\"\n", ret, errno, strerror(errno)); - return(-1); - } - bchannel_device = ret; - CDEBUG(NULL, NULL, "mISDN device opened.\n"); - - /* create entity for layer 3 TE-mode */ - mISDN_write_frame(bchannel_device, buff, 0, MGR_NEWENTITY | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); - ret = mISDN_read_frame(bchannel_device, frm, sizeof(iframe_t), 0, MGR_NEWENTITY | CONFIRM, TIMEOUT_1SEC); - if (ret < (int)mISDN_HEADER_LEN) - { - noentity: - CERROR(NULL, NULL, "Cannot request MGR_NEWENTITY from mISDN. Exitting due to software bug."); - return(-1); - } - bchannel_entity = frm->dinfo & 0xffff; - if (!bchannel_entity) - goto noentity; - } - return(0); -} - -void bchannel_deinitialize(void) -{ - unsigned char buff[1025]; - - if (bchannel_device >= 0) - { - /* free entity */ - mISDN_write_frame(bchannel_device, buff, 0, MGR_DELENTITY | REQUEST, bchannel_entity, 0, NULL, TIMEOUT_1SEC); - /* close device */ - mISDN_close(bchannel_device); - bchannel_device = -1; - } -} -#endif /* * send control information to the channel (dsp-module) */ -static void ph_control(unsigned long handle, unsigned long c1, unsigned long c2, char *trace_name, int trace_value) +static void ph_control(int sock, unsigned int c1, unsigned int c2, char *trace_name, int trace_value, int b_mode) { -#ifdef SOCKET_MISDN unsigned char buffer[MISDN_HEADER_LEN+sizeof(int)+sizeof(int)]; struct mISDNhead *ctrl = (struct mISDNhead *)buffer; - unsigned long *d = (unsigned long *)(buffer+MISDN_HEADER_LEN); + unsigned int *d = (unsigned int *)(buffer+MISDN_HEADER_LEN); int ret; + if (b_mode != 0 && b_mode != 2) + return; + + CDEBUG(NULL, NULL, "Sending PH_CONTROL %s %x,%x\n", trace_name, c1, c2); ctrl->prim = PH_CONTROL_REQ; ctrl->id = 0; *d++ = c1; *d++ = c2; - ret = sendto(handle, buffer, MISDN_HEADER_LEN+sizeof(int)*2, 0, NULL, 0); - if (!ret) - CERROR(NULL, NULL, "Failed to send to socket %d\n", handle); -#else - unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+sizeof(int)]; - iframe_t *ctrl = (iframe_t *)buffer; - unsigned long *d = (unsigned long *)&ctrl->data.p; - - ctrl->prim = PH_CONTROL | REQUEST; - ctrl->addr = handle | FLG_MSG_DOWN; - ctrl->dinfo = 0; - ctrl->len = sizeof(int)*2; - *d++ = c1; - *d++ = c2; - mISDN_write(bchannel_device, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC); -#endif -#if 0 - chan_trace_header(mISDNport, isdnport, "BCHANNEL control", DIRECTION_OUT); - if (c1 == CMX_CONF_JOIN) - add_trace(trace_name, NULL, "0x%08x", trace_value); - else - add_trace(trace_name, NULL, "%d", trace_value); - end_trace(); -#endif + ret = sendto(sock, buffer, MISDN_HEADER_LEN+sizeof(int)*2, 0, NULL, 0); + if (ret < 0) + CERROR(NULL, NULL, "Failed to send to socket %d\n", sock); } -static void ph_control_block(unsigned long handle, unsigned long c1, void *c2, int c2_len, char *trace_name, int trace_value) +static void ph_control_block(int sock, unsigned int c1, void *c2, int c2_len, char *trace_name, int trace_value, int b_mode) { -#ifdef SOCKET_MISDN unsigned char buffer[MISDN_HEADER_LEN+sizeof(int)+c2_len]; struct mISDNhead *ctrl = (struct mISDNhead *)buffer; - unsigned long *d = (unsigned long *)(buffer+MISDN_HEADER_LEN); + unsigned int *d = (unsigned int *)(buffer+MISDN_HEADER_LEN); int ret; + if (b_mode != 0 && b_mode != 2) + return; + + CDEBUG(NULL, NULL, "Sending PH_CONTROL (block) %s %x\n", trace_name, c1); ctrl->prim = PH_CONTROL_REQ; ctrl->id = 0; *d++ = c1; memcpy(d, c2, c2_len); - ret = sendto(handle, buffer, MISDN_HEADER_LEN+sizeof(int)+c2_len, 0, NULL, 0); - if (!ret) - CERROR(NULL, NULL, "Failed to send to socket %d\n", handle); -#else - unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+c2_len]; - iframe_t *ctrl = (iframe_t *)buffer; - unsigned long *d = (unsigned long *)&ctrl->data.p; - - ctrl->prim = PH_CONTROL | REQUEST; - ctrl->addr = handle | FLG_MSG_DOWN; - ctrl->dinfo = 0; - ctrl->len = sizeof(int)+c2_len; - *d++ = c1; - memcpy(d, c2, c2_len); - mISDN_write(bchannel_device, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC); -#endif -#if 0 - chan_trace_header(mISDNport, isdnport, "BCHANNEL control", DIRECTION_OUT); - add_trace(trace_name, NULL, "%d", trace_value); - end_trace(); -#endif + ret = sendto(sock, buffer, MISDN_HEADER_LEN+sizeof(int)+c2_len, 0, NULL, 0); + if (ret < 0) + CERROR(NULL, NULL, "Failed to send to socket %d\n", sock); } +static int bchannel_handle(struct lcr_fd *fd, unsigned int what, void *instance, int index); /* * create stack */ -int bchannel_create(struct bchannel *bchannel) +int bchannel_create(struct bchannel *bchannel, int mode, int queue) { int ret; -#ifdef SOCKET_MISDN - unsigned long on = 1; struct sockaddr_mISDN addr; - if (bchannel->b_sock) - { - CERROR(NULL, NULL, "Socket already created for handle 0x%x\n", bchannel->handle); - return(0); + if (bchannel->b_sock > -1) { + CERROR(bchannel->call, NULL, "Socket already created for handle 0x%x\n", bchannel->handle); + return 0; } - /* default tx_dejitter */ - bchannel->b_tx_dejitter = 1; - /* open socket */ - bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_L2DSP); - if (bchannel->b_sock < 0) - { - CERROR(NULL, NULL, "Failed to open bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", bchannel->handle); - return(0); + bchannel->b_mode = (mode & 3); + switch(bchannel->b_mode) { + case 0: + CDEBUG(bchannel->call, NULL, "Open DSP audio\n"); + bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_L2DSP); + break; + case 1: + CDEBUG(bchannel->call, NULL, "Open audio\n"); + bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_RAW); + break; + case 2: + CDEBUG(bchannel->call, NULL, "Open DSP HDLC\n"); + bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_L2DSPHDLC); + break; + case 3: + CDEBUG(bchannel->call, NULL, "Open HDLC\n"); + bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_HDLC); + break; } - - /* set nonblocking io */ - ret = ioctl(bchannel->b_sock, FIONBIO, &on); - if (ret < 0) - { - CERROR(NULL, NULL, "Failed to set bchannel-socket handle 0x%x into nonblocking IO\n", bchannel->handle); - close(bchannel->b_sock); - bchannel->b_sock = -1; - return(0); + if (bchannel->b_sock < 0) { + CERROR(bchannel->call, NULL, "Failed to open bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDN_dsp.ko?\n", bchannel->handle); + return 0; } + /* register fd */ + memset(&bchannel->lcr_fd, 0, sizeof(bchannel->lcr_fd)); + bchannel->lcr_fd.fd = bchannel->b_sock; + register_fd(&bchannel->lcr_fd, LCR_FD_READ | LCR_FD_EXCEPT, bchannel_handle, bchannel, 0); + /* bind socket to bchannel */ addr.family = AF_ISDN; - addr.dev = (bchannel->handle>>8)-1; - addr.channel = bchannel->handle && 0xff; + addr.dev = (bchannel->handle>>8); + addr.channel = bchannel->handle & 0xff; ret = bind(bchannel->b_sock, (struct sockaddr *)&addr, sizeof(addr)); - if (ret < 0) - { - CERROR(NULL, NULL, "Failed to bind bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", bchannel->handle); + if (ret < 0) { + CERROR(bchannel->call, NULL, "Failed to bind bchannel-socket for handle 0x%x with mISDN-DSP layer. (port %d, channel %d) Did you load mISDN_dsp.ko?\n", bchannel->handle, addr.dev, addr.channel); + unregister_fd(&bchannel->lcr_fd); close(bchannel->b_sock); bchannel->b_sock = -1; - return(0); - } - -#if 0 - chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL create socket", DIRECTION_OUT); - add_trace("channel", NULL, "%d", i+1+(i>=15)); - add_trace("socket", NULL, "%d", mISDNport->b_socket[i]); - end_trace(); -#endif - return(1); + return 0; + } + + /* queue */ + if (bchannel->b_mode == 1 && queue) { + bchannel->nodsp_queue_out = 0; + bchannel->nodsp_queue_in = queue * 8; + if (bchannel->nodsp_queue_in > QUEUE_BUFFER_MAX-1) + bchannel->nodsp_queue_in = QUEUE_BUFFER_MAX-1; + bchannel->nodsp_queue = bchannel->nodsp_queue_in; /* store initial load */ + memset(&bchannel->nodsp_queue_buffer, (options.law=='a')?0x2a:0xff, QUEUE_BUFFER_SIZE); + bchannel->queue_sent = 0; + } else + bchannel->nodsp_queue = 0; + + return 1; } -#else - unsigned char buff[1024]; - layer_info_t li; - mISDN_pid_t pid; - - if (bchannel->b_stid) - { - CERROR(NULL, NULL, "Stack already created for address 0x%lx\n", bchannel->b_stid); - return(0); - } - - if (bchannel->b_addr) - { - CERROR(NULL, NULL, "Stack already created for address 0x%lx\n", bchannel->b_addr); - return(0); - } - - /* create new layer */ - CDEBUG(NULL, NULL, "creating new layer for stid 0x%lx.\n" , bchannel->handle); - memset(&li, 0, sizeof(li)); - memset(&pid, 0, sizeof(pid)); - li.object_id = -1; - li.extentions = 0; - li.st = bchannel->handle; - strcpy(li.name, "B L4"); - li.pid.layermask = ISDN_LAYER((4)); - li.pid.protocol[4] = ISDN_PID_L4_B_USER; - ret = mISDN_new_layer(bchannel_device, &li); - if (ret) - { - failed_new_layer: - CERROR(NULL, NULL, "mISDN_new_layer() failed to add bchannel for stid 0x%lx.\n", bchannel->handle); - goto failed; - } - if (!li.id) - { - goto failed_new_layer; - } - bchannel->b_stid = bchannel->handle; - bchannel->b_addr = li.id; - CDEBUG(NULL, NULL, "new layer (b_addr=0x%x)\n", bchannel->b_addr); - - /* 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(bchannel_device, bchannel->b_stid, &pid); - if (ret) - { - stack_error: - CERROR(NULL, NULL, "mISDN_set_stack() failed (ret=%d) to add bchannel stid=0x%lx\n", ret, bchannel->b_stid); - mISDN_write_frame(bchannel_device, buff, bchannel->b_addr, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); - goto failed; - } - ret = mISDN_get_setstack_ind(bchannel_device, bchannel->b_addr); - if (ret) - goto stack_error; - - /* get layer id */ - bchannel->b_addr = mISDN_get_layerid(bchannel_device, bchannel->b_stid, 4); - if (!bchannel->b_addr) - goto stack_error; -#if 0 - 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%08x", mISDNport->b_stid[i]); - add_trace("stack", "address", "0x%08x", mISDNport->b_addr[i]); - end_trace(); -#endif - - return(1); - -failed: - bchannel->b_stid = 0; - bchannel->b_addr = 0; - return(0); -} -#endif /* @@ -339,33 +203,27 @@ failed: */ void bchannel_activate(struct bchannel *bchannel, int activate) { -#ifdef SOCKET_MISDN struct mISDNhead act; int ret; - act.prim = (activate)?DL_ESTABLISH_REQ:DL_RELEASE_REQ; + /* activate bchannel */ + CDEBUG(bchannel->call, NULL, "%sActivating B-channel.\n", activate?"":"De-"); + switch(bchannel->b_mode) { + case 0: + case 2: + act.prim = (activate)?DL_ESTABLISH_REQ:DL_RELEASE_REQ; + break; + case 1: + case 3: + act.prim = (activate)?PH_ACTIVATE_REQ:PH_DEACTIVATE_REQ; + break; + } act.id = 0; ret = sendto(bchannel->b_sock, &act, MISDN_HEADER_LEN, 0, NULL, 0); - if (!ret) - CERROR(NULL, NULL, "Failed to send to socket %d\n", bchannel->b_sock); -#else - iframe_t act; - - /* activate bchannel */ - act.prim = (activate?DL_ESTABLISH:DL_RELEASE) | REQUEST; - act.addr = bchannel->b_addr | FLG_MSG_DOWN; - act.dinfo = 0; - act.len = 0; - mISDN_write(bchannel_device, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC); -#endif + if (ret < 0) + CERROR(bchannel->call, NULL, "Failed to send to socket %d\n", bchannel->b_sock); - bchannel->b_state = BSTATE_ACTIVATING; -#if 0 - /* trace */ - chan_trace_header(mISDNport, mISDNport->b_port[i], activate?(char*)"BCHANNEL activate":(char*)"BCHANNEL deactivate", DIRECTION_OUT); - add_trace("channel", NULL, "%d", i+1+(i>=15)); - end_trace(); -#endif + bchannel->b_state = (activate)?BSTATE_ACTIVATING:BSTATE_DEACTIVATING; } @@ -374,49 +232,39 @@ void bchannel_activate(struct bchannel *bchannel, int activate) */ static void bchannel_activated(struct bchannel *bchannel) { -#ifdef SOCKET_MISDN - int handle; - - handle = bchannel->b_sock; -#else - unsigned long handle; + int sock; - handle = bchannel->b_addr; -#endif + sock = bchannel->b_sock; /* set dsp features */ if (bchannel->b_txdata) - ph_control(handle, (bchannel->b_txdata)?DSP_TXDATA_ON:DSP_TXDATA_OFF, 0, "DSP-TXDATA", bchannel->b_txdata); - if (bchannel->b_delay) - ph_control(handle, DSP_DELAY, bchannel->b_delay, "DSP-DELAY", bchannel->b_delay); - if (bchannel->b_tx_dejitter) - ph_control(handle, (bchannel->b_tx_dejitter)?DSP_TX_DEJITTER:DSP_TX_DEJ_OFF, 0, "DSP-TX_DEJITTER", bchannel->b_tx_dejitter); - if (bchannel->b_tx_gain) - ph_control(handle, DSP_VOL_CHANGE_TX, bchannel->b_tx_gain, "DSP-TX_GAIN", bchannel->b_tx_gain); - if (bchannel->b_rx_gain) - ph_control(handle, DSP_VOL_CHANGE_RX, bchannel->b_rx_gain, "DSP-RX_GAIN", bchannel->b_rx_gain); - if (bchannel->b_pipeline[0]) -#ifdef SOCKET_MISDN - ph_control_block(handle, DSP_PIPELINE_CFG, bchannel->b_pipeline, strlen(bchannel->b_pipeline)+1, "DSP-PIPELINE", 0); -#else - ph_control_block(handle, PIPELINE_CFG, bchannel->b_pipeline, strlen(bchannel->b_pipeline)+1, "DSP-PIPELINE", 0); -#endif + ph_control(sock, (bchannel->b_txdata)?DSP_TXDATA_ON:DSP_TXDATA_OFF, 0, "DSP-TXDATA", bchannel->b_txdata, bchannel->b_mode); + if (bchannel->b_delay && bchannel->b_mode == 0) + ph_control(sock, DSP_DELAY, bchannel->b_delay, "DSP-DELAY", bchannel->b_delay, bchannel->b_mode); + if (bchannel->b_tx_dejitter && bchannel->b_mode == 0) + ph_control(sock, (bchannel->b_tx_dejitter)?DSP_TX_DEJITTER:DSP_TX_DEJ_OFF, 0, "DSP-TX_DEJITTER", bchannel->b_tx_dejitter, bchannel->b_mode); + if (bchannel->b_tx_gain && bchannel->b_mode == 0) + ph_control(sock, DSP_VOL_CHANGE_TX, bchannel->b_tx_gain, "DSP-TX_GAIN", bchannel->b_tx_gain, bchannel->b_mode); + if (bchannel->b_rx_gain && bchannel->b_mode == 0) + ph_control(sock, DSP_VOL_CHANGE_RX, bchannel->b_rx_gain, "DSP-RX_GAIN", bchannel->b_rx_gain, bchannel->b_mode); + if (bchannel->b_pipeline[0] && bchannel->b_mode == 0) + ph_control_block(sock, DSP_PIPELINE_CFG, bchannel->b_pipeline, strlen(bchannel->b_pipeline)+1, "DSP-PIPELINE", 0, bchannel->b_mode); if (bchannel->b_conf) - ph_control(handle, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf); + ph_control(sock, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf, bchannel->b_mode); if (bchannel->b_echo) - ph_control(handle, DSP_ECHO_ON, 0, "DSP-ECHO", 1); - if (bchannel->b_tone) - ph_control(handle, DSP_TONE_PATT_ON, bchannel->b_tone, "DSP-TONE", bchannel->b_tone); + ph_control(sock, DSP_ECHO_ON, 0, "DSP-ECHO", 1, bchannel->b_mode); + if (bchannel->b_tone && bchannel->b_mode == 0) + ph_control(sock, DSP_TONE_PATT_ON, bchannel->b_tone, "DSP-TONE", bchannel->b_tone, bchannel->b_mode); if (bchannel->b_rxoff) - ph_control(handle, DSP_RECEIVE_OFF, 0, "DSP-RXOFF", 1); -// if (bchannel->b_txmix) -// ph_control(handle, DSP_MIX_ON, 0, "DSP-MIX", 1); - if (bchannel->b_dtmf) - ph_control(handle, DTMF_TONE_START, 0, "DSP-DTMF", 1); - if (bchannel->b_crypt_len) - ph_control_block(handle, DSP_BF_ENABLE_KEY, bchannel->b_crypt_key, bchannel->b_crypt_len, "DSP-CRYPT", bchannel->b_crypt_len); + ph_control(sock, DSP_RECEIVE_OFF, 0, "DSP-RXOFF", 1, bchannel->b_mode); +// if (bchannel->b_txmix && bchannel->b_mode == 0) +// ph_control(sock, DSP_MIX_ON, 0, "DSP-MIX", 1, bchannel->b_mode); + if (bchannel->b_dtmf && bchannel->b_mode == 0) + ph_control(sock, DTMF_TONE_START, 0, "DSP-DTMF", 1, bchannel->b_mode); + if (bchannel->b_bf_len && bchannel->b_mode == 0) + ph_control_block(sock, DSP_BF_ENABLE_KEY, bchannel->b_bf_key, bchannel->b_bf_len, "DSP-CRYPT", bchannel->b_bf_len, bchannel->b_mode); if (bchannel->b_conf) - ph_control(handle, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf); + ph_control(sock, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf, bchannel->b_mode); bchannel->b_state = BSTATE_ACTIVE; } @@ -424,40 +272,13 @@ static void bchannel_activated(struct bchannel *bchannel) /* * destroy stack */ -static void bchannel_destroy(struct bchannel *bchannel) +void bchannel_destroy(struct bchannel *bchannel) { -#ifdef SOCKET_MISDN -#if 0 - chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL remove socket", DIRECTION_OUT); - add_trace("channel", NULL, "%d", i+1+(i>=15)); - add_trace("socket", NULL, "%d", mISDNport->b_socket[i]); - end_trace(); -#endif - if (bchannel->b_sock > -1) - { + if (bchannel->b_sock > -1) { + unregister_fd(&bchannel->lcr_fd); close(bchannel->b_sock); bchannel->b_sock = -1; } -#else - unsigned char buff[1024]; - -#if 0 - 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%08x", mISDNport->b_stid[i]); - add_trace("stack", "address", "0x%08x", mISDNport->b_addr[i]); - end_trace(); -#endif - /* remove our stack only if set */ - if (bchannel->b_addr) - { - CDEBUG(NULL, NULL, "free stack (b_addr=0x%x)\n", bchannel->b_addr); - mISDN_clear_stack(bchannel_device, bchannel->b_stid); - mISDN_write_frame(bchannel_device, buff, bchannel->b_addr | FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC); - bchannel->b_stid = 0; - bchannel->b_addr = 0; - } -#endif bchannel->b_state = BSTATE_IDLE; } @@ -465,113 +286,75 @@ static void bchannel_destroy(struct bchannel *bchannel) /* * whenever we get audio data from bchannel, we process it here */ -static void bchannel_receive(struct bchannel *bchannel, unsigned long prim, unsigned long dinfo, unsigned char *data, int len) +static void bchannel_receive(struct bchannel *bchannel, unsigned char *buffer, int len) { - unsigned long cont = *((unsigned long *)data); -// unsigned char *data_temp; -// unsigned long length_temp; -// unsigned char *p; -// int l; - -#ifdef SOCKET_MISDN - if (prim == PH_CONTROL_IND) -#else - if (prim == (PH_CONTROL | INDICATION)) -#endif - { - if (len < 4) - { - CERROR(NULL, NULL, "SHORT READ OF PH_CONTROL INDICATION\n"); + struct mISDNhead *hh = (struct mISDNhead *)buffer; + unsigned char *data = buffer + MISDN_HEADER_LEN; + unsigned int cont = *((unsigned int *)data); + unsigned char *d; + int i; + struct bchannel *remote_bchannel; + int ret; + + if (hh->prim == PH_CONTROL_IND) { + /* non dsp -> ignore ph_control */ + if (bchannel->b_mode == 1 || bchannel->b_mode == 3) + return; + if (len < 4) { + CERROR(bchannel->call, NULL, "SHORT READ OF PH_CONTROL INDICATION\n"); return; } - if ((cont&(~DTMF_TONE_MASK)) == DTMF_TONE_VAL) - { -#if 0 - chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); - add_trace("DTMF", NULL, "%c", cont & DTMF_TONE_MASK); - end_trace(); -#endif - if (bchannel->rx_dtmf) - bchannel->rx_dtmf(bchannel, cont & DTMF_TONE_MASK); + if ((cont&(~DTMF_TONE_MASK)) == DTMF_TONE_VAL) { + if (bchannel->call) + lcr_in_dtmf(bchannel->call, cont & DTMF_TONE_MASK); return; } - switch(cont) - { -#ifdef SOCKET_MISDN + switch(cont) { case DSP_BF_REJECT: -#else - case BF_REJECT: -#endif -#if 0 - chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); - add_trace("DSP-CRYPT", NULL, "error"); - end_trace(); -#endif + CERROR(bchannel->call, NULL, "Blowfish crypt rejected.\n"); break; -#ifdef SOCKET_MISDN case DSP_BF_ACCEPT: -#else - case BF_ACCEPT: -#endif -#if 0 - chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); - add_trace("DSP-CRYPT", NULL, "ok"); - end_trace(); -#endif + CDEBUG(bchannel->call, NULL, "Blowfish crypt enabled.\n"); break; default: -#if 0 - chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN); - add_trace("unknown", NULL, "0x%x", cont); - end_trace(); -#else - ; -#endif + CDEBUG(bchannel->call, NULL, "Unhandled bchannel control 0x%x.\n", cont); } return; } -#ifdef SOCKET_MISDN - if (prim == PH_DATA_REQ) - { - if (!bchannel->b_txdata) - { + if (hh->prim == PH_DATA_REQ) { + if (!bchannel->b_txdata) { /* if tx is off, it may happen that fifos send us pending informations, we just ignore them */ - CDEBUG(NULL, NULL, "ignoring tx data, because 'txdata' is turned off\n"); + CDEBUG(bchannel->call, NULL, "ignoring tx data, because 'txdata' is turned off\n"); return; } return; } -#else - if (prim == (PH_SIGNAL | INDICATION)) - { - switch(dinfo) - { - case CMX_TX_DATA: - if (!bchannel->b_txdata) - { - /* if tx is off, it may happen that fifos send us pending informations, we just ignore them */ - CDEBUG(NULL, NULL, "ignoring tx data, because 'txdata' is turned off\n"); - return; - } - break; - - default: -#if 0 - chan_trace_header(p_m_mISDNport, this, "BCHANNEL signal", DIRECTION_IN); - add_trace("unknown", NULL, "0x%x", frm->dinfo); - end_trace(); -#else - ; -#endif - } + if (hh->prim != PH_DATA_IND && hh->prim != DL_DATA_IND) { + CERROR(bchannel->call, NULL, "Bchannel received unknown primitve: 0x%lx\n", hh->prim); return; } + /* if calls are bridged, but not via dsp (no b_conf), forward here */ + if (!bchannel->b_conf + && bchannel->call + && bchannel->call->bridge_call + && bchannel->call->bridge_call->bchannel) { + remote_bchannel = bchannel->call->bridge_call->bchannel; +#if 0 + int i = 0; + char string[4096] = ""; + while(i < len) { + sprintf(string+strlen(string), " %02x", data[i]); + i++; + } + CDEBUG(remote_bchannel->call, NULL, "Forwarding packet%s\n", string); #endif - if (prim != PH_DATA_IND && prim != DL_DATA_IND) - { - CERROR(NULL, NULL, "Bchannel received unknown primitve: 0x%lx\n", prim); + hh->prim = PH_DATA_REQ; + hh->id = 0; + ret = sendto(remote_bchannel->b_sock, buffer, MISDN_HEADER_LEN+len, 0, NULL, 0); + if (ret < 0) + CERROR(remote_bchannel->call, NULL, "Failed to send to socket %d\n", bchannel->b_sock); return; } /* calls will not process any audio data unless @@ -579,28 +362,44 @@ static void bchannel_receive(struct bchannel *bchannel, unsigned long prim, unsi */ /* if rx is off, it may happen that fifos send us pending informations, we just ignore them */ - if (bchannel->b_rxoff) - { - CDEBUG(NULL, NULL, "ignoring data, because rx is turned off\n"); + if (bchannel->b_rxoff) { + CDEBUG(bchannel->call, NULL, "ignoring data, because rx is turned off\n"); return; } - if (!bchannel->call) - { - CDEBUG(NULL, NULL, "ignoring data, because no call associated with bchannel\n"); + if (!bchannel->call) { + CDEBUG(bchannel->call, NULL, "ignoring data, because no call associated with bchannel\n"); return; } - if (!bchannel->call->audiopath) - { + if (!bchannel->call->audiopath) { /* return, because we have no audio from port */ return; } - len = write(bchannel->call->pipe[1], data, len); - if (len < 0) - { - CDEBUG(NULL, NULL, "broken pipe on bchannel pipe\n"); + + if (bchannel->call->pipe[1] < 0) { + /* nobody there */ return; } + + /* if no hdlc */ + if (bchannel->b_mode == 0 || bchannel->b_mode == 1) { + d = data; + for (i = 0; i < len; i++) { + *d = flip_bits[*d]; + d++; + } + } + + + len = write(bchannel->call->pipe[1], data, len); + if (len < 0) + goto errout; + + return; + errout: + close(bchannel->call->pipe[1]); + bchannel->call->pipe[1] = -1; + CDEBUG(bchannel->call, NULL, "broken pipe on bchannel pipe\n"); } @@ -609,30 +408,104 @@ static void bchannel_receive(struct bchannel *bchannel, unsigned long prim, unsi */ void bchannel_transmit(struct bchannel *bchannel, unsigned char *data, int len) { - unsigned char buff[1025]; -#ifdef SOCKET_MISDN + unsigned char buff[1024 + MISDN_HEADER_LEN], *p = buff + MISDN_HEADER_LEN; struct mISDNhead *frm = (struct mISDNhead *)buff; -#else - iframe_t *frm = (iframe_t *)buff; -#endif int ret; + int i; + int space, in; if (bchannel->b_state != BSTATE_ACTIVE) return; -#ifdef SOCKET_MISDN - frm->prim = DL_DATA_REQ; + if (len > 1024 || len < 1) + return; + if (data) { + switch(bchannel->b_mode) { + case 0: + for (i = 0; i < len; i++) + *p++ = flip_bits[*data++]; + frm->prim = DL_DATA_REQ; + break; + case 1: + for (i = 0; i < len; i++) + *p++ = flip_bits[*data++]; + frm->prim = PH_DATA_REQ; + break; + case 2: + memcpy(p, data, len); + frm->prim = DL_DATA_REQ; + break; + case 3: + memcpy(p, data, len); + frm->prim = PH_DATA_REQ; + break; + } + } else + memset(p, flip_bits[(options.law=='a')?0x2a:0xff], len); frm->id = 0; - ret = sendto(bchannel->b_sock, data, len, 0, NULL, 0); - if (!ret) - CERROR(NULL, NULL, "Failed to send to socket %d\n", bchannel->b_sock); -#else - frm->prim = DL_DATA | REQUEST; - frm->addr = bchannel->b_addr | FLG_MSG_DOWN; - frm->dinfo = 0; - frm->len = len; - if (frm->len) - mISDN_write(bchannel_device, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC); +#ifdef SEAMLESS_TEST + unsigned char test_tone[8] = {0x2a, 0x24, 0xb4, 0x24, 0x2a, 0x25, 0xb5, 0x25}; + p = buff + MISDN_HEADER_LEN; + for (i = 0; i < len; i++) + *p++ = test_tone[(bchannel->test + i) & 7]; + bchannel->test = (bchannel->test + len) & 7; +#endif + if (bchannel->nodsp_queue) { + space = (bchannel->nodsp_queue_out - bchannel->nodsp_queue_in - 1) & (QUEUE_BUFFER_SIZE - 1); + if (len > space) { + CERROR(bchannel->call, NULL, "Queue buffer overflow, space is %d, len is %d.\n", space, len); + return; + } + p = buff + MISDN_HEADER_LEN; + in = bchannel->nodsp_queue_in; + for (i = 0; i < len; i++) { + bchannel->nodsp_queue_buffer[in] = *p++; + in = (in + 1) & (QUEUE_BUFFER_SIZE - 1); + } + bchannel->nodsp_queue_in = in; + if (bchannel->queue_sent == 0) /* if there is no pending data */ + bchannel_send_queue(bchannel); + return; + } + ret = sendto(bchannel->b_sock, buff, MISDN_HEADER_LEN+len, 0, NULL, 0); + if (ret < 0) + CERROR(bchannel->call, NULL, "Failed to send to socket %d\n", bchannel->b_sock); +} + + +/* + * in case of a send queue, we send from that queue rather directly + */ +static void bchannel_send_queue(struct bchannel *bchannel) +{ + unsigned char buff[1024 + MISDN_HEADER_LEN], *p = buff + MISDN_HEADER_LEN; + struct mISDNhead *frm = (struct mISDNhead *)buff; + int ret; + int i; + int len, out; + + len = (bchannel->nodsp_queue_in - bchannel->nodsp_queue_out) & (QUEUE_BUFFER_SIZE - 1); + if (len == 0) + return; /* mISDN driver received all load */ +#if 0 + printf("%4d:(%s|%s)\n", bchannel->nodsp_queue_out, + "----------------------------------------------------------------"+64-len/(8192/64), + " "+len/(8192/64)); #endif + if (len > 1024) + len = 1024; + frm->prim = PH_DATA_REQ; + frm->id = 0; + out = bchannel->nodsp_queue_out; + for (i = 0; i < len; i++) { + *p++ = bchannel->nodsp_queue_buffer[out]; + out = (out + 1) & (QUEUE_BUFFER_SIZE - 1); + } + bchannel->nodsp_queue_out = out; + ret = sendto(bchannel->b_sock, buff, MISDN_HEADER_LEN+len, 0, NULL, 0); + if (ret < 0) + CERROR(bchannel->call, NULL, "Failed to send to socket %d\n", bchannel->b_sock); + else + bchannel->queue_sent = 1; } @@ -641,15 +514,9 @@ void bchannel_transmit(struct bchannel *bchannel, unsigned char *data, int len) */ void bchannel_join(struct bchannel *bchannel, unsigned short id) { -#ifdef SOCKET_MISDN - int handle; + int sock; - handle = bchannel->b_sock; -#else - unsigned long handle; - - handle = bchannel->b_addr; -#endif + sock = bchannel->b_sock; if (id) { bchannel->b_conf = (id<<16) + bchannel_pid; bchannel->b_rxoff = 1; @@ -657,241 +524,188 @@ void bchannel_join(struct bchannel *bchannel, unsigned short id) bchannel->b_conf = 0; bchannel->b_rxoff = 0; } - if (bchannel->b_state == BSTATE_ACTIVE) - { - ph_control(handle, DSP_RECEIVE_OFF, bchannel->b_rxoff, "DSP-RX_OFF", bchannel->b_conf); - ph_control(handle, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf); + if (bchannel->b_state == BSTATE_ACTIVE) { + ph_control(sock, DSP_RECEIVE_OFF, bchannel->b_rxoff, "DSP-RX_OFF", bchannel->b_conf, bchannel->b_mode); + ph_control(sock, DSP_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf, bchannel->b_mode); } } /* - * main loop for processing messages from mISDN + * dtmf bchannel */ -#ifdef SOCKET_MISDN -int bchannel_handle(void) +void bchannel_dtmf(struct bchannel *bchannel, int on) { - int ret, work = 0; - struct bchannel *bchannel; - char buffer[2048+MISDN_HEADER_LEN]; - struct mISDNhead *hh = (struct mISDNhead *)buffer; + int sock; - /* process all bchannels */ - bchannel = bchannel_first; - while(bchannel) - { - /* handle message from bchannel */ - if (bchannel->b_sock > -1) - { - ret = recv(bchannel->b_sock, buffer, sizeof(buffer), 0); - if (ret >= MISDN_HEADER_LEN) - { - work = 1; - switch(hh->prim) - { - /* we don't care about confirms, we use rx data to sync tx */ - case PH_DATA_CNF: - break; - - /* we receive audio data, we respond to it AND we send tones */ - case PH_DATA_IND: - case PH_DATA_REQ: - case DL_DATA_IND: - case PH_CONTROL_IND: - bchannel_receive(bchannel, hh->prim, hh->id, buffer+MISDN_HEADER_LEN, ret-MISDN_HEADER_LEN); - break; - - case PH_ACTIVATE_IND: - case DL_ESTABLISH_IND: - case PH_ACTIVATE_CNF: - case DL_ESTABLISH_CNF: - CDEBUG(NULL, NULL, "DL_ESTABLISH confirm: bchannel is now activated (socket %d).\n", bchannel->b_sock); - bchannel_activated(bchannel); - break; - - case PH_DEACTIVATE_IND: - case DL_RELEASE_IND: - case PH_DEACTIVATE_CNF: - case DL_RELEASE_CNF: - CDEBUG(NULL, NULL, "DL_RELEASE confirm: bchannel is now de-activated (socket %d).\n", bchannel->b_sock); -// bchannel_deactivated(bchannel); - break; - - default: - CERROR(NULL, NULL, "child message not handled: prim(0x%x) socket(%d) data len(%d)\n", hh->prim, bchannel->b_sock, ret - MISDN_HEADER_LEN); - } - } else - { - if (ret < 0 && errno != EWOULDBLOCK) - CERROR(NULL, NULL, "Read from socket %d failed with return code %d\n", bchannel->b_sock, ret); - } - } - bchannel = bchannel->next; - } + sock = bchannel->b_sock; + bchannel->b_dtmf = on; + if (bchannel->b_state == BSTATE_ACTIVE && bchannel->b_mode == 0) + ph_control(sock, on?DTMF_TONE_START:DTMF_TONE_STOP, 0, "DSP-DTMF", 1, bchannel->b_mode); +} - /* if we received at least one b-frame, we will return 1 */ - return(work); + +/* + * blowfish bchannel + */ +void bchannel_blowfish(struct bchannel *bchannel, unsigned char *key, int len) +{ + int sock; + + sock = bchannel->b_sock; + memcpy(bchannel->b_bf_key, key, len); + bchannel->b_bf_len = len; + if (bchannel->b_state == BSTATE_ACTIVE) + ph_control_block(sock, DSP_BF_ENABLE_KEY, bchannel->b_bf_key, bchannel->b_bf_len, "DSP-CRYPT", bchannel->b_bf_len, bchannel->b_mode); } -#else -int bchannel_handle(void) + + +/* + * pipeline bchannel + */ +void bchannel_pipeline(struct bchannel *bchannel, char *pipeline) { - struct bchannel *bchannel; - iframe_t *frm; - unsigned char buffer[2048]; - int len; + int sock; - /* no device, no read */ - if (bchannel_device < 0) - return(0); + sock = bchannel->b_sock; + strncpy(bchannel->b_pipeline, pipeline, sizeof(bchannel->b_pipeline)-1); + if (bchannel->b_state == BSTATE_ACTIVE) + ph_control_block(sock, DSP_PIPELINE_CFG, bchannel->b_pipeline, strlen(bchannel->b_pipeline)+1, "DSP-PIPELINE", 0, bchannel->b_mode); +} - /* get message from kernel */ - len = mISDN_read(bchannel_device, buffer, sizeof(buffer), 0); - if (len < 0) - { - if (errno == EAGAIN) - return(0); - CERROR(NULL, NULL, "Failed to do mISDN_read()\n"); - return(0); - } - if (!len) - { -// printf("%s: ERROR: mISDN_read() returns nothing\n"); - return(0); - } - frm = (iframe_t *)buffer; - - /* 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: - return(1); - } - /* find the mISDNport that belongs to the stack */ - bchannel = bchannel_first; - while(bchannel) - { - if (frm->addr == bchannel->b_addr) - break; - bchannel = bchannel->next; - } - if (!bchannel) - { - CERROR(NULL, NULL, "message belongs to no bchannel: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, len); - goto out; - } +/* + * gain bchannel + */ +void bchannel_gain(struct bchannel *bchannel, int gain, int tx) +{ + int sock; - /* 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; + sock = bchannel->b_sock; + if (tx) + bchannel->b_tx_gain = gain; + else + bchannel->b_rx_gain = gain; + if (bchannel->b_state == BSTATE_ACTIVE && bchannel->b_mode == 0) + ph_control(sock, (tx)?DSP_VOL_CHANGE_TX:DSP_VOL_CHANGE_RX, gain, (tx)?"DSP-TX_GAIN":"DSP-RX_GAIN", gain, bchannel->b_mode); +} - /* we receive audio data, we respond to it AND we send tones */ - case PH_DATA | INDICATION: - case DL_DATA | INDICATION: - case PH_CONTROL | INDICATION: - case PH_SIGNAL | INDICATION: - bchannel_receive(bchannel, frm->prim, frm->dinfo, (unsigned char *)frm->data.p, frm->len); - break; - case PH_ACTIVATE | INDICATION: - case DL_ESTABLISH | INDICATION: - case PH_ACTIVATE | CONFIRM: - case DL_ESTABLISH | CONFIRM: - CDEBUG(NULL, NULL, "DL_ESTABLISH confirm: bchannel is now activated (address 0x%x).\n", frm->addr); - bchannel_activated(bchannel); - break; +/* + * main loop for processing messages from mISDN + */ +static int bchannel_handle(struct lcr_fd *fd, unsigned int what, void *instance, int index) +{ + struct bchannel *bchannel = (struct bchannel *)instance; + int ret; + unsigned char buffer[2048+MISDN_HEADER_LEN]; + struct mISDNhead *hh = (struct mISDNhead *)buffer; - case PH_DEACTIVATE | INDICATION: - case DL_RELEASE | INDICATION: - case PH_DEACTIVATE | CONFIRM: - case DL_RELEASE | CONFIRM: - CDEBUG(NULL, NULL, "DL_RELEASE confirm: bchannel is now de-activated (address 0x%x).\n", frm->addr); -// bchannel_deactivated(bchannel); - break; + ret = recv(bchannel->b_sock, buffer, sizeof(buffer), 0); + if (ret >= (int)MISDN_HEADER_LEN) { + switch(hh->prim) { + /* after a confim, we can send more from queue */ + case PH_DATA_CNF: + if (bchannel->nodsp_queue) { + bchannel->queue_sent = 0; + bchannel_send_queue(bchannel); + } + break; + + /* we receive audio data, we respond to it AND we send tones */ + case PH_DATA_IND: + case PH_DATA_REQ: + case DL_DATA_IND: + case PH_CONTROL_IND: + bchannel_receive(bchannel, buffer, ret-MISDN_HEADER_LEN); + break; + + case PH_ACTIVATE_IND: + case DL_ESTABLISH_IND: + case PH_ACTIVATE_CNF: + case DL_ESTABLISH_CNF: + CDEBUG(bchannel->call, NULL, "DL_ESTABLISH confirm: bchannel is now activated (socket %d).\n", bchannel->b_sock); + bchannel_activated(bchannel); + break; - default: - CERROR(NULL, NULL, "message not handled: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, len); + case PH_DEACTIVATE_IND: + case DL_RELEASE_IND: + case PH_DEACTIVATE_CNF: + case DL_RELEASE_CNF: + CDEBUG(bchannel->call, NULL, "DL_RELEASE confirm: bchannel is now de-activated (socket %d).\n", bchannel->b_sock); +// bchannel_deactivated(bchannel); + break; + + default: + CERROR(bchannel->call, NULL, "child message not handled: prim(0x%x) socket(%d) data len(%d)\n", hh->prim, bchannel->b_sock, ret - MISDN_HEADER_LEN); + } + } else { +// if (ret < 0 && errno != EWOULDBLOCK) + CERROR(bchannel->call, NULL, "Read from socket %d failed with return code %d\n", bchannel->b_sock, ret); } - out: - return(1); + /* if we received at least one b-frame, we will return 1 */ + return 0; } -#endif /* * bchannel channel handling */ struct bchannel *bchannel_first = NULL; -struct bchannel *find_bchannel_handle(unsigned long handle) +struct bchannel *find_bchannel_handle(unsigned int handle) { struct bchannel *bchannel = bchannel_first; - while(bchannel) - { + while(bchannel) { if (bchannel->handle == handle) break; bchannel = bchannel->next; } - return(bchannel); + return bchannel; } #if 0 -struct bchannel *find_bchannel_ref(unsigned long ref) +struct bchannel *find_bchannel_ref(unsigned int ref) { struct bchannel *bchannel = bchannel_first; - while(bchannel) - { + while(bchannel) { if (bchannel->ref == ref) break; bchannel = bchannel->next; } - return(bchannel); + return bchannel; } #endif -struct bchannel *alloc_bchannel(unsigned long handle) +struct bchannel *alloc_bchannel(unsigned int handle) { struct bchannel **bchannelp = &bchannel_first; while(*bchannelp) bchannelp = &((*bchannelp)->next); - *bchannelp = (struct bchannel *)malloc(sizeof(struct bchannel)); + *bchannelp = (struct bchannel *)calloc(1, sizeof(struct bchannel)); if (!*bchannelp) - return(NULL); + return NULL; (*bchannelp)->handle = handle; (*bchannelp)->b_state = BSTATE_IDLE; + (*bchannelp)->b_sock = -1; - return(*bchannelp); + return *bchannelp; } void free_bchannel(struct bchannel *bchannel) { struct bchannel **temp = &bchannel_first; - while(*temp) - { - if (*temp == bchannel) - { + while(*temp) { + if (*temp == bchannel) { *temp = (*temp)->next; -#ifdef SOCKET_MISDN if (bchannel->b_sock > -1) -#else - if (bchannel->b_stid) -#endif bchannel_destroy(bchannel); - if (bchannel->call) - { + if (bchannel->call) { if (bchannel->call->bchannel) bchannel->call->bchannel = NULL; }