--- libaitrpc/src/srv.c 2012/05/16 16:36:10 1.9.2.17 +++ 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.17 2012/05/16 16:36:10 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)) @@ -178,17 +178,20 @@ 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, 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 { @@ -196,7 +199,9 @@ rxPacket(sched_task_t *task) if (rlen < sizeof(struct tagRPCCall)) { 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); @@ -204,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; @@ -238,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; } @@ -294,7 +304,7 @@ closeBLOBClient(sched_task_t *task) rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; - schedCancelby(s->srv_blob.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)) @@ -592,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*); @@ -599,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); @@ -616,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; } /* @@ -648,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; @@ -778,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); @@ -813,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); @@ -887,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); }