--- libaitrpc/src/srv.c 2012/11/13 09:22:10 1.12 +++ libaitrpc/src/srv.c 2012/11/16 10:20:55 1.12.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.12 2012/11/13 09:22:10 misho Exp $ +* $Id: srv.c,v 1.12.2.3 2012/11/16 10:20:55 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -46,7 +46,103 @@ SUCH DAMAGE. #include "global.h" +/* SOCK_STREAM */ +static void *acceptClients(sched_task_t *); +static void *closeClient(sched_task_t *); +static void *rxPacket(sched_task_t *); +static void *txPacket(sched_task_t *); + +/* SOCK_DGRAM */ +static void *connectClients(sched_task_t *); +static void *disconnectClient(sched_task_t *); + +/* SOCK_RAW */ + +static sched_task_func_t cbProto[SOCK_RAW + 1][4] = { + { acceptClients, closeClient, rxPacket, txPacket }, /* SOCK_STREAM */ + { acceptClients, closeClient, rxPacket, txPacket }, /* SOCK_STREAM */ + { connectClients, disconnectClient, NULL, NULL }, + { NULL, NULL, NULL, NULL } /* SOCK_RAW */ +}; + + +static rpc_cli_t * +_allocClient(rpc_srv_t * __restrict srv) +{ + rpc_cli_t *c = NULL; + register int i; + + /* check free slots for connect */ + for (i = 0; i < io_arraySize(srv->srv_clients) && + (c = io_array(srv->srv_clients, i, rpc_cli_t*)); i++); + if (c) /* no more free slots! */ + return NULL; + + c = io_malloc(sizeof(rpc_cli_t)); + if (!c) { + LOGERR; + srv->srv_kill = 1; + return NULL; + } else { + memset(c, 0, sizeof(rpc_cli_t)); + io_arraySet(srv->srv_clients, i, c); + c->cli_id = i; + c->cli_parent = srv; + } + + /* alloc empty buffer */ + AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf); + + return c; +} + + static void * +connectClients(sched_task_t *task) +{ + rpc_srv_t *srv = TASK_ARG(task); + rpc_cli_t *c = NULL; + socklen_t salen = sizeof(io_sockaddr_t); + + c = _allocClient(srv); + if (!c) + goto end; + + /* accept client */ + c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); + if (c->cli_sock == -1) { + LOGERR; + AIT_FREE_VAL(&c->cli_buf); + io_arrayDel(srv->srv_clients, c->cli_id, 42); + goto end; + } else + fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); + + schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, + c->cli_sock, NULL, 0); +end: + schedReadSelf(task); + return NULL; +} + +static void * +disconnectClient(sched_task_t *task) +{ + rpc_cli_t *c = TASK_ARG(task); + rpc_srv_t *s = c->cli_parent; + + schedCancelby(TASK_ROOT(task), taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL); + + /* free buffer */ + AIT_FREE_VAL(&c->cli_buf); + + io_arrayDel(s->srv_clients, c->cli_id, 0); + if (c) + io_free(c); + return NULL; +} + +static void * closeClient(sched_task_t *task) { rpc_cli_t *c = TASK_ARG(task); @@ -114,7 +210,8 @@ txPacket(sched_task_t *task) ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); if (ret == -1 || ret != wlen) { /* close connection */ - schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0); + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + c, 42, NULL, 0); } return NULL; @@ -187,12 +284,11 @@ rxPacket(sched_task_t *task) if (!off) memset(buf, 0, AIT_LEN(&c->cli_buf)); - else - memmove(buf, buf + off, AIT_LEN(&c->cli_buf) - off); rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 0); if (rlen < 1) { /* close connection */ - schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0); + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + c, 42, NULL, 0); return NULL; } else { rlen += off; /* add reminded bytes from previous rxPacket, if exists! */ @@ -247,7 +343,8 @@ rxPacket(sched_task_t *task) /* send RPC reply */ if (!noreply) - schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task), rpc, len); + schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], + TASK_ARG(task), TASK_FD(task), rpc, len); off += len; } while (rlen > 0); @@ -262,40 +359,24 @@ acceptClients(sched_task_t *task) { rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; - register int i; socklen_t salen = sizeof(io_sockaddr_t); - /* check free slots for connect */ - for (i = 0; i < io_arraySize(srv->srv_clients) && - (c = io_array(srv->srv_clients, i, rpc_cli_t*)); i++); - if (c) /* no more free slots! */ + c = _allocClient(srv); + if (!c) goto end; - c = io_malloc(sizeof(rpc_cli_t)); - if (!c) { - LOGERR; - srv->srv_kill = 1; - return NULL; - } else { - memset(c, 0, sizeof(rpc_cli_t)); - io_arraySet(srv->srv_clients, i, c); - c->cli_id = i; - c->cli_parent = srv; - } - /* alloc empty buffer */ - AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf); - /* accept client */ c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); if (c->cli_sock == -1) { LOGERR; AIT_FREE_VAL(&c->cli_buf); - io_arrayDel(srv->srv_clients, i, 42); + io_arrayDel(srv->srv_clients, c->cli_id, 42); goto end; } else fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); - schedRead(TASK_ROOT(task), rxPacket, c, c->cli_sock, NULL, 0); + schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, + c->cli_sock, NULL, 0); end: schedReadSelf(task); return NULL; @@ -691,20 +772,23 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) * @csHost = Host name or address for bind server, if NULL any address * @Port = Port for bind server, if Port == 0 default port is selected + * @proto = Protocol, if == 0 choose SOCK_STREAM * return: NULL == error or !=NULL bind and created RPC server instance */ rpc_srv_t * rpc_srv_initServer(u_int regProgID, u_char regProcID, int concurentClients, - int netBuf, const char *csHost, u_short Port) + int netBuf, const char *csHost, u_short Port, int proto) { int n = 1; rpc_srv_t *srv = NULL; io_sockaddr_t sa = IO_SOCKADDR_INIT; - if (!concurentClients || !regProgID) { + if (!concurentClients || !regProgID || (proto < 0 || proto > SOCK_DGRAM)) { rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); return NULL; } + if (!proto) + proto = SOCK_STREAM; if (!io_gethostbyname(csHost, Port, &sa)) return NULL; if (!Port) @@ -729,6 +813,7 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, } else memset(srv, 0, sizeof(rpc_srv_t)); + srv->srv_proto = proto; srv->srv_netbuf = netBuf; srv->srv_session.sess_version = RPC_VERSION; srv->srv_session.sess_program = regProgID; @@ -762,7 +847,7 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, } /* create server socket */ - srv->srv_server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0); + srv->srv_server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, srv->srv_proto, 0); if (srv->srv_server.cli_sock == -1) { LOGERR; io_arrayDestroy(&srv->srv_clients); @@ -852,7 +937,8 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) fcntl(srv->srv_server.cli_sock, F_SETFL, fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK); - if (!schedRead(srv->srv_root, acceptClients, srv, srv->srv_server.cli_sock, NULL, 0)) { + if (!schedRead(srv->srv_root, cbProto[srv->srv_proto][CB_ACCEPTCLIENT], srv, + srv->srv_server.cli_sock, NULL, 0)) { rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); return -1; }