--- libaitrpc/src/srv.c 2013/05/30 09:22:02 1.16 +++ libaitrpc/src/srv.c 2013/09/05 00:43:05 1.20 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.16 2013/05/30 09:22:02 misho Exp $ +* $Id: srv.c,v 1.20 2013/09/05 00:43:05 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -161,28 +161,36 @@ 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; - /* copy RPC header */ - memcpy(buf, TASK_DATA(task), wlen); - 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); @@ -191,7 +199,7 @@ txPacket(sched_task_t *task) } } - rpc->call_len = htons(wlen); + rpc->call_len = htonl(wlen); #if 0 /* calculate CRC */ @@ -200,11 +208,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; @@ -217,17 +241,17 @@ execCall(sched_task_t *task) rpc_srv_t *s = c->cli_parent; rpc_func_t *f = NULL; array_t *arr = NULL; - u_char *buf = AIT_GET_BUF(&c->cli_buf) + TASK_VAL(task); + 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 + sizeof(struct tagRPCCall), - AIT_LEN(&c->cli_buf) - TASK_VAL(task) - sizeof(struct tagRPCCall), - argc, 42); + AIT_LEN(&c->cli_buf) - sizeof(struct tagRPCCall), argc, 42); if (!arr) { rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError()); + rpc->call_argc ^= rpc->call_argc; rpc->call_rep.ret = RPC_ERROR(-1); rpc->call_rep.eno = RPC_ERROR(rpc_Errno); @@ -238,6 +262,7 @@ execCall(sched_task_t *task) if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) { 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); @@ -246,7 +271,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; @@ -270,85 +298,85 @@ rxPacket(sched_task_t *task) { rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; - int len, rlen, noreply; - u_short off = TASK_DATLEN(task); + 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 *rpc = (struct tagRPCCall*) buf; + struct pollfd pfd; - if (!off) - memset(buf, 0, AIT_LEN(&c->cli_buf)); - rlen = recv(TASK_FD(task), buf + off, AIT_LEN(&c->cli_buf) - off, 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 { - rlen += off; /* add reminded bytes from previous rxPacket, if exists! */ - off = 0; /* process buffer from start offset == 0 */ + 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; } - do { - /* check RPC packet */ - if (rlen < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); - - /* reminder received previous bytes ;) */ - schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), - TASK_FD(task), TASK_DATA(task), rlen); + /* 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; - } else - rpc = (struct tagRPCCall*) (buf + off); - - 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"); - /* skip entire packet */ - break; } + 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; + } + } #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"); - - off += len; - /* try next packet remaining into buffer */ - continue; - } + /* 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); + noreply = RPC_CHK_NOREPLY(rpc); - /* check RPC packet session info */ - if (rpc_chkPktSession(&rpc->call_session, &s->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, TASK_ARG(task), off, NULL, 0); - } + /* check RPC packet session info */ + if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { + rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); - /* send RPC reply */ - if (!noreply) - schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], - TASK_ARG(task), TASK_FD(task), rpc, len); + 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, TASK_ARG(task), (int) noreply, rpc, len); + } - off += len; - } while (rlen > 0); + /* send RPC reply */ + if (!noreply) + schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], + TASK_ARG(task), TASK_FD(task), rpc, len); /* lets get next packet */ - schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), TASK_FD(task), TASK_DATA(task), 0); + schedReadSelf(task); return NULL; } @@ -387,7 +415,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 }; @@ -396,9 +424,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) { @@ -409,7 +434,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) { @@ -422,7 +448,7 @@ txUDPPacket(sched_task_t *task) } } - rpc->call_len = htons(wlen); + rpc->call_len = htonl(wlen); /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -480,7 +506,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 */ @@ -506,12 +532,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 */ @@ -628,7 +656,8 @@ rxBLOB(sched_task_t *task) } break; case set: - if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len)))) { + if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len), + ntohl(blob.hdr_ret)))) { /* set new BLOB variable for reply :) */ blob.hdr_var = htonl(b->blob_var); @@ -660,6 +689,23 @@ end: } static void * +flushBLOB(sched_task_t *task) +{ + rpc_srv_t *srv = TASK_ARG(task); + rpc_blob_t *b, *tmp; + + TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { + TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); + + rpc_srv_blobFree(srv, b); + e_free(b); + } + + schedSignalSelf(task); + return NULL; +} + +static void * acceptBLOBClients(sched_task_t *task) { rpc_srv_t *srv = TASK_ARG(task); @@ -833,6 +879,8 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) return; srv->srv_blob.kill = 1; + + schedEnd(&srv->srv_blob.root); } /* @@ -859,6 +907,7 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) return -1; } + schedSignal(srv->srv_blob.root, flushBLOB, srv, SIGFBLOB, NULL, 0); if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, srv->srv_blob.server.cli_sock, NULL, 0)) { rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); @@ -869,6 +918,14 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) /* main rpc loop */ schedRun(srv->srv_blob.root, &srv->srv_blob.kill); + /* detach blobs */ + TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { + TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); + + rpc_srv_blobFree(srv, b); + e_free(b); + } + /* close all clients connections & server socket */ for (i = 0; i < array_Size(srv->srv_blob.clients); i++) { c = array(srv->srv_blob.clients, i, rpc_cli_t*); @@ -885,15 +942,6 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) close(srv->srv_blob.server.cli_sock); - /* detach blobs */ - TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { - TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); - - rpc_srv_blobFree(srv, b); - e_free(b); - } - - schedEnd(&srv->srv_blob.root); AIT_FREE_VAL(&srv->srv_blob.dir); return 0; } @@ -1036,12 +1084,13 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv) return; /* if send kill to blob server */ - if (!(*psrv)->srv_blob.kill) - rpc_srv_endBLOBServer(*psrv); + rpc_srv_endBLOBServer(*psrv); (*psrv)->srv_kill = 1; sleep(RPC_SCHED_POLLING); + schedEnd(&(*psrv)->srv_root); + pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); e_free(*psrv); *psrv = NULL; @@ -1110,7 +1159,6 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) srv->srv_funcs.avlh_root = NULL; RPC_FUNCS_UNLOCK(&srv->srv_funcs); - schedEnd(&srv->srv_root); return 0; }