--- libaitrpc/src/srv.c 2012/03/15 01:22:55 1.6.2.10 +++ libaitrpc/src/srv.c 2012/03/29 01:23:59 1.7.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.6.2.10 2012/03/15 01:22:55 misho Exp $ +* $Id: srv.c,v 1.7.2.4 2012/03/29 01:23:59 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -60,7 +60,7 @@ txPacket(sched_task_t *task) int ret, wlen = sizeof(struct tagRPCCall); array_t *arr = NULL; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); if (rpc->call_argc) { f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash)); @@ -83,9 +83,11 @@ txPacket(sched_task_t *task) } } + rpc->call_len = htons(wlen); + /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; - rpc->call_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2)); + rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); /* send reply */ ret = send(TASK_FD(task), buf, wlen, 0); @@ -95,7 +97,7 @@ txPacket(sched_task_t *task) rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, " "really sended %d bytes", wlen, ret); else - LOGGER("Sended %d bytes", ret); + ioDEBUG(RPC_DEBUG_LEVEL, "Sended %d bytes", ret); return NULL; } @@ -107,16 +109,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 = TASK_DATA(task); + u_char *buf = TASK_DATA(task) + TASK_VAL(task); struct tagRPCCall *rpc = (struct tagRPCCall*) buf; int argc = ntohs(rpc->call_argc); - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); /* Go decapsulate variables ... */ - if (!(rpc->call_req.flags & RPC_NOREPLY) && argc) { + if (argc) { arr = io_buffer2vars(buf + sizeof(struct tagRPCCall), - TASK_DATLEN(task) - sizeof(struct tagRPCCall), argc, 1); + TASK_DATLEN(task) - TASK_VAL(task) - sizeof(struct tagRPCCall), + argc, 1); if (!arr) { rpc_SetErr(ERPCMISMATCH, "#%d - %s", io_GetErrno(), io_GetError()); rpc->call_argc ^= rpc->call_argc; @@ -132,16 +135,23 @@ execCall(sched_task_t *task) rpc->call_rep.ret = RPC_ERROR(-1); rpc->call_rep.eno = RPC_ERROR(rpc_Errno); } else { - LOGGER("RPC function %s from module %s", AIT_GET_STR(&f->func_name), - AIT_GET_LIKE(&f->func_file, char*)); + ioDEBUG(RPC_DEBUG_LEVEL, "RPC function %s from module %s", + AIT_GET_STR(&f->func_name), AIT_GET_LIKE(&f->func_file, char*)); + /* if client doesn't want reply */ + argc = rpc->call_req.flags & RPC_NOREPLY; rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(f, rpc, arr)); if (rpc->call_rep.ret == htonl(-1)) { rpc->call_rep.eno = RPC_ERROR(errno); rpc->call_argc ^= rpc->call_argc; } else { rpc->call_rep.eno ^= rpc->call_rep.eno; - rpc->call_argc = htons(rpc_srv_getVars(f, NULL)); + if (argc) { + /* without reply */ + io_clrVars(f->func_vars); + rpc->call_argc ^= rpc->call_argc; + } else + rpc->call_argc = htons(rpc_srv_getVars(f, NULL)); } } @@ -156,12 +166,12 @@ rxPacket(sched_task_t *task) rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; u_char *buf = TASK_DATA(task); - int rlen; - u_short crc; + int rlen, noreply; + u_short crc, off = 0; struct tagRPCCall *rpc; struct timespec ts; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); memset(buf, 0, TASK_DATLEN(task)); rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0); @@ -173,51 +183,60 @@ rxPacket(sched_task_t *task) s->srv_kill = s->srv_blob.state = kill; return NULL; } else - LOGGER("Readed %d bytes", rlen); + ioDEBUG(RPC_DEBUG_LEVEL, "Readed %d bytes", rlen); - if (rlen < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Too short RPC packet"); + do { + if (rlen < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Too short RPC packet"); - schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), - TASK_DATA(task), TASK_DATLEN(task)); - return NULL; - } else - rpc = (struct tagRPCCall*) buf; + schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), + TASK_DATA(task), TASK_DATLEN(task)); + return NULL; + } else + rpc = (struct tagRPCCall*) (buf + off); - /* check integrity of packet */ - crc = ntohs(rpc->call_crc); - rpc->call_crc ^= rpc->call_crc; - if (crc != crcFletcher16((u_short*) buf, io_align(rlen, 1) / 2)) { - rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); + rlen -= ntohs(rpc->call_len); - schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), - TASK_DATA(task), TASK_DATLEN(task)); - return NULL; - } + /* check integrity of packet */ + crc = ntohs(rpc->call_crc); + rpc->call_crc ^= rpc->call_crc; + if (crc != crcFletcher16((u_short*) (buf + off), ntohs(rpc->call_len) / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); - /* 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); - goto end; - } else { - /* change socket timeout from last packet */ - ts.tv_sec = rpc->call_session.sess_timeout; - ts.tv_nsec = 0; - schedPolling(TASK_ROOT(task), &ts, NULL); - } + off += ntohs(rpc->call_len); + if (rlen < 1) + break; + else + continue; + } - /* execute RPC call */ - schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), 0, - TASK_DATA(task), TASK_DATLEN(task)); + noreply = rpc->call_req.flags & RPC_NOREPLY; -end: - /* send RPC reply */ - if (!(rpc->call_req.flags & RPC_NOREPLY)) - schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task), - TASK_DATA(task), TASK_DATLEN(task)); + /* 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 { + /* change socket timeout from last packet */ + ts.tv_sec = rpc->call_session.sess_timeout; + ts.tv_nsec = 0; + schedPolling(TASK_ROOT(task), &ts, NULL); + + /* execute RPC call */ + schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), off, + TASK_DATA(task), TASK_DATLEN(task)); + } + + /* send RPC reply */ + if (!noreply) + schedWrite(TASK_ROOT(task), txPacket, TASK_ARG(task), TASK_FD(task), + buf + off, TASK_DATLEN(task) - off); + + off += ntohs(rpc->call_len); + } while (rlen > 0); + /* lets get next packet */ schedRead(TASK_ROOT(task), rxPacket, TASK_ARG(task), TASK_FD(task), TASK_DATA(task), TASK_DATLEN(task)); @@ -233,7 +252,7 @@ rpc_srv_dispatchCall(void *arg) sched_root_task_t *root; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); if (!arg) { rpc_SetErr(EINVAL, "Invalid parameter can`t procced RPC client"); @@ -278,11 +297,11 @@ txBLOB(sched_task_t *task) struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf; int wlen = sizeof(struct tagBLOBHdr); - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); /* calculate CRC */ blob->hdr_crc ^= blob->hdr_crc; - blob->hdr_crc = htons(crcFletcher16((u_short*) buf, io_align(wlen, 1) / 2)); + blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); /* send reply */ wlen = send(TASK_FD(task), buf, wlen, 0); @@ -292,7 +311,7 @@ txBLOB(sched_task_t *task) rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, " "really sended %d bytes", sizeof(struct tagBLOBHdr), wlen); else - LOGGER("Sended %d bytes", wlen); + ioDEBUG(RPC_DEBUG_LEVEL, "Sended %d bytes", wlen); return NULL; } @@ -309,10 +328,10 @@ rxBLOB(sched_task_t *task) u_short crc; struct timespec ts; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); /* check for disable service at this moment? */ - if (s->srv_blob.state == disable) { + if (!s || s->srv_blob.state == disable) { usleep(100000); #ifdef HAVE_PTHREAD_YIELD pthread_yield(); @@ -332,7 +351,7 @@ rxBLOB(sched_task_t *task) s->srv_blob.state = kill; return NULL; } else - LOGGER("Readed %d bytes", rlen); + ioDEBUG(RPC_DEBUG_LEVEL, "Readed %d bytes", rlen); if (rlen < sizeof(struct tagBLOBHdr)) { rpc_SetErr(ERPCMISMATCH, "Too short BLOB packet"); @@ -344,7 +363,7 @@ rxBLOB(sched_task_t *task) /* check integrity of packet */ crc = ntohs(blob->hdr_crc); blob->hdr_crc ^= blob->hdr_crc; - if (crc != crcFletcher16((u_short*) buf, io_align(rlen, 1) / 2)) { + if (crc != crcFletcher16((u_short*) buf, rlen / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), TASK_DATA(task), TASK_DATLEN(task)); @@ -425,7 +444,7 @@ rpc_srv_dispatchVars(void *arg) u_char *buf; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); if (!arg) { rpc_SetErr(EINVAL, "Invalid parameter can`t procced BLOB"); @@ -478,7 +497,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s int n = 1; io_sockaddr_t sa; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); if (!srv) { rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); @@ -584,12 +603,11 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) register int i; rpc_blob_t *f; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); - if (!srv) { - rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!"); + if (!srv || srv->srv_blob.state == disable) return; - } else + else srv->srv_blob.state = kill; rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN); @@ -621,6 +639,9 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) while (pthread_mutex_trylock(&srv->srv_blob.mtx) == EBUSY); pthread_mutex_destroy(&srv->srv_blob.mtx); + + /* at final, save disable BLOB service state */ + srv->srv_blob.state = disable; } /* @@ -640,7 +661,7 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv) struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; pthread_attr_t attr; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); if (!srv || srv->srv_blob.state == kill) { rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server"); @@ -724,7 +745,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i struct hostent *host = NULL; io_sockaddr_t sa; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); if (!concurentClients || !regProgID || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { @@ -838,6 +859,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i rpc_srv_registerCall(srv, NULL, CALL_SRVCLIENTS, 1); rpc_srv_registerCall(srv, NULL, CALL_SRVSESSIONS, 4); rpc_srv_registerCall(srv, NULL, CALL_SRVCALLS, 1); + return srv; } @@ -854,7 +876,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv) register int i; rpc_func_t *f; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); if (!psrv || !*psrv) { rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n"); @@ -912,7 +934,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; pthread_attr_t attr; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); if (!srv) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n"); @@ -993,7 +1015,7 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct rpc_callback_t func; int ret; - FTRACE(); + ioTRACE(RPC_TRACE_LEVEL); if (!call || !rpc || !call->func_parent) { rpc_SetErr(EINVAL, "Invalid parameter can`t exec function");