--- libaitrpc/src/srv.c 2013/08/21 09:42:12 1.17.4.3 +++ libaitrpc/src/srv.c 2013/11/14 21:44:14 1.21 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.17.4.3 2013/08/21 09:42:12 misho Exp $ +* $Id: srv.c,v 1.21 2013/11/14 21:44:14 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -67,30 +67,6 @@ static sched_task_func_t cbProto[SOCK_RAW + 1][4] = { }; -static inline u_char * -getBuffer(rpc_cli_t * __restrict c) -{ - u_char *b = NULL; - - assert(c); - - if (RPC_ISNEXTBUF(c)) - b = AIT_GET_BUF(array(c->cli_buf, 1, ait_val_t*)); - else - b = AIT_GET_BUF(array(c->cli_buf, 0, ait_val_t*)) + - sizeof(struct tagRPCCall); - - return b; -} - -static inline struct tagRPCCall * -getHeader(rpc_cli_t * __restrict c) -{ - assert(c); - - return (struct tagRPCCall*) AIT_GET_BUF(array(c->cli_buf, 0, ait_val_t*)); -} - void rpc_freeCli(rpc_cli_t * __restrict c) { @@ -98,8 +74,8 @@ rpc_freeCli(rpc_cli_t * __restrict c) schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL); - /* free buffer(s) */ - ait_freeVars(&c->cli_buf); + /* free buffer */ + AIT_FREE_VAL(&c->cli_buf); array_Del(s->srv_clients, c->cli_id, 0); if (c) @@ -150,14 +126,8 @@ _allocClient(rpc_srv_t * __restrict srv, sockaddr_t * c->cli_parent = srv; } - /* init buffer(s) */ - c->cli_buf = ait_allocVars(1); - if (!c->cli_buf) { - rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); - array_Del(srv->srv_clients, n, 42); - return NULL; - } else - AIT_SET_BUFSIZ(array(c->cli_buf, 0, ait_val_t*), 0, srv->srv_netbuf); + /* alloc empty buffer */ + AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf); } return c; @@ -191,28 +161,43 @@ txPacket(sched_task_t *task) rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; rpc_func_t *f = NULL; - u_char buf[USHRT_MAX] = { 0 }; + u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc = (struct tagRPCCall*) buf; - int ret, wlen = sizeof(struct tagRPCCall); + int ret, estlen, wlen = sizeof(struct tagRPCCall); + struct pollfd pfd; +#ifdef TCP_SESSION_TIMEOUT + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - /* copy RPC header */ - memcpy(buf, TASK_DATA(task), wlen); + schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); + schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), ts, TASK_ARG(task), 0); +#endif if (rpc->call_argc) { f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); if (!f) { rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server"); + rpc->call_argc ^= rpc->call_argc; rpc->call_rep.ret = RPC_ERROR(-1); rpc->call_rep.eno = RPC_ERROR(rpc_Errno); } else { + /* calc estimated length */ + estlen = ait_resideVars(RPC_RETVARS(c)) + wlen; + if (estlen > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, estlen); + buf = AIT_GET_BUF(&c->cli_buf); + rpc = (struct tagRPCCall*) buf; + rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); /* Go Encapsulate variables */ - ret = ait_vars2buffer(buf + wlen, sizeof buf - wlen, RPC_RETVARS(c)); + ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, + RPC_RETVARS(c)); /* Free return values */ ait_freeVars(&c->cli_vars); if (ret == -1) { rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); + rpc->call_argc ^= rpc->call_argc; rpc->call_rep.ret = RPC_ERROR(-1); rpc->call_rep.eno = RPC_ERROR(rpc_Errno); @@ -221,7 +206,7 @@ txPacket(sched_task_t *task) } } - rpc->call_len = htons(wlen); + rpc->call_len = htonl(wlen); #if 0 /* calculate CRC */ @@ -230,11 +215,27 @@ txPacket(sched_task_t *task) #endif /* send reply */ - ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); - if (ret == -1 || ret != wlen) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); + pfd.fd = TASK_FD(task); + pfd.events = POLLOUT; + for (; wlen > 0; wlen -= ret, buf += ret) { + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (ret) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; + } + ret = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL); + if (ret == -1) { + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; + } } return NULL; @@ -247,13 +248,14 @@ execCall(sched_task_t *task) rpc_srv_t *s = c->cli_parent; rpc_func_t *f = NULL; array_t *arr = NULL; - u_char *buf = getBuffer(c); - struct tagRPCCall *rpc = getHeader(c); + u_char *buf = AIT_GET_BUF(&c->cli_buf); + struct tagRPCCall *rpc = (struct tagRPCCall*) buf; int argc = ntohs(rpc->call_argc); /* Go decapsulate variables ... */ if (argc) { - arr = ait_buffer2vars(buf, ntohl(rpc->call_len), argc, 42); + arr = ait_buffer2vars(buf + sizeof(struct tagRPCCall), + AIT_LEN(&c->cli_buf) - sizeof(struct tagRPCCall), argc, 42); if (!arr) { rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError()); @@ -276,7 +278,10 @@ execCall(sched_task_t *task) argc = RPC_CHK_NOREPLY(rpc); rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(c, rpc, f->func_name, arr)); if (rpc->call_rep.ret == htonl(-1)) { - rpc->call_rep.eno = RPC_ERROR(errno); + if (!rpc->call_rep.eno) { + LOGERR; + rpc->call_rep.eno = RPC_ERROR(rpc_Errno); + } rpc->call_argc ^= rpc->call_argc; } else { rpc->call_rep.eno ^= rpc->call_rep.eno; @@ -300,56 +305,70 @@ rxPacket(sched_task_t *task) { rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; - int len, rlen, noreply; - ait_val_t *bufz = array(c->cli_buf, 0, ait_val_t*); - u_char *buf = (u_char*) AIT_GET_BUF(bufz); + int len, rlen, noreply, estlen; +#if 0 + u_short crc; +#endif + u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc = (struct tagRPCCall*) buf; + struct pollfd pfd; +#ifdef TCP_SESSION_TIMEOUT + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - memset(buf, 0, AIT_LEN(bufz)); - /* 1st buffer is last */ - RPC_CLR_NEXTBUF(c); + schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); + schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), ts, TASK_ARG(task), 0); +#endif - /* read rpc header */ - rlen = recv(TASK_FD(task), rpc, MIN(sizeof(struct tagRPCCall), AIT_LEN(bufz)), 0); - if (rlen < 1) { + memset(buf, 0, sizeof(struct tagRPCCall)); + rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), MSG_PEEK); + if (rlen < sizeof(struct tagRPCCall)) { /* close connection */ schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], TASK_ARG(task), 0, NULL, 0); return NULL; - } else if (rlen < sizeof(struct tagRPCCall) || - ntohl(rpc->call_len) < sizeof(struct tagRPCCall)) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; } else { - buf += sizeof(struct tagRPCCall); - len = ntohl(rpc->call_len); + estlen = ntohl(rpc->call_len); + if (estlen > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, estlen); + rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); + buf = AIT_GET_BUF(&c->cli_buf); + len = estlen; } - if (len > (AIT_LEN(bufz) - sizeof(struct tagRPCCall))) { - /* add extra buffer */ - if (!(bufz = ait_getVars(&c->cli_buf, 1))) { + /* get next part of packet */ + memset(buf, 0, len); + pfd.fd = TASK_FD(task); + pfd.events = POLLIN | POLLPRI; + for (; len > 0; len -= rlen, buf += rlen) { + if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (rlen) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; + } + rlen = recv(TASK_FD(task), buf, len, 0); + if (rlen == -1) { /* close connection */ schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], TASK_ARG(task), 0, NULL, 0); return NULL; - } else { - AIT_SET_BUFSIZ(bufz, 0, len); - buf = AIT_GET_BUF(bufz); } - /* buffer isnt last */ - RPC_SET_NEXTBUF(c); } - /* read payload */ - rlen = recv(TASK_FD(task), buf, len, 0); - if (rlen < len) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); +#if 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"); return NULL; } +#endif noreply = RPC_CHK_NOREPLY(rpc); @@ -362,7 +381,7 @@ rxPacket(sched_task_t *task) rpc->call_rep.eno = RPC_ERROR(errno); } else { /* execute RPC call */ - schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), noreply, rpc, len); + schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), (int) noreply, rpc, len); } /* send RPC reply */ @@ -381,21 +400,37 @@ acceptClients(sched_task_t *task) rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; socklen_t salen = sizeof(sockaddr_t); + int sock; +#ifdef TCP_SESSION_TIMEOUT + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; +#endif c = _allocClient(srv, NULL); - if (!c) + if (!c) { + EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); + if ((sock = accept(TASK_FD(task), NULL, NULL)) != -1) { + shutdown(sock, SHUT_RDWR); + close(sock); + } goto end; + } /* accept client */ c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); if (c->cli_sock == -1) { LOGERR; - ait_freeVars(&c->cli_buf); + AIT_FREE_VAL(&c->cli_buf); array_Del(srv->srv_clients, c->cli_id, 42); goto end; } else fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); +#ifdef TCP_SESSION_TIMEOUT + /* armed timer for close stateless connection */ + schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL); + schedTimer(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], c, + ts, c, 0); +#endif schedRead(TASK_ROOT(task), cbProto[srv->srv_proto][CB_RXPACKET], c, c->cli_sock, NULL, 0); end: @@ -410,7 +445,7 @@ txUDPPacket(sched_task_t *task) rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; rpc_func_t *f = NULL; - u_char buf[USHRT_MAX] = { 0 }; + u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc = (struct tagRPCCall*) buf; int ret, wlen = sizeof(struct tagRPCCall); struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; @@ -419,9 +454,6 @@ txUDPPacket(sched_task_t *task) schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], TASK_ARG(task), ts, TASK_ARG(task), 0); - /* copy RPC header */ - memcpy(buf, TASK_DATA(task), wlen); - if (rpc->call_argc) { f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); if (!f) { @@ -432,7 +464,8 @@ txUDPPacket(sched_task_t *task) } else { rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); /* Go Encapsulate variables */ - ret = ait_vars2buffer(buf + wlen, sizeof buf - wlen, RPC_RETVARS(c)); + ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, + RPC_RETVARS(c)); /* Free return values */ ait_freeVars(&c->cli_vars); if (ret == -1) { @@ -445,7 +478,7 @@ txUDPPacket(sched_task_t *task) } } - rpc->call_len = htons(wlen); + rpc->call_len = htonl(wlen); /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -503,7 +536,7 @@ rxUDPPacket(sched_task_t *task) } else rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + off); - len = ntohs(rpc->call_len); + len = ntohl(rpc->call_len); rlen -= len; /* check RPC packet lengths */ @@ -529,12 +562,14 @@ rxUDPPacket(sched_task_t *task) /* check RPC packet session info */ if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) { rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); + rpc->call_argc ^= rpc->call_argc; rpc->call_rep.ret = RPC_ERROR(-1); rpc->call_rep.eno = RPC_ERROR(errno); } else { /* execute RPC call */ - schedEvent(TASK_ROOT(task), execCall, c, off, NULL, 0); + schedEvent(TASK_ROOT(task), execCall, c, + (int) noreply, rpc, len); } /* send RPC reply */ @@ -559,8 +594,8 @@ rpc_freeBLOBCli(rpc_cli_t * __restrict c) schedCancelby(s->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); - /* free buffer(s) */ - ait_freeVars(&c->cli_buf); + /* free buffer */ + AIT_FREE_VAL(&c->cli_buf); array_Del(s->srv_blob.clients, c->cli_id, 0); if (c) @@ -707,6 +742,7 @@ acceptBLOBClients(sched_task_t *task) rpc_cli_t *c = NULL; register int i; socklen_t salen = sizeof(sockaddr_t); + int sock; #ifdef TCP_NOPUSH int n = 1; #endif @@ -714,8 +750,15 @@ acceptBLOBClients(sched_task_t *task) /* check free slots for connect */ for (i = 0; i < array_Size(srv->srv_blob.clients) && (c = array(srv->srv_blob.clients, i, rpc_cli_t*)); i++); - if (c) /* no more free slots! */ + if (c) { /* no more free slots! */ + EVERBOSE(1, "BLOB client quota exceeded! Connection will be shutdown!\n"); + if ((sock = accept(TASK_FD(task), NULL, NULL)) != -1) { + shutdown(sock, SHUT_RDWR); + close(sock); + } goto end; + } + c = e_malloc(sizeof(rpc_cli_t)); if (!c) { LOGERR; @@ -728,20 +771,14 @@ acceptBLOBClients(sched_task_t *task) c->cli_parent = srv; } - /* init buffer(s) */ - c->cli_buf = ait_allocVars(1); - if (!c->cli_buf) { - rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); - array_Del(srv->srv_blob.clients, i, 42); - goto end; - } else - AIT_SET_BUFSIZ(array(c->cli_buf, 0, ait_val_t*), 0, srv->srv_netbuf); + /* alloc empty buffer */ + AIT_SET_BUFSIZ(&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_freeVars(&c->cli_buf); + AIT_FREE_VAL(&c->cli_buf); array_Del(srv->srv_blob.clients, i, 42); goto end; } else { @@ -935,7 +972,7 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) close(c->cli_sock); schedCancelby(srv->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); - ait_freeVars(&c->cli_buf); + AIT_FREE_VAL(&c->cli_buf); } array_Del(srv->srv_blob.clients, i, 42); } @@ -1141,7 +1178,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) schedCancelby(srv->srv_root, taskMAX, CRITERIA_ARG, c, NULL); ait_freeVars(&RPC_RETVARS(c)); - ait_freeVars(&c->cli_buf); + AIT_FREE_VAL(&c->cli_buf); } array_Del(srv->srv_clients, i, 42); }