Added bridgin support for GSM and SIP
[lcr.git] / socket_server.c
index a33f626..2fba2eb 100644 (file)
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <curses.h>
+#ifdef PACKAGE_VERSION
+#undef PACKAGE_VERSION
+#endif
+#include "config.h"
 
 
 char socket_name[128];
@@ -20,14 +24,15 @@ int sock = -1;
 struct sockaddr_un sock_address;
 
 struct admin_list *admin_first = NULL;
+static struct lcr_fd admin_fd;
+
+int admin_handle(struct lcr_fd *fd, unsigned int what, void *instance, int index);
 
 /*
  * initialize admin socket 
  */
 int admin_init(void)
 {
-       unsigned int on = 1;
-
        /* open and bind socket */
        if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
                PERROR("Failed to create admin socket. (errno=%d)\n", errno);
@@ -55,14 +60,9 @@ int admin_init(void)
                PERROR("Failed to listen to socket \"%s\". (errno=%d)\n", sock_address.sun_path, errno);
                return(-1);
        }
-       if (ioctl(sock, FIONBIO, (unsigned char *)(&on)) < 0) {
-               close(sock);
-               unlink(socket_name);
-               fhuse--;
-               sock = -1;
-               PERROR("Failed to set socket \"%s\" into non-blocking mode. (errno=%d)\n", sock_address.sun_path, errno);
-               return(-1);
-       }
+       memset(&admin_fd, 0, sizeof(admin_fd));
+       admin_fd.fd = sock;
+       register_fd(&admin_fd, LCR_FD_READ | LCR_FD_EXCEPT, admin_handle, NULL, 0);
        if (chmod(socket_name, options.socketrights) < 0) {
                PERROR("Failed to change socket rights to %d. (errno=%d)\n", options.socketrights, errno);
        }
@@ -86,6 +86,9 @@ void free_connection(struct admin_list *admin)
        class Join *join, *joinnext;
        struct mISDNport *mISDNport;
        int i, ii;
+       struct admin_list **adminp;
+       class Port *port, *portnext;
+       class Premote *remote;
 
        /* free remote joins */
        if (admin->remote_name[0]) {
@@ -107,7 +110,7 @@ void free_connection(struct admin_list *admin)
                        while(i < ii) {
                                if (mISDNport->b_remote_id[i] == admin->sock) {
                                        mISDNport->b_state[i] = B_STATE_IDLE;
-                                       mISDNport->b_timer[i] = 0;
+                                       unsched_timer(&mISDNport->b_timer[i]);
                                        mISDNport->b_remote_id[i] = 0;
                                        mISDNport->b_remote_ref[i] = 0;
                                }
@@ -128,25 +131,47 @@ void free_connection(struct admin_list *admin)
                        }
                        join = joinnext;
                }
+               /* release remote port */
+               port = port_first;
+               while(port) {
+                       portnext = port->next;
+                       if ((port->p_type & PORT_CLASS_MASK) == PORT_CLASS_REMOTE) {
+                               remote = (class Premote *) port;
+                               if (remote->p_m_r_remote_id == admin->sock) {
+                                       memset(&param, 0, sizeof(param));
+                                       param.disconnectinfo.cause = CAUSE_OUTOFORDER;
+                                       param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+                                       remote->message_remote(MESSAGE_RELEASE, &param);
+                                       /* port is now destroyed, so we go to next join */
+                               }
+                       }
+                       port = portnext;
+               }
        }
 
        if (admin->sock >= 0) {
+               unregister_fd(&admin->fd);
                close(admin->sock);
                fhuse--;
        }
-//     printf("new\n", response);
        response = admin->response;
        while (response) {
-//#warning
-//     printf("%x\n", response);
                temp = response->next;
                FREE(response, 0);
                memuse--;
                response = (struct admin_queue *)temp;
        }
-//     printf("new2\n", response);
+
+       adminp = &admin_first;
+       while(*adminp) {
+               if (*adminp == admin)
+                       break;
+               adminp = &((*adminp)->next);
+       }
+       if (*adminp)
+               *adminp = (*adminp)->next;
+
        FREE(admin, 0);
-//     printf("new3\n", response);
        memuse--;
 }
 
