--- libaitrpc/src/srv.c 2012/11/16 10:20:55 1.12.2.3 +++ libaitrpc/src/srv.c 2012/11/16 13:30:05 1.12.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.12.2.3 2012/11/16 10:20:55 misho Exp $ +* $Id: srv.c,v 1.12.2.4 2012/11/16 13:30:05 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -66,33 +66,53 @@ static sched_task_func_t cbProto[SOCK_RAW + 1][4] = { }; -static rpc_cli_t * -_allocClient(rpc_srv_t * __restrict srv) +static inline int +_check4freeslot(rpc_srv_t * __restrict srv, io_sockaddr_t * __restrict sa) { 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! */ + (c = io_array(srv->srv_clients, i, rpc_cli_t*)); i++) + /* check for duplicates */ + if (sa && !io_addrcmp(&c->cli_sa, sa, 42)) + break; + if (i >= io_arraySize(srv->srv_clients)) + return -1; /* no more free slots! */ + + return i; +} + +static rpc_cli_t * +_allocClient(rpc_srv_t * __restrict srv, io_sockaddr_t * __restrict sa) +{ + rpc_cli_t *c = NULL; + int n; + + n = _check4freeslot(srv, sa); + if (n == -1) return NULL; + else + c = io_array(srv->srv_clients, n, rpc_cli_t*); - 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; + 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, n, c); + c->cli_id = n; + c->cli_parent = srv; + } + + /* alloc empty buffer */ + AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf); } - /* alloc empty buffer */ - AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf); - return c; } @@ -103,24 +123,73 @@ connectClients(sched_task_t *task) rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; socklen_t salen = sizeof(io_sockaddr_t); + int len, rlen; + u_short crc; + u_char buf[USHRT_MAX + 1]; + struct tagRPCCall *rpc = (struct tagRPCCall*) buf; + io_sockaddr_t sa; +#if 0 c = _allocClient(srv); - if (!c) + if (!c) { + schedReadSelf(task); + return NULL; + } else + buf = AIT_GET_BUF(&c->cli_buf); +#endif + + /* receive connect packet */ + rlen = recvfrom(TASK_FD(task), buf, sizeof buf, 0, &sa.sa, &salen); + if (rlen < 1) 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); + /* check RPC packet */ + if (rlen < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); goto end; - } else - fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); + } else { + len = ntohs(rpc->call_len); + rlen -= len; + } + /* check RPC packet lengths */ + if (rlen < 0 || len < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Broken RPC packet length"); + goto end; + } - schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, - c->cli_sock, NULL, 0); + /* check integrity of packet */ + crc = ntohs(rpc->call_crc); + rpc->call_crc ^= rpc->call_crc; + if (crc != crcFletcher16((u_short*) rpc, len / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); + goto end; + } + + /* check RPC packet session info */ + if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) { + rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); + goto end; + } + + /* RPC packet is OK */ + + c = _allocClient(srv, &sa); + if (!c) + goto end; + + if (0) { + schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, + c->cli_sock, NULL, 0); + schedReadSelf(task); + return NULL; + } + end: +#if 0 + /* close connection & dont send disconnect */ + schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], + c, 42, NULL, 42); +#endif schedReadSelf(task); return NULL; } @@ -133,6 +202,10 @@ disconnectClient(sched_task_t *task) schedCancelby(TASK_ROOT(task), taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL); + if (!TASK_DATLEN(task)) { + /* TODO: send disconnect packet */ + } + /* free buffer */ AIT_FREE_VAL(&c->cli_buf); @@ -361,7 +434,7 @@ acceptClients(sched_task_t *task) rpc_cli_t *c = NULL; socklen_t salen = sizeof(io_sockaddr_t); - c = _allocClient(srv); + c = _allocClient(srv, NULL); if (!c) goto end; @@ -657,8 +730,11 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s close(srv->srv_blob.server.cli_sock); AIT_FREE_VAL(&srv->srv_blob.dir); return -1; - } + } else + fcntl(srv->srv_blob.server.cli_sock, F_SETFL, + fcntl(srv->srv_blob.server.cli_sock, F_GETFL) | O_NONBLOCK); + /* allocate pool for concurent blob clients */ srv->srv_blob.clients = io_arrayInit(io_arraySize(srv->srv_clients)); if (!srv->srv_blob.clients) { @@ -715,9 +791,6 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) return -1; } - fcntl(srv->srv_blob.server.cli_sock, F_SETFL, - fcntl(srv->srv_blob.server.cli_sock, F_GETFL) | O_NONBLOCK); - if (listen(srv->srv_blob.server.cli_sock, io_arraySize(srv->srv_blob.clients)) == -1) { LOGERR; return -1; @@ -873,7 +946,9 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, srv->srv_server.cli_sa.sa.sa_len) == -1) { LOGERR; goto err; - } + } else + fcntl(srv->srv_server.cli_sock, F_SETFL, + fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK); rpc_register_srvPing(srv); @@ -933,9 +1008,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) if (listen(srv->srv_server.cli_sock, io_arraySize(srv->srv_clients)) == -1) { LOGERR; return -1; - } else - fcntl(srv->srv_server.cli_sock, F_SETFL, - fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK); + } if (!schedRead(srv->srv_root, cbProto[srv->srv_proto][CB_ACCEPTCLIENT], srv, srv->srv_server.cli_sock, NULL, 0)) {