[chan_lcr] Added second caller ID (ANI) in case the caller ID is user provided.
[lcr.git] / bchannel.c
index 3625eba..5793795 100644 (file)
 #include <netinet/in.h>
 #include <netdb.h>
 #include <sys/socket.h>
-#include <mISDNif.h>
+#include <mISDN/mISDNif.h>
 
-#define AF_COMPATIBILITY_FUNC 1
-#define MISDN_OLD_AF_COMPATIBILITY 1
-#include <compat_af_isdn.h>
+#include <mISDN/mISDNcompat.h>
+int __af_isdn = MISDN_AF_ISDN;
+#include <mISDN/q931.h>
 
+#define HAVE_ATTRIBUTE_always_inline 1
+#define HAVE_ARPA_INET_H 1
+#define HAVE_TIMERSUB 1
+
+#include <asterisk/compiler.h>
 #include <asterisk/frame.h>
 
+/* 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 <asterisk/phone_no_utils.h>
+#include <asterisk/logger.h>
+#include <asterisk/module.h>
+#include <asterisk/channel.h>
+#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
@@ -54,12 +70,11 @@ enum {
        BSTATE_DEACTIVATING,
 };
 
+static void bchannel_send_queue(struct bchannel *bchannel);
 
 int bchannel_initialize(void)
 {
-       init_af_isdn();
-
-       return(0);
+       return 0;
 }
 
 void bchannel_deinitialize(void)
@@ -109,26 +124,24 @@ static void ph_control_block(int sock, unsigned int c1, void *c2, int c2_len, ch
                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 mode)
+int bchannel_create(struct bchannel *bchannel, int mode, int queue)
 {
        int ret;
-       unsigned int on = 1;
        struct sockaddr_mISDN addr;
 
-       if (bchannel->b_sock > -1)
-       {
+       if (bchannel->b_sock > -1) {
                CERROR(bchannel->call, NULL, "Socket already created for handle 0x%x\n", bchannel->handle);
-               return(0);
+               return 0;
        }
 
        /* open socket */
-       bchannel->b_mode = mode;
-       switch(bchannel->b_mode)
-       {
+       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);
@@ -146,35 +159,42 @@ int bchannel_create(struct bchannel *bchannel, int mode)
                bchannel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_HDLC);
                break;
        }
-       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 mISDNdsp.ko?\n", bchannel->handle);
-               return(0);
-       }
-       
-       /* set nonblocking io */
-       ret = ioctl(bchannel->b_sock, FIONBIO, &on);
-       if (ret < 0)
-       {
-               CERROR(bchannel->call, 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);
        addr.channel = bchannel->handle & 0xff;
        ret = bind(bchannel->b_sock, (struct sockaddr *)&addr, sizeof(addr));
-       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 mISDNdsp.ko?\n", bchannel->handle, addr.dev, addr.channel);
+       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);
+               return 0;
        }
-       return(1);
+
+       /* 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;
 }
 
 
@@ -188,8 +208,7 @@ void bchannel_activate(struct bchannel *bchannel, int activate)
 
        /* activate bchannel */
        CDEBUG(bchannel->call, NULL, "%sActivating B-channel.\n", activate?"":"De-");