@@ -160,13 +185,13 @@ void admin_cleanup(void)
 
        admin = admin_first;
        while(admin) {
-//printf("clean\n");
                next = admin->next;
                free_connection(admin);
                admin = next;
        }
 
        if (sock >= 0) {
+               unregister_fd(&admin_fd);
                close(sock);
                fhuse--;
        }
@@ -206,7 +231,6 @@ int admin_interface(struct admin_queue **responsep)
        /* attach to response chain */
        *responsep = response;
        responsep = &response->next;
-
        return(0);
 }
 
@@ -274,9 +298,9 @@ int admin_route(struct admin_queue **responsep)
                        }
                } else if (apppbx->e_state != EPOINT_STATE_CONNECT) {
                        release:
-                       apppbx->e_callback = 0;
+                       unsched_timer(&apppbx->e_callback_timeout);
                        apppbx->e_action = NULL;
-                       apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
+                       apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0);
                        start_trace(-1,
                                NULL,
                                numberrize_callerinfo(apppbx->e_callerinfo.id, apppbx->e_callerinfo.ntype, options.national, options.international),
@@ -288,7 +312,7 @@ int admin_route(struct admin_queue **responsep)
                        end_trace();
                }
 
-               apppbx->e_action_timeout = 0;
+               unsched_timer(&apppbx->e_action_timeout);
                apppbx->e_rule = NULL;
                apppbx->e_ruleset = NULL;
 
@@ -309,7 +333,6 @@ int admin_route(struct admin_queue **responsep)
        /* attach to response chain */
        *responsep = response;
        responsep = &response->next;
-
        return(0);
 }
 
@@ -486,8 +509,8 @@ int admin_release(struct admin_queue **responsep, char *message)
                goto out;
        }
 
-       apppbx->e_callback = 0;
-       apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
+       unsched_timer(&apppbx->e_callback_timeout);
+       apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0);
 
        out:
        /* attach to response chain */
@@ -518,7 +541,6 @@ int admin_call(struct admin_list *admin, struct admin_message *msg)
                apppbx->e_callerinfo.present = INFO_PRESENT_RESTRICTED;
        apppbx->e_callerinfo.screen = INFO_SCREEN_NETWORK;
 
-//printf("hh=%d\n", apppbx->e_capainfo.hlc);
 
        apppbx->e_capainfo.bearer_capa = msg->u.call.bc_capa;
        apppbx->e_capainfo.bearer_mode = msg->u.call.bc_mode;
@@ -530,7 +552,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg)
        apppbx->e_dialinginfo.sending_complete = 1;
 
        apppbx->new_state(PORT_STATE_OUT_SETUP);
-       apppbx->out_setup();
+       apppbx->out_setup(0);
        return(0);
 }
 
@@ -538,7 +560,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg)
 /*
  * this function is called for response whenever a call state changes.
  */
