--- libaitrpc/src/srv.c 2013/04/02 09:17:06 1.14.2.1 +++ libaitrpc/src/srv.c 2013/08/20 23:37:43 1.17.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.14.2.1 2013/04/02 09:17:06 misho Exp $ +* $Id: srv.c,v 1.17.4.1 2013/08/20 23:37:43 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -67,15 +67,15 @@ static sched_task_func_t cbProto[SOCK_RAW + 1][4] = { }; -inline void +void rpc_freeCli(rpc_cli_t * __restrict c) { rpc_srv_t *s = c->cli_parent; schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL); - /* free buffer */ - AIT_FREE_VAL(&c->cli_buf); + /* free buffer(s) */ + ait_freeVars(&c->cli_buf); array_Del(s->srv_clients, c->cli_id, 0); if (c) @@ -127,7 +127,13 @@ _allocClient(rpc_srv_t * __restrict srv, sockaddr_t * } /* alloc empty buffer */ - AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf); + 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); } return c; @@ -193,9 +199,11 @@ txPacket(sched_task_t *task) rpc->call_len = htons(wlen); +#if 0 /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); +#endif /* send reply */ ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); @@ -269,7 +277,10 @@ 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 crc, off = TASK_DATLEN(task); + u_short off = TASK_DATLEN(task); +#if 0 + u_short crc; +#endif u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc; @@ -308,6 +319,7 @@ rxPacket(sched_task_t *task) break; } +#if 0 /* check integrity of packet */ crc = ntohs(rpc->call_crc); rpc->call_crc ^= rpc->call_crc; @@ -318,6 +330,7 @@ rxPacket(sched_task_t *task) /* try next packet remaining into buffer */ continue; } +#endif noreply = RPC_CHK_NOREPLY(rpc); @@ -522,7 +535,7 @@ end: /* ------------------------------------------------------ */ -inline void +void rpc_freeBLOBCli(rpc_cli_t * __restrict c) { rpc_srv_t *s = c->cli_parent; @@ -576,7 +589,6 @@ rxBLOB(sched_task_t *task) rpc_blob_t *b; struct tagBLOBHdr blob; int rlen; - u_short crc; memset(&blob, 0, sizeof blob); rlen = recv(TASK_FD(task), &blob, sizeof blob, 0); @@ -595,7 +607,7 @@ rxBLOB(sched_task_t *task) } /* check RPC packet session info */ - if ((crc = rpc_chkPktSession(&blob.hdr_session, &s->srv_session))) { + if (rpc_chkPktSession(&blob.hdr_session, &s->srv_session)) { rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); blob.hdr_cmd = error; goto end; @@ -622,7 +634,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); @@ -654,6 +667,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); @@ -820,13 +850,15 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s * @srv = RPC Server instance * return: none */ -inline void +void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) { if (!srv) return; srv->srv_blob.kill = 1; + + schedEnd(&srv->srv_blob.root); } /* @@ -853,6 +885,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()); @@ -863,6 +896,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*); @@ -879,15 +920,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; } @@ -1023,19 +1055,20 @@ err: /* error condition */ * @psrv = RPC Server instance * return: none */ -inline void +void rpc_srv_endServer(rpc_srv_t ** __restrict psrv) { if (!psrv || !*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; @@ -1104,7 +1137,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; }