-       switch(bchannel->b_mode)
-       {
+       switch(bchannel->b_mode) {
                case 0:
                case 2:
                act.prim = (activate)?DL_ESTABLISH_REQ:DL_RELEASE_REQ; 
@@ -205,7 +224,6 @@ void bchannel_activate(struct bchannel *bchannel, int activate)
                CERROR(bchannel->call, NULL, "Failed to send to socket %d\n", bchannel->b_sock);
 
        bchannel->b_state = (activate)?BSTATE_ACTIVATING:BSTATE_DEACTIVATING;
-       bchannel->rebuffer_usage = 0;
 }
 
 
@@ -256,11 +274,10 @@ static void bchannel_activated(struct bchannel *bchannel)
  */
 void bchannel_destroy(struct bchannel *bchannel)
 {
-       if (bchannel->b_sock > -1)
-       {
+       if (bchannel->b_sock > -1) {
+               unregister_fd(&bchannel->lcr_fd);
                close(bchannel->b_sock);
                bchannel->b_sock = -1;
-               bchannel->rebuffer_usage = 0;
        }
        bchannel->b_state = BSTATE_IDLE;
 }
@@ -279,24 +296,20 @@ static void bchannel_receive(struct bchannel *bchannel, unsigned char *buffer, i
        struct bchannel *remote_bchannel;
        int ret;
 
-       if (hh->prim == PH_CONTROL_IND)
-       {
+       if (hh->prim == PH_CONTROL_IND) {
                /* non dsp -> ignore ph_control */
                if (bchannel->b_mode == 1 || bchannel->b_mode == 3)
                        return;
-               if (len < 4)
-               {
+               if (len < 4) {
                        CERROR(bchannel->call, NULL, "SHORT READ OF PH_CONTROL INDICATION\n");
                        return;
                }
-               if ((cont&(~DTMF_TONE_MASK)) == DTMF_TONE_VAL)
-               {
+               if ((cont&(~DTMF_TONE_MASK)) == DTMF_TONE_VAL) {
                        if (bchannel->call)
                                lcr_in_dtmf(bchannel->call, cont & DTMF_TONE_MASK);
                        return;
                }
-               switch(cont)
-               {
+               switch(cont) {
                        case DSP_BF_REJECT:
                        CERROR(bchannel->call, NULL, "Blowfish crypt rejected.\n");
                        break;
@@ -310,18 +323,15 @@ static void bchannel_receive(struct bchannel *bchannel, unsigned char *buffer, i
                }
                return;
        }
-       if (hh->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(bchannel->call, NULL, "ignoring tx data, because 'txdata' is turned off\n");
                        return;
                }
                return;
        }
-       if (hh->prim != PH_DATA_IND && hh->prim != DL_DATA_IND)
-       {
+       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;
        }
@@ -352,32 +362,27 @@ static void bchannel_receive(struct bchannel *bchannel, unsigned char *buffer, i
         */
 
        /* if rx is off, it may happen that fifos send us pending informations, we just ignore them */
-       if (bchannel->b_rxoff)
-       {
+       if (bchannel->b_rxoff) {
                CDEBUG(bchannel->call, NULL, "ignoring data, because rx is turned off\n");
                return;
        }
 
-       if (!bchannel->call)
-       {
+       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;
        }
 
-       if (bchannel->call->pipe[1] < 0)
-       {
+       if (bchannel->call->pipe[1] < 0) {
                /* nobody there */
                return;
        }
 
        /* if no hdlc */
-       if (bchannel->b_mode == 0 || bchannel->b_mode == 1)
-       {
+       if (bchannel->b_mode == 0 || bchannel->b_mode == 1) {
                d = data;
                for (i = 0; i < len; i++) {
                        *d = flip_bits[*d];
@@ -385,52 +390,15 @@ static void bchannel_receive(struct bchannel *bchannel, unsigned char *buffer, i
                }
        }
 
-       /* no hdlc and rebuffer */
-       if (bchannel->call->rebuffer && !bchannel->call->hdlc) {
-               int u = bchannel->rebuffer_usage;
-               unsigned char * b = bchannel->rebuffer;
-               int l = len;
-               int fd = bchannel->call->pipe[1];
-
-               d = data;
-
-               if (u > 0) {
-                       if (u + l >= 160) {
-                               memcpy(b + u, d, 160 - u);
-                               d += 160 - u;
-                               l -= 160 - u;
-                               u = 0;
-                               if (write(fd, b, 160) < 0)
-                                       goto errout;
-                       } else {
-                               memcpy(b + u, d, l);
-                               u += l;
-                               l = 0;
-                       }
-               }
-
-               while (l >= 160) {
-                       if (write(fd, d, 160) < 0)
-                               goto errout;
-                       d += 160;
-                       l -= 160;
-               }
-
-               if (l > 0) {
-                       memcpy(b, d, l);
-               } 
-               bchannel->rebuffer_usage = u + l;
-       } else {
-               len = write(bchannel->call->pipe[1], data, len);
-               if (len < 0)
-                       goto errout;
-       }
+       
+       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;
-       bchannel->rebuffer_usage = 0;
        CDEBUG(bchannel->call, NULL, "broken pipe on bchannel pipe\n");
 }
 
@@ -444,36 +412,100 @@ void bchannel_transmit(struct bchannel *bchannel, unsigned char *data, int len)
        struct mISDNhead *frm = (struct mISDNhead *)buff;
        int ret;
        int i;
+       int space, in;
 
        if (bchannel->b_state != BSTATE_ACTIVE)
                return;
        if (len > 1024 || len < 1)
                return;
-       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;
+       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;
+#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;
 }
 
 
@@ -492,8 +524,7 @@ void bchannel_join(struct bchannel *bchannel, unsigned short id)
                bchannel->b_conf = 0;
                bchannel->b_rxoff = 0;
        }
-       if (bchannel->b_state == BSTATE_ACTIVE)
-       {
+       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);
        }
@@ -508,7 +539,7 @@ void bchannel_dtmf(struct bchannel *bchannel, int on)
        int sock;
 
        sock = bchannel->b_sock;
-       bchannel->b_dtmf = 1;
+       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);
 }
@@ -563,68 +594,58 @@ void bchannel_gain(struct bchannel *bchannel, int gain, int tx)
 /*
  * main loop for processing messages from mISDN
  */
-int bchannel_handle(void)
+static int bchannel_handle(struct lcr_fd *fd, unsigned int what, void *instance, int index)
 {
-       int ret, work = 0;
-       struct bchannel *bchannel;
+       struct bchannel *bchannel = (struct bchannel *)instance;
+       int ret;
        unsigned char buffer[2048+MISDN_HEADER_LEN];
        struct mISDNhead *hh = (struct mISDNhead *)buffer;
 
-       /* 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 >= (int)MISDN_HEADER_LEN)
-                       {
-                               work = 1;
-                               switch(hh->prim)
-                               {
-                                       /* we don't care about confirms, we use rx data to sync tx */
-                                       case PH_DATA_CNF:
-                                       break;
-
-                                       /* we receive audio data, we respond to it AND we send tones */
-                                       case PH_DATA_IND:
-                                       case 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;
-
-                                       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);
+       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;
+
+                       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);
                }
-               bchannel = bchannel->next;
+       } else {
+//             if (ret < 0 && errno != EWOULDBLOCK)
+               CERROR(bchannel->call, NULL, "Read from socket %d failed with return code %d\n", bchannel->b_sock, ret);
        }
 
        /* if we received at least one b-frame, we will return 1 */
-       return(work);
+       return 0;
 }
 
 
@@ -636,13 +657,12 @@ 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
@@ -650,13 +670,12 @@ 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
 
@@ -669,27 +688,24 @@ struct bchannel *alloc_bchannel(unsigned int handle)
 
        *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;
                        if (bchannel->b_sock > -1)
                                bchannel_destroy(bchannel);
-                       if (bchannel->call)
-                       {
+                       if (bchannel->call) {
                                if (bchannel->call->bchannel)
                                        bchannel->call->bchannel = NULL;
                        }