#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];
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);
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);
}
/*
* free connection
- * also releases all remote joins
*/
void free_connection(struct admin_list *admin)
{
struct admin_queue *response;
void *temp;
union parameter param;
- class Join *join, *joinnext;
- struct mISDNport *mISDNport;
- int i, ii;
+ class Port *port, *portnext;
+ class Premote *remote;
+ struct admin_list **adminp;
- /* free remote joins */
+ /* free remote ports */
if (admin->remote_name[0]) {
start_trace(-1,
NULL,
"REMOTE APP release");
add_trace("app", "name", "%s", admin->remote_name);
end_trace();
- /* release all exported channels */
- mISDNport = mISDNport_first;
- while(mISDNport) {
- i = 0;
- ii = mISDNport->b_num;
- while(i < ii) {
- if (mISDNport->b_remote_id[i] == admin->sock) {
- mISDNport->b_state[i] = B_STATE_IDLE;
- mISDNport->b_timer[i] = 0;
- mISDNport->b_remote_id[i] = 0;
- mISDNport->b_remote_ref[i] = 0;
+ /* 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_r_remote_id == admin->sock) {
+ memset(¶m, 0, sizeof(param));
+ param.disconnectinfo.cause = CAUSE_OUTOFORDER;
+ param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+ remote->message_remote(MESSAGE_RELEASE, ¶m);
+ /* port is now destroyed, so we go to next join */
}
- i++;
- }
- mISDNport = mISDNport->next;
- }
- /* release join */
- join = join_first;
- while(join) {
- joinnext = join->next;
- if (join->j_type==JOIN_TYPE_REMOTE) if (((class JoinRemote *)join)->j_remote_id == admin->sock) {
- memset(¶m, 0, sizeof(param));
- param.disconnectinfo.cause = CAUSE_OUTOFORDER;
- param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
- ((class JoinRemote *)join)->message_remote(MESSAGE_RELEASE, ¶m);
- /* join is now destroyed, so we go to next join */
}
- join = joinnext;
+ 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--;
}
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--;
}
/* attach to response chain */
*responsep = response;
responsep = &response->next;
-
return(0);
}
case ACTION_EXTERNAL:
apppbx->e_action = &action_external;
break;
- case ACTION_REMOTE:
- apppbx->e_action = &action_remote;
- break;
case ACTION_VBOX_RECORD:
apppbx->e_action = &action_vbox;
break;
}
} 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),
end_trace();
}
- apppbx->e_action_timeout = 0;
+ unsched_timer(&apppbx->e_action_timeout);
apppbx->e_rule = NULL;
apppbx->e_ruleset = NULL;
/* attach to response chain */
*responsep = response;
responsep = &response->next;
-
return(0);
}
goto out;
}
+#ifdef WITH_MISDN
/* no interface */
if (!ifport->mISDNport) {
/* not loaded anyway */
/* try loading interface */
ifport->block = block;
- load_port(ifport);
+ load_mISDN_port(ifport);
/* port cannot load */
if (ifport->block >= 2) {
ifport->block = 2;
goto out;
}
+#endif
/* port new blocking state */
ifport->block = response->am[0].u.x.block = block;
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 */
if (!(epoint = new Endpoint(0, 0)))
FATAL("No memory for Endpoint instance\n");
- if (!(epoint->ep_app = apppbx = new DEFAULT_ENDPOINT_APP(epoint, 1))) // outgoing
+ if (!(epoint->ep_app = apppbx = new EndpointAppPBX(epoint, 1))) // outgoing
FATAL("No memory for Endpoint Application instance\n");
apppbx->e_adminid = admin->sockserial;
admin->epointid = epoint->ep_serial;
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;
apppbx->e_dialinginfo.sending_complete = 1;
apppbx->new_state(PORT_STATE_OUT_SETUP);
- apppbx->out_setup();
+ apppbx->out_setup(0);
return(0);
}
/*
* 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 */
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)
{
- class Join *join;
+ class Port *port;
+ class Premote *remote = NULL; /* make GCC happy */
+ struct interface *interface;
struct admin_list *temp;
/* hello message */
return(-1);
}
- /* new join */
+ /* new remote instance. 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);
+ char name[32];
+ /* find remote port */
+ interface = interface_first;
+ while(interface) {
+ /* interface must match the remote application */
+ if (interface->remote && !strcmp(interface->remote_app, admin->remote_name)) {
+ /* interface must match the name, if given */
+ if (!msg->param.newref.interface[0] || !strcmp(msg->param.newref.interface, interface->name))
+ break;
+ }
+ interface = interface->next;
}
- return(0);
- }
+ if (!interface) {
+ union parameter param;
+ unsigned int ref = new_remote++;
+
+ start_trace(-1,
+ NULL,
+ NULL,
+ NULL,
+ DIRECTION_NONE,
+ 0,
+ 0,
+ "REMOTE APP illegal interface");
+ add_trace("app", "name", "%s", admin->remote_name);
+ add_trace("interface", "name", "%s", msg->param.newref.interface);
+ end_trace();
+ memset(¶m, 0, sizeof(union parameter));
+ param.newref.direction = 0;
+ admin_message_from_lcr(admin->sock, ref, MESSAGE_NEWREF, ¶m);
+ memset(¶m, 0, sizeof(union parameter));
+ param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+ param.disconnectinfo.cause = CAUSE_RESSOURCEUNAVAIL;
+ admin_message_from_lcr(admin->sock, ref, MESSAGE_RELEASE, ¶m);
+ return 0;
+ }
+ /* creating port object, transparent until setup with hdlc */
+ SPRINT(name, "%s-%s-in", interface->name, interface->remote_app);
+ if (!(remote = new Premote(PORT_TYPE_REMOTE_IN, name, NULL, interface, admin->sock)))
- /* bchannel message
- * no ref given for *_ack */
- if (msg->type == MESSAGE_BCHANNEL)
- if (msg->param.bchannel.type == BCHANNEL_ASSIGN_ACK
- || msg->param.bchannel.type == BCHANNEL_REMOVE_ACK
- || msg->param.bchannel.type == BCHANNEL_RELEASE) {
- /* no ref, but address */
- message_bchannel_from_remote(NULL, msg->param.bchannel.type, msg->param.bchannel.handle);
+ FATAL("Cannot create Port instance.\n");
return(0);
}
-
+
/* check for ref */
if (!msg->ref) {
PERROR("Remote application did not send us a valid ref with a message.\n");
return(-1);
}
- /* find join instance */
- join = join_first;
- while(join) {
- if (join->j_serial == 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);
- return(0);
+ /* 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_r_ref == msg->ref)
+ break;
+ }
+ port = port->next;
}
+ if (port) {
+ if (admin->sock != remote->p_r_remote_id) {
+ PERROR("Ref %d belongs to remote application %s, but not to sending application %s.\n", msg->ref, remote->p_r_remote_app, admin->remote_name);
+ return(-1);
+ }
- /* 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);
- }
+ /* send message */
+ remote->message_remote(msg->type, &msg->param);
- /* send message */
- ((class JoinRemote *)join)->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 */
(*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);
}
*/
int admin_state(struct admin_queue **responsep)
{
-
class Port *port;
class EndpointAppPBX *apppbx;
class Join *join;
+#ifdef WITH_MISDN
class Pdss1 *pdss1;
+ struct mISDNport *mISDNport;
+ struct select_channel *selchannel;
+#endif
struct interface *interface;
struct interface_port *ifport;
- struct mISDNport *mISDNport;
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));
/* 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);
interface = interface_first;
while(interface) {
ifport = interface->ifport;
+ if (!ifport)
+ i++;
while(ifport) {
i++;
ifport = ifport->next;
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;
response->am[num].u.i.extension = interface->extension;
/* block */
response->am[num].u.i.block = ifport->block;
+#ifdef WITH_MISDN
if (ifport->mISDNport) {
mISDNport = ifport->mISDNport;
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) {
response->am[num].u.i.busy[i] = mISDNport->b_state[i];
if (mISDNport->b_port[i])
i++;
}
}
+#endif
num++;
ifport = ifport->next;
/* serial */
response->am[num].u.j.serial = join->j_serial;
/* partyline */
- if (join->j_type == JOIN_TYPE_PBX)
+ if (join->j_type == JOIN_TYPE_PBX) {
response->am[num].u.j.partyline = ((class JoinPBX *)join)->j_partyline;
- /* remote application */
- if (join->j_type == JOIN_TYPE_REMOTE)
- SCPY(response->am[num].u.j.remote, ((class JoinRemote *)join)->j_remote_name);
+ response->am[num].u.j.threepty = ((class JoinPBX *)join)->j_3pty;
+ }
/* */
join = join->next;
num++;
if (apppbx->ea_endpoint->ep_park && apppbx->ea_endpoint->ep_park_len && apppbx->ea_endpoint->ep_park_len<=(int)sizeof(response->am[num].u.e.park_callid))
memcpy(response->am[num].u.e.park_callid, apppbx->ea_endpoint->ep_park_callid, apppbx->ea_endpoint->ep_park_len);
response->am[num].u.e.park_len = apppbx->ea_endpoint->ep_park_len;
+#ifdef WITH_CRYPT
/* crypt */
if (apppbx->e_crypt == CRYPT_ON)
response->am[num].u.e.crypt = 1;
+#endif
/* */
apppbx = apppbx->next;
num++;
default:
response->am[num].u.p.state = ADMIN_STATE_IDLE;
}
+#ifdef WITH_MISDN
/* 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;
response->am[num].u.p.isdn_hold = pdss1->p_m_hold;
response->am[num].u.p.isdn_ces = pdss1->p_m_d_ces;
}
+#endif
/* */
port = port->next;
num++;
/*
* 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;
- }
- work = 1;
-//#warning
-//PERROR("DEBUG socket %d got data. serial=%d\n", admin->sock, admin->sockserial);
- if (len == 0) {
+ brokenpipe:
+ PDEBUG(DEBUG_LOG, "Broken pipe on socket %d. (errno=%d).\n", admin->sock, errno);
end:
-
/*release endpoint if exists */
if (admin->epointid) {
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);
+ if (epoint && epoint->ep_app_type == EAPP_TYPE_PBX) {
+ ((class EndpointAppPBX *)epoint->ep_app)->
+ 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 == 0)
+ goto end;
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;
+ goto end;
}
/* 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;
+ goto end;
}
switch (msg.message) {
case ADMIN_REQUEST_CMD_INTERFACE:
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:
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:
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:
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:
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:
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:
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;
+ goto end;
}
break;
default:
PERROR("Invalid message %d from socket %d.\n", msg.message, admin->sock);
- *adminp = admin->next;
- free_connection(admin);
- admin = *adminp;
- continue;
+ goto end;
}
+ }
+
+ 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;
}
projects / lcr.git / blobdiff