--- libaitrpc/src/srv.c 2012/05/16 09:02:48 1.9.2.12 +++ libaitrpc/src/srv.c 2012/05/17 12:52:30 1.9.2.22 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.9.2.12 2012/05/16 09:02:48 misho Exp $ +* $Id: srv.c,v 1.9.2.22 2012/05/17 12:52:30 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -52,7 +52,7 @@ closeClient(sched_task_t *task) rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; - schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL); + schedCancelby(TASK_ROOT(task), taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL); /* close client socket */ if (TASK_VAL(task)) @@ -82,6 +82,7 @@ txPacket(sched_task_t *task) 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); @@ -177,25 +178,30 @@ rxPacket(sched_task_t *task) { rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; - u_char *buf = AIT_GET_BUF(&c->cli_buf); int len, rlen, noreply; - u_short crc, off = 0; + u_short crc, off = TASK_DATLEN(task); + u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc; memset(buf, 0, AIT_LEN(&c->cli_buf)); - rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0); + 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, 0, NULL, 0); + schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0); return NULL; + } else { + rlen += off; /* add reminded bytes from previous rxPacket, if exists! */ + off = 0; /* process buffer from start offset == 0 */ } do { /* check RPC packet */ if (rlen < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Too short RPC packet"); + rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); - schedReadSelf(task); + /* reminder received previous bytes ;) */ + schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), + TASK_FD(task), TASK_DATA(task), rlen); return NULL; } else rpc = (struct tagRPCCall*) (buf + off); @@ -203,17 +209,22 @@ rxPacket(sched_task_t *task) 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; + } + /* check integrity of packet */ crc = ntohs(rpc->call_crc); rpc->call_crc ^= rpc->call_crc; - if (crc != crcFletcher16((u_short*) (buf + off), len / 2)) { + if (crc != crcFletcher16((u_short*) rpc, len / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); off += len; - if (rlen < 1) - break; - else - continue; + /* try next packet remaining into buffer */ + continue; } noreply = rpc->call_req.flags & RPC_NOREPLY; @@ -237,7 +248,7 @@ rxPacket(sched_task_t *task) } while (rlen > 0); /* lets get next packet */ - schedReadSelf(task); + schedRead(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), TASK_FD(task), TASK_DATA(task), 0); return NULL; } @@ -257,7 +268,7 @@ acceptClients(sched_task_t *task) c = malloc(sizeof(rpc_cli_t)); if (!c) { LOGERR; - srv->srv_kill = kill; + srv->srv_kill = 1; return NULL; } else { memset(c, 0, sizeof(rpc_cli_t)); @@ -270,7 +281,7 @@ acceptClients(sched_task_t *task) AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf); /* accept client */ - c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen); + c->cli_sock = accept(TASK_FD(task), &c->cli_sa.sa, &salen); if (c->cli_sock == -1) { LOGERR; AIT_FREE_VAL(&c->cli_buf); @@ -288,54 +299,30 @@ end: /* ------------------------------------------------------ */ static void * -acceptBLOBClients(sched_task_t *task) +closeBLOBClient(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); + rpc_cli_t *c = TASK_ARG(task); + rpc_srv_t *s = c->cli_parent; - /* 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! */ - goto end; - c = malloc(sizeof(rpc_cli_t)); - if (!c) { - LOGERR; - srv->srv_kill = kill; - 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; - } + schedCancelby(TASK_ROOT(task), taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL); - /* alloc empty buffer */ - AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf); + /* close client socket */ + if (TASK_VAL(task)) + shutdown(c->cli_sock, SHUT_RDWR); + close(c->cli_sock); - /* accept client */ - c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen); - if (c->cli_sock == -1) { - LOGERR; - AIT_FREE_VAL(&c->cli_buf); - io_arrayDel(srv->srv_clients, i, 42); - goto end; - } else - fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); + /* free buffer */ + AIT_FREE_VAL(&c->cli_buf); - schedRead(TASK_ROOT(task), rxPacket, c, c->cli_sock, NULL, 0); -end: - schedReadSelf(task); + io_arrayDel(s->srv_blob.clients, c->cli_id, 42); return NULL; } -#if 0 static void * txBLOB(sched_task_t *task) { - u_char *buf = TASK_DATA(task); + rpc_cli_t *c = TASK_ARG(task); + u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf; int wlen = sizeof(struct tagBLOBHdr); @@ -344,12 +331,11 @@ txBLOB(sched_task_t *task) blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); /* send reply */ - wlen = send(TASK_FD(task), buf, wlen, 0); - if (wlen == -1) - LOGERR; - else if (wlen != sizeof(struct tagBLOBHdr)) - rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, " - "really sended %d bytes", sizeof(struct tagBLOBHdr), wlen); + wlen = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); + if (wlen == -1 || wlen != sizeof(struct tagBLOBHdr)) { + /* close blob connection */ + schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0); + } return NULL; } @@ -360,38 +346,24 @@ rxBLOB(sched_task_t *task) rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; rpc_blob_t *b; - u_char *buf = TASK_DATA(task); + u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf; int rlen; u_short crc; - struct timespec ts; - /* check for disable service at this moment? */ - if (!s || s->srv_blob.state == disable) { - usleep(100000); -#ifdef HAVE_PTHREAD_YIELD - pthread_yield(); -#endif - schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), - TASK_DATA(task), TASK_DATLEN(task)); + memset(buf, 0, AIT_LEN(&c->cli_buf)); + rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0); + if (rlen < 1) { + /* close blob connection */ + schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0); return NULL; } - memset(buf, 0, TASK_DATLEN(task)); - rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0); - if (rlen == -1) { - LOGERR; - c->cli_kill = kill; - return NULL; - } else if (!rlen) { /* receive EOF */ - c->cli_kill = kill; - return NULL; - } - + /* check BLOB packet */ if (rlen < sizeof(struct tagBLOBHdr)) { - rpc_SetErr(ERPCMISMATCH, "Too short BLOB packet"); - schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), - TASK_DATA(task), TASK_DATLEN(task)); + rpc_SetErr(ERPCMISMATCH, "Short BLOB packet"); + + schedReadSelf(task); return NULL; } @@ -400,8 +372,8 @@ rxBLOB(sched_task_t *task) blob->hdr_crc ^= blob->hdr_crc; 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)); + + schedReadSelf(task); return NULL; } @@ -410,11 +382,6 @@ rxBLOB(sched_task_t *task) rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); blob->hdr_cmd = error; goto end; - } else { - /* change socket timeout from last packet */ - ts.tv_sec = blob->hdr_session.sess_timeout; - ts.tv_nsec = 0; - schedPolling(TASK_ROOT(task), &ts, NULL); } /* Go to proceed packet ... */ @@ -463,57 +430,54 @@ rxBLOB(sched_task_t *task) } end: - schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), - TASK_DATA(task), TASK_DATLEN(task)); - schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), - TASK_DATA(task), TASK_DATLEN(task)); + schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0); + schedReadSelf(task); return NULL; } static void * -rpc_srv_dispatchVars(void *arg) +acceptBLOBClients(sched_task_t *task) { - rpc_cli_t *c = arg; - rpc_srv_t *s; - sched_root_task_t *root; - u_char *buf; - struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; + rpc_srv_t *srv = TASK_ARG(task); + rpc_cli_t *c = NULL; + register int i; + socklen_t salen = sizeof(io_sockaddr_t); - if (!arg) { - rpc_SetErr(EINVAL, "Invalid parameter can`t procced BLOB"); - return NULL; - } else - s = c->cli_parent; - - /* allocate net buffer */ - buf = malloc(sizeof(struct tagBLOBHdr)); - if (!buf) { + /* check free slots for connect */ + for (i = 0; i < io_arraySize(srv->srv_blob.clients) && + (c = io_array(srv->srv_blob.clients, i, rpc_cli_t*)); i++); + if (c) /* no more free slots! */ + goto end; + c = malloc(sizeof(rpc_cli_t)); + if (!c) { LOGERR; + srv->srv_kill = srv->srv_blob.kill = 1; return NULL; - } - - root = schedBegin(); - if (!root) { - rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); - free(buf); - return NULL; } else { - schedTermCondition(root, kill); - schedPolling(root, &ts, NULL); + memset(c, 0, sizeof(rpc_cli_t)); + io_arraySet(srv->srv_blob.clients, i, c); + c->cli_id = i; + c->cli_parent = srv; } - schedRead(root, rxBLOB, c, c->cli_sock, buf, sizeof(struct tagBLOBHdr)); + /* alloc empty buffer */ + AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf); - schedRun(root, (void*) &c->cli_kill); - schedEnd(&root); + /* 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_blob.clients, i, 42); + goto end; + } else + fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); - shutdown(c->cli_sock, SHUT_RDWR); - close(c->cli_sock); - memset(c, 0, sizeof(rpc_cli_t)); - free(buf); + schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0); +end: + schedReadSelf(task); return NULL; } -#endif /* ------------------------------------------------------ */ @@ -529,7 +493,6 @@ int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir) { int n = 1; - io_sockaddr_t sa; if (!srv || srv->srv_kill) { rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); @@ -549,15 +512,18 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s srv->srv_blob.server.cli_parent = srv; memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(io_sockaddr_t)); - switch (sa.sa.sa_family) { + switch (srv->srv_blob.server.cli_sa.sa.sa_family) { case AF_INET: - sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1); + srv->srv_blob.server.cli_sa.sin.sin_port = + htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin.sin_port) + 1); break; case AF_INET6: - sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1); + srv->srv_blob.server.cli_sa.sin6.sin6_port = + htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin6.sin6_port) + 1); break; case AF_LOCAL: - strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path); + strlcat(srv->srv_blob.server.cli_sa.sun.sun_path, ".blob", + sizeof srv->srv_blob.server.cli_sa.sun.sun_path); break; default: AIT_FREE_VAL(&srv->srv_blob.dir); @@ -636,6 +602,11 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) if (!srv) return; + if (srv->srv_blob.tid) { + pthread_cancel(srv->srv_blob.tid); + pthread_join(srv->srv_blob.tid, NULL); + } + /* close all clients connections & server socket */ for (i = 0; i < io_arraySize(srv->srv_blob.clients); i++) { c = io_array(srv->srv_blob.clients, i, rpc_cli_t*); @@ -643,8 +614,10 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); - io_arrayDel(srv->srv_blob.clients, i, 42); + schedCancelby(srv->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); + AIT_FREE_VAL(&c->cli_buf); } + io_arrayDel(srv->srv_blob.clients, i, 42); } io_arrayDestroy(&srv->srv_blob.clients); @@ -660,8 +633,6 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) schedEnd(&srv->srv_blob.root); AIT_FREE_VAL(&srv->srv_blob.dir); - - srv->srv_blob.kill = 1; } /* @@ -692,27 +663,6 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) return -1; } -#if 0 - for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++) - if (!c->cli_sa.sa.sa_family) - break; - if (i >= srv->srv_numcli) { -#ifdef HAVE_PTHREAD_YIELD - pthread_yield(); -#endif - usleep(1000000); - continue; - } - - c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen); - if (c->cli_sock == -1) { - LOGERR; - continue; - } else - c->cli_parent = srv; - } -#endif - /* main rpc loop */ schedRun(srv->srv_blob.root, &srv->srv_blob.kill); return 0; @@ -751,6 +701,14 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, else netBuf = io_align(netBuf, 1); /* align netBuf length */ +#ifdef HAVE_SRANDOMDEV + srandomdev(); +#else + time_t tim; + + srandom((time(&tim) ^ getpid())); +#endif + srv = malloc(sizeof(rpc_srv_t)); if (!srv) { LOGERR; @@ -814,6 +772,8 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, goto err; } + rpc_register_srvPing(srv); + return srv; err: /* error condition */ close(srv->srv_server.cli_sock); @@ -836,10 +796,8 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv) register int i; rpc_func_t *f, *tmp; - if (!psrv || !*psrv) { - rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!"); + if (!psrv || !*psrv) return; - } if (!(*psrv)->srv_blob.kill) rpc_srv_endBLOBServer(*psrv); @@ -851,8 +809,10 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv) shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); - io_arrayDel((*psrv)->srv_clients, i, 42); + schedCancelby((*psrv)->srv_root, taskMAX, CRITERIA_ARG, c, NULL); + AIT_FREE_VAL(&c->cli_buf); } + io_arrayDel((*psrv)->srv_clients, i, 42); } io_arrayDestroy(&(*psrv)->srv_clients); @@ -925,5 +885,5 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct } func = AIT_GET_LIKE(&call->func_name, rpc_callback_t); - return func(call, ntohs(rpc->call_argc), args); + return func(call, rpc, args); }