-void admin_call_response(int adminid, int message, const char *connected, int cause, int location, int notify)
+void admin_call_response(int adminid, int message, const char *connected, int cause, int location, int notify_progress)
 {
        struct admin_list       *admin;
        struct admin_queue      *response, **responsep; /* response pointer */
@@ -569,25 +591,29 @@ void admin_call_response(int adminid, int message, const char *connected, int ca
        response->num = 1;
        /* message */
        response->am[0].message = message;
-//     printf("MESSAGE: %d\n", message);
 
        SCPY(response->am[0].u.call.callerid, connected);
        response->am[0].u.call.cause = cause;
        response->am[0].u.call.location = location;
-       response->am[0].u.call.notify = notify;
+       response->am[0].u.call.notify_progress = notify_progress;
 
        /* attach to response chain */
        *responsep = response;
        responsep = &response->next;
+       admin->fd.when |= LCR_FD_WRITE;
 }
 
 
 /*
  * send data to the remote socket join instance
  */
-int admin_message_to_join(struct admin_msg *msg, struct admin_list *admin)
+int admin_message_to_lcr(struct admin_msg *msg, struct admin_list *admin)
 {
+       struct mISDNport                *mISDNport;
        class Join                      *join;
+       class JoinRemote                *joinremote = NULL; /* make GCC happy */
+       class Port                      *port;
+       class Premote                   *remote = NULL; /* make GCC happy */
        struct admin_list               *temp;
 
        /* hello message */
@@ -628,13 +654,44 @@ int admin_message_to_join(struct admin_msg *msg, struct admin_list *admin)
                return(-1);
        }
 
-       /* new join */
+       /* new join. the reply (NEWREF assignment) is sent from constructor */
        if (msg->type == MESSAGE_NEWREF) {
-               /* create new join instance */
-               join = new JoinRemote(0, admin->remote_name, admin->sock); // must have no serial, because no endpoint is connected
-               if (!join) {
-                       FATAL("No memory for remote join instance\n");
-                       return(-1);
+               if (msg->param.newref.mode) {
+                       char name[32];
+                       /* find remote port */
+                       mISDNport = mISDNport_first;
+                       while(mISDNport) {
+                               if (mISDNport->ifport->remote && !strcmp(mISDNport->ifport->remote_app, admin->remote_name))
+                                       break;
+                               mISDNport = mISDNport->next;
+                       }
+                       if (!mISDNport) {
+                               union parameter param;
+
+                               /* create new join instance */
+                               join = joinremote = new JoinRemote(0, admin->remote_name, admin->sock); // must have no serial, because no endpoint is connected
+                               if (!join) {
+                                       FATAL("No memory for remote join instance\n");
+                                       return(-1);
+                               }
+                               memset(&param, 0, sizeof(union parameter));
+                               param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+                               param.disconnectinfo.cause = CAUSE_RESSOURCEUNAVAIL;
+                               admin_message_from_lcr(joinremote->j_remote_id, joinremote->j_remote_ref, MESSAGE_RELEASE, &param);
+                               return 0;
+                       }
+                       /* creating port object, transparent until setup with hdlc */
+                       SPRINT(name, "%s-%s-in", mISDNport->ifport->interface->name, mISDNport->ifport->remote_app);
+                       if (!(remote = new Premote(PORT_TYPE_REMOTE_IN, mISDNport, name, NULL, 0, 0, B_MODE_TRANSPARENT, admin->sock)))
+
+                               FATAL("Cannot create Port instance.\n");
+               } else {
+                       /* create new join instance */
+                       join = new JoinRemote(0, admin->remote_name, admin->sock); // must have no serial, because no endpoint is connected
+                       if (!join) {
+                               FATAL("No memory for remote join instance\n");
+                               return(-1);
+                       }
                }
                return(0);
        }
@@ -659,36 +716,56 @@ int admin_message_to_join(struct admin_msg *msg, struct admin_list *admin)
        /* find join instance */
        join = join_first;
        while(join) {
-               if (join->j_serial == msg->ref)
-                       break;
+               if (join->j_type == JOIN_TYPE_REMOTE) {
+                       joinremote = (class JoinRemote *)join;
+                       if (joinremote->j_remote_ref == msg->ref)
+                               break;
+               }
                join = join->next;
        }
-       if (!join) {
-               PDEBUG(DEBUG_LOG, "No join found with serial %d. (May have been already released.)\n", msg->ref);
+       if (join) {
+               if (admin->sock != joinremote->j_remote_id) {
+                       PERROR("Ref %d belongs to remote application %s, but not to sending application %s.\n", msg->ref, joinremote->j_remote_name, admin->remote_name);
+                       return(-1);
+               }
+               /* send message */
+               joinremote->message_remote(msg->type, &msg->param);
+
                return(0);
        }
 
-       /* check application */
-       if (join->j_type != JOIN_TYPE_REMOTE) {
-               PERROR("Ref %d does not belong to a remote join instance.\n", msg->ref);
-               return(-1);
-       }
-       if (admin->sock != ((class JoinRemote *)join)->j_remote_id) {
-               PERROR("Ref %d belongs to remote application %s, but not to sending application %s.\n", msg->ref, ((class JoinRemote *)join)->j_remote_name, admin->remote_name);
-               return(-1);
+       /* find port instance */
+       port = port_first;
+       while(port) {
+               if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_REMOTE) {
+                       remote = (class Premote *) port;
+                       if (remote->p_m_r_ref == msg->ref)
+                               break;
+               }
+               port = port->next;
        }
+       if (port) {
+               if (admin->sock != remote->p_m_r_remote_id) {
+                       PERROR("Ref %d belongs to remote application %s, but not to sending application %s.\n", msg->ref, remote->p_m_r_remote_app, admin->remote_name);
+                       return(-1);
+               }
 
-       /* send message */
-       ((class JoinRemote *)join)->message_remote(msg->type, &msg->param);
+               /* send message */
+               remote->message_remote(msg->type, &msg->param);
 
+               return(0);
+       }
+
+       PDEBUG(DEBUG_LOG, "No remote instance found with ref %d. (May have been already released.)\n", msg->ref);
        return(0);
+
 }
 
 
 /*
  * this function is called for every message to remote socket
  */
-int admin_message_from_join(int remote_id, unsigned int ref, int message_type, union parameter *param)
+int admin_message_from_lcr(int remote_id, unsigned int ref, int message_type, union parameter *param)
 {
        struct admin_list       *admin;
        struct admin_queue      **responsep;    /* response pointer */
@@ -722,7 +799,7 @@ int admin_message_from_join(int remote_id, unsigned int ref, int message_type, u
        (*responsep)->am[0].u.msg.type = message_type;
        (*responsep)->am[0].u.msg.ref = ref;
        memcpy(&(*responsep)->am[0].u.msg.param, param, sizeof(union parameter));
-
+       admin->fd.when |= LCR_FD_WRITE;
        return(0);
 }
 
@@ -732,7 +809,6 @@ int admin_message_from_join(int remote_id, unsigned int ref, int message_type, u
  */
 int admin_state(struct admin_queue **responsep)
 {
-
        class Port              *port;
        class EndpointAppPBX    *apppbx;
        class Join              *join;
@@ -740,11 +816,14 @@ int admin_state(struct admin_queue **responsep)
        struct interface        *interface;
        struct interface_port   *ifport;
        struct mISDNport        *mISDNport;
+       struct select_channel   *selchannel;
        int                     i;
        int                     num;
        int                     anybusy;
        struct admin_queue      *response;
        struct admin_list       *admin;
+       struct tm               *now_tm;
+       time_t                  now;
 
        /* create state response */
        response = (struct admin_queue *)MALLOC(sizeof(struct admin_queue)+sizeof(admin_message));
@@ -755,6 +834,8 @@ int admin_state(struct admin_queue **responsep)
        /* version */
        SCPY(response->am[0].u.s.version_string, VERSION_STRING);
        /* time */
+       time(&now);
+       now_tm = localtime(&now);
        memcpy(&response->am[0].u.s.tm, now_tm, sizeof(struct tm));
        /* log file */
        SCPY(response->am[0].u.s.logfile, options.log);
@@ -763,6 +844,8 @@ int admin_state(struct admin_queue **responsep)
        interface = interface_first;
        while(interface) {
                ifport = interface->ifport;
+               if (!ifport)
+                       i++;
                while(ifport) {
                        i++;
                        ifport = ifport->next;
@@ -824,6 +907,18 @@ int admin_state(struct admin_queue **responsep)
        num = 0;
        while(interface) {
                ifport = interface->ifport;
+               if (!ifport) {
+                       /* message */
+                       response->am[num].message = ADMIN_RESPONSE_S_INTERFACE;
+                       /* interface */
+                       SCPY(response->am[num].u.i.interface_name, interface->name);
+                       /* portnum */
+                       response->am[num].u.i.portnum = -100; /* indicate: no ifport */
+                       /* iftype */
+                       response->am[num].u.i.extension = interface->extension;
+                       /* block */
+                       num++;
+               }
                while(ifport) {
                        /* message */
                        response->am[num].message = ADMIN_RESPONSE_S_INTERFACE;
@@ -868,7 +963,40 @@ int admin_state(struct admin_queue **responsep)
                                response->am[num].u.i.slip_rx = mISDNport->slip_rx;
                                /* channels */
                                response->am[num].u.i.channels = mISDNport->b_num;
-                               /* channel info */
+                               /* channel selection */
+                               selchannel = ifport->out_channel;
+                               if (ifport->channel_force)
+                                       SCAT(response->am[num].u.i.out_channel, "force");
+                               while (selchannel) {
+                                       if (response->am[num].u.i.out_channel[0])
+                                               SCAT(response->am[num].u.i.out_channel, ",");
+                                       switch (selchannel->channel) {
+                                       case CHANNEL_NO:
+                                               SCAT(response->am[num].u.i.out_channel, "no");
+                                               break;
+                                       case CHANNEL_ANY:
+                                               SCAT(response->am[num].u.i.out_channel, "any");
+                                               break;
+                                       case CHANNEL_FREE:
+                                               SCAT(response->am[num].u.i.out_channel, "free");
+                                               break;
+                                       default:
+                                               SPRINT(strchr(response->am[num].u.i.out_channel, '\0'), "%d", selchannel->channel);
+                                       }
+                                       selchannel = selchannel->next;
+                               }
+                               selchannel = ifport->in_channel;
+                               while (selchannel) {
+                                       switch (selchannel->channel) {
+                                       case CHANNEL_FREE:
+                                               SCAT(response->am[num].u.i.in_channel, "free");
+                                               break;
+                                       default:
+                                               SPRINT(strchr(response->am[num].u.i.in_channel, '\0'), "%d", selchannel->channel);
+                                       }
+                                       selchannel = selchannel->next;
+                               }
+                               /* channel state */
                                i = 0;
                                anybusy = 0;
                                while(i < mISDNport->b_num) {
@@ -1046,7 +1174,7 @@ int admin_state(struct admin_queue **responsep)
                        response->am[num].u.p.state = ADMIN_STATE_IDLE;
                }
                /* isdn */
-               if ((port->p_type&PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1) {
+               if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_DSS1) {
                        response->am[num].u.p.isdn = 1;
                        pdss1 = (class Pdss1 *)port;
                        response->am[num].u.p.isdn_chan = pdss1->p_m_b_channel;
@@ -1064,68 +1192,54 @@ int sockserial = 1; // must start with 1, because 0 is used if no serial is set
 /*
  * handle admin socket (non blocking)
  */
-int admin_handle(void)
+int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int index);
+
+int admin_handle(struct lcr_fd *fd, unsigned int what, void *instance, int index)
 {
-       struct admin_list       *admin, **adminp;
-       void                    *temp;
-       struct admin_message    msg;
-       int                     len;
        int                     new_sock;
        socklen_t               sock_len = sizeof(sock_address);
-       unsigned int            on = 1;
-       int                     work = 0; /* if work was done */
-       struct Endpoint         *epoint;
-
-       if (sock < 0)
-               return(0);
+       struct admin_list       *admin;
 
        /* check for new incoming connections */
        if ((new_sock = accept(sock, (struct sockaddr *)&sock_address, &sock_len)) >= 0) {
-               work = 1;
                /* insert new socket */
                admin = (struct admin_list *)MALLOC(sizeof(struct admin_list));
-               if (ioctl(new_sock, FIONBIO, (unsigned char *)(&on)) >= 0) {
-//#warning
-//     PERROR("DEBUG incoming socket %d, serial=%d\n", new_sock, sockserial);
-                       memuse++;
-                       fhuse++;
-                       admin->sockserial = sockserial++;
-                       admin->next = admin_first;
-                       admin_first = admin;
-                       admin->sock = new_sock;
-               } else {
-                       close(new_sock);
-                       FREE(admin, sizeof(struct admin_list));
-               }
+               memuse++;
+               fhuse++;
+               admin->sockserial = sockserial++;
+               admin->next = admin_first;
+               admin_first = admin;
+               admin->sock = new_sock;
+               admin->fd.fd = new_sock;
+               register_fd(&admin->fd, LCR_FD_READ | LCR_FD_EXCEPT, admin_handle_con, admin, 0);
        } else {
                if (errno != EWOULDBLOCK) {
                        PERROR("Failed to accept connection from socket \"%s\". (errno=%d) Closing socket.\n", sock_address.sun_path, errno);
                        admin_cleanup();
-                       return(1);
+                       return 0;
                }
        }
 
-       /* loop all current socket connections */
-       admin = admin_first;
-       adminp = &admin_first;
-       while(admin) {
+       return 0;
+}
+
+int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int index)
+{
+       struct admin_list *admin = (struct admin_list *)instance;
+       void                    *temp;
+       struct admin_message    msg;
+       int                     len;
+       struct Endpoint         *epoint;
+
+       if ((what & LCR_FD_READ)) {
                /* read command */
                len = read(admin->sock, &msg, sizeof(msg));
                if (len < 0) {
-                       if (errno != EWOULDBLOCK) {
-                               work = 1;
-                               brokenpipe:
-                               PDEBUG(DEBUG_LOG, "Broken pipe on socket %d. (errno=%d).\n", admin->sock, errno);
-                               *adminp = admin->next;
-                               free_connection(admin);
-                               admin = *adminp;
-                               continue;
-                       }
-                       goto send_data;
+                       brokenpipe:
+                       PDEBUG(DEBUG_LOG, "Broken pipe on socket %d. (errno=%d).\n", admin->sock, errno);
+                       free_connection(admin);
+                       return 0;
                }
-               work = 1;
-//#warning
-//PERROR("DEBUG socket %d got data. serial=%d\n", admin->sock, admin->sockserial);
                if (len == 0) {
                        end:
 
@@ -1134,32 +1248,23 @@ int admin_handle(void)
                                epoint = find_epoint_id(admin->epointid);
                                if (epoint) {
                                        ((class DEFAULT_ENDPOINT_APP *)epoint->ep_app)->
-                                               release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL);
+                                               release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0);
                                }
                        }
 
-//#warning
-//PERROR("DEBUG socket %d closed by remote.\n", admin->sock);
-                       *adminp = admin->next;
                        free_connection(admin);
-                       admin = *adminp;
-//PERROR("DEBUG (admin_first=%x)\n", admin_first);
-                       continue;
+                       return 0;
                }
                if (len != sizeof(msg)) {
                        PERROR("Short/long read on socket %d. (len=%d != size=%d).\n", admin->sock, len, sizeof(msg));
-                       *adminp = admin->next;
                        free_connection(admin);
-                       admin = *adminp;
-                       continue;
+                       return 0;
                }
                /* process socket command */
                if (admin->response && msg.message != ADMIN_MESSAGE) {
                        PERROR("Data from socket %d while sending response.\n", admin->sock);
-                       *adminp = admin->next;
                        free_connection(admin);
-                       admin = *adminp;
-                       continue;
+                       return 0;
                }
                switch (msg.message) {
                        case ADMIN_REQUEST_CMD_INTERFACE:
@@ -1167,6 +1272,7 @@ int admin_handle(void)
                                PERROR("Failed to create dial response for socket %d.\n", admin->sock);
                                goto response_error;
                        }
+                       admin->fd.when |= LCR_FD_WRITE;
                        break;
 
                        case ADMIN_REQUEST_CMD_ROUTE:
@@ -1174,6 +1280,7 @@ int admin_handle(void)
                                PERROR("Failed to create dial response for socket %d.\n", admin->sock);
                                goto response_error;
                        }
+                       admin->fd.when |= LCR_FD_WRITE;
                        break;
 
                        case ADMIN_REQUEST_CMD_DIAL:
@@ -1181,6 +1288,7 @@ int admin_handle(void)
                                PERROR("Failed to create dial response for socket %d.\n", admin->sock);
                                goto response_error;
                        }
+                       admin->fd.when |= LCR_FD_WRITE;
                        break;
 
                        case ADMIN_REQUEST_CMD_RELEASE:
@@ -1188,6 +1296,7 @@ int admin_handle(void)
                                PERROR("Failed to create release response for socket %d.\n", admin->sock);
                                goto response_error;
                        }
+                       admin->fd.when |= LCR_FD_WRITE;
                        break;
 
                        case ADMIN_REQUEST_STATE:
@@ -1195,6 +1304,7 @@ int admin_handle(void)
                                PERROR("Failed to create state response for socket %d.\n", admin->sock);
                                goto response_error;
                        }
+                       admin->fd.when |= LCR_FD_WRITE;
                        break;
 
                        case ADMIN_TRACE_REQUEST:
@@ -1202,6 +1312,7 @@ int admin_handle(void)
                                PERROR("Failed to create trace response for socket %d.\n", admin->sock);
                                goto response_error;
                        }
+                       admin->fd.when |= LCR_FD_WRITE;
                        break;
 
                        case ADMIN_REQUEST_CMD_BLOCK:
@@ -1209,78 +1320,75 @@ int admin_handle(void)
                                PERROR("Failed to create block response for socket %d.\n", admin->sock);
                                goto response_error;
                        }
+                       admin->fd.when |= LCR_FD_WRITE;
                        break;
 
                        case ADMIN_MESSAGE:
-                       if (admin_message_to_join(&msg.u.msg, admin) < 0) {
+                       if (admin_message_to_lcr(&msg.u.msg, admin) < 0) {
                                PERROR("Failed to deliver message for socket %d.\n", admin->sock);
                                goto response_error;
                        }
-#if 0
-#warning DEBUGGING
-{
-       struct admin_queue      *response;
-       printf("Chain: ");
-       response = admin->response;
-       while(response) {
-               printf("%c", '0'+response->am[0].message);
-               response=response->next;
-       }
-       printf("\n");
-}
-#endif
                        break;
 
                        case ADMIN_CALL_SETUP:
                        if (admin_call(admin, &msg) < 0) {
                                PERROR("Failed to create call for socket %d.\n", admin->sock);
                                response_error:
-                               *adminp = admin->next;
                                free_connection(admin);
-                               admin = *adminp;
-                               continue;
+                               return 0;
                        }
                        break;
 
                        default:
                        PERROR("Invalid message %d from socket %d.\n", msg.message, admin->sock);
-                       *adminp = admin->next;
                        free_connection(admin);
-                       admin = *adminp;
-                       continue;
+                       return 0;
                }
+       }
+
+       if ((what & LCR_FD_WRITE)) {
                /* write queue */
-               send_data:
                if (admin->response) {
-//#warning
-//PERROR("DEBUG socket %d sending data.\n", admin->sock);
                        len = write(admin->sock, ((unsigned char *)(admin->response->am))+admin->response->offset, sizeof(struct admin_message)*(admin->response->num)-admin->response->offset);
                        if (len < 0) {
-                               if (errno != EWOULDBLOCK) {
-                                       work = 1;
-                                       goto brokenpipe;
-                               }
-                               goto next;
+                               goto brokenpipe;
                        }
-                       work = 1;
                        if (len == 0)
                                goto end;
                        if (len < (int)(sizeof(struct admin_message)*(admin->response->num) - admin->response->offset)) {
                                admin->response->offset+=len;
-                               goto next;
+                               return 0;
                        } else {
                                temp = admin->response;
                                admin->response = admin->response->next;
                                FREE(temp, 0);
                                memuse--;
                        }
-               }
-               /* done with socket instance */
-               next:
-               adminp = &admin->next;
-               admin = admin->next;
+               } else
+                       admin->fd.when &= ~LCR_FD_WRITE;
        }
 
-       return(work);
+       return 0;
+}
+
+void message_bchannel_to_remote(unsigned int remote_id, unsigned int ref, int type, unsigned int handle, int tx_gain, int rx_gain, char *pipeline, unsigned char *crypt, int crypt_len, int crypt_type, int isloopback)
+{
+       union parameter param;
+
+       memset(&param, 0, sizeof(union parameter));
+       param.bchannel.isloopback = isloopback;
+       param.bchannel.type = type;
+       param.bchannel.handle = handle;
+       param.bchannel.tx_gain = tx_gain;
+       param.bchannel.rx_gain = rx_gain;
+       if (pipeline)
+               SCPY(param.bchannel.pipeline, pipeline);
+       if (crypt_len)
+               memcpy(param.bchannel.crypt, crypt, crypt_len);
+       param.bchannel.crypt_type = crypt_type;
+       if (admin_message_from_lcr(remote_id, ref, MESSAGE_BCHANNEL, &param)<0) {
+               PERROR("No socket with remote id %d found, this happens, if the socket is closed before all bchannels are imported.\n", remote_id);
+               return;         
+       }
 }