--- libaitrpc/src/srv.c 2012/05/17 12:52:30 1.9.2.22 +++ libaitrpc/src/srv.c 2012/05/17 16:43:21 1.9.2.27 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.9.2.22 2012/05/17 12:52:30 misho Exp $ +* $Id: srv.c,v 1.9.2.27 2012/05/17 16:43:21 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -346,13 +346,12 @@ 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 = AIT_GET_BUF(&c->cli_buf); - struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf; + struct tagBLOBHdr blob; int rlen; u_short crc; - memset(buf, 0, AIT_LEN(&c->cli_buf)); - rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0); + memset(&blob, 0, sizeof blob); + rlen = recv(TASK_FD(task), &blob, sizeof blob, 0); if (rlen < 1) { /* close blob connection */ schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0); @@ -368,9 +367,9 @@ 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, rlen / 2)) { + crc = ntohs(blob.hdr_crc); + blob.hdr_crc ^= blob.hdr_crc; + if (crc != crcFletcher16((u_short*) &blob, rlen / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); schedReadSelf(task); @@ -378,58 +377,59 @@ rxBLOB(sched_task_t *task) } /* check RPC packet session info */ - if ((crc = rpc_chkPktSession(&blob->hdr_session, &s->srv_session))) { + if ((crc = rpc_chkPktSession(&blob.hdr_session, &s->srv_session))) { rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); - blob->hdr_cmd = error; + blob.hdr_cmd = error; goto end; } /* Go to proceed packet ... */ - switch (blob->hdr_cmd) { + switch (blob.hdr_cmd) { case get: - if (!(b = rpc_srv_getBLOB(s, ntohl(blob->hdr_var)))) { - rpc_SetErr(EINVAL, "Var=%x not found", ntohl(blob->hdr_var)); - blob->hdr_cmd = no; - blob->hdr_ret = RPC_ERROR(-1); + if (!(b = rpc_srv_getBLOB(s, ntohl(blob.hdr_var)))) { + rpc_SetErr(EINVAL, "Var=%x not found", ntohl(blob.hdr_var)); + blob.hdr_cmd = no; + blob.hdr_ret = RPC_ERROR(-1); break; } else - blob->hdr_len = htonl(b->blob_len); + blob.hdr_len = htonl(b->blob_len); if (rpc_srv_blobMap(s, b) != -1) { /* deliver BLOB variable to client */ - blob->hdr_ret = htonl(rpc_srv_sendBLOB(c, b)); + blob.hdr_ret = htonl(rpc_srv_sendBLOB(c, b)); rpc_srv_blobUnmap(b); } else { - blob->hdr_cmd = error; - blob->hdr_ret = RPC_ERROR(-1); + blob.hdr_cmd = error; + blob.hdr_ret = RPC_ERROR(-1); } break; case set: - if ((b = rpc_srv_registerBLOB(s, ntohl(blob->hdr_len)))) { + if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len)))) { /* set new BLOB variable for reply :) */ - blob->hdr_var = htonl(b->blob_var); + blob.hdr_var = htonl(b->blob_var); /* receive BLOB from client */ - blob->hdr_ret = htonl(rpc_srv_recvBLOB(c, b)); + blob.hdr_ret = htonl(rpc_srv_recvBLOB(c, b)); rpc_srv_blobUnmap(b); } else { - blob->hdr_cmd = error; - blob->hdr_ret = RPC_ERROR(-1); + blob.hdr_cmd = error; + blob.hdr_ret = RPC_ERROR(-1); } break; case unset: - if (rpc_srv_unregisterBLOB(s, blob->hdr_var) == -1) { - blob->hdr_cmd = error; - blob->hdr_ret = RPC_ERROR(-1); + if (rpc_srv_unregisterBLOB(s, blob.hdr_var) == -1) { + blob.hdr_cmd = error; + blob.hdr_ret = RPC_ERROR(-1); } break; default: - rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob->hdr_cmd); - blob->hdr_cmd = error; - blob->hdr_ret = RPC_ERROR(-1); + rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd); + blob.hdr_cmd = error; + blob.hdr_ret = RPC_ERROR(-1); } end: + memcpy(AIT_ADDR(&c->cli_buf), &blob, sizeof blob); schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0); schedReadSelf(task); return NULL; @@ -592,47 +592,13 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s * @srv = RPC Server instance * return: none */ -void +inline void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) { - rpc_cli_t *c; - register int i; - rpc_blob_t *b, *tmp; - 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*); - if (c) { - shutdown(c->cli_sock, SHUT_RDWR); - close(c->cli_sock); - - 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); - - 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); - free(b); - } - - schedEnd(&srv->srv_blob.root); - AIT_FREE_VAL(&srv->srv_blob.dir); + srv->srv_blob.kill = 1; } /* @@ -644,6 +610,11 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) { + rpc_cli_t *c; + register int i; + rpc_blob_t *b, *tmp; + struct timespec ts = { RPC_SCHED_POLLING, 0 }; + if (!srv || srv->srv_kill) { rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server"); return -1; @@ -663,8 +634,36 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) return -1; } + schedPolling(srv->srv_blob.root, &ts, NULL); /* main rpc loop */ schedRun(srv->srv_blob.root, &srv->srv_blob.kill); + + /* 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*); + if (c) { + shutdown(c->cli_sock, SHUT_RDWR); + close(c->cli_sock); + + 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); + + 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); + free(b); + } + + schedEnd(&srv->srv_blob.root); + AIT_FREE_VAL(&srv->srv_blob.dir); return 0; } @@ -675,7 +674,7 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) * @regProgID = ProgramID for authentication & recognition * @regProcID = ProcessID for authentication & recognition * @concurentClients = Concurent clients at same time to this server - * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) + * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) * @csHost = Host name or address for bind server, if NULL any address * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL bind and created RPC server instance @@ -696,7 +695,7 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, return NULL; if (!Port) Port = RPC_DEFPORT; - if (!netBuf) + if (netBuf < RPC_MIN_BUFSIZ) netBuf = BUFSIZ; else netBuf = io_align(netBuf, 1); /* align netBuf length */ @@ -789,45 +788,19 @@ err: /* error condition */ * @psrv = RPC Server instance * return: none */ -void +inline void rpc_srv_endServer(rpc_srv_t ** __restrict psrv) { - rpc_cli_t *c; - register int i; - rpc_func_t *f, *tmp; - if (!psrv || !*psrv) return; + /* if send kill to blob server */ if (!(*psrv)->srv_blob.kill) rpc_srv_endBLOBServer(*psrv); - /* close all clients connections & server socket */ - for (i = 0; i < io_arraySize((*psrv)->srv_clients); i++) { - c = io_array((*psrv)->srv_clients, i, rpc_cli_t*); - if (c) { - shutdown(c->cli_sock, SHUT_RDWR); - close(c->cli_sock); + (*psrv)->srv_kill = 1; + sleep(RPC_SCHED_POLLING); - 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); - - close((*psrv)->srv_server.cli_sock); - - /* detach exported calls */ - TAILQ_FOREACH_SAFE(f, &(*psrv)->srv_funcs, func_node, tmp) { - TAILQ_REMOVE(&(*psrv)->srv_funcs, f, func_node); - - io_freeVars(&f->func_vars); - AIT_FREE_VAL(&f->func_name); - free(f); - } - - schedEnd(&(*psrv)->srv_root); free(*psrv); *psrv = NULL; } @@ -841,6 +814,11 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv) int rpc_srv_loopServer(rpc_srv_t * __restrict srv) { + rpc_cli_t *c; + register int i; + rpc_func_t *f, *tmp; + struct timespec ts = { RPC_SCHED_POLLING, 0 }; + if (!srv) { rpc_SetErr(EINVAL, "Invalid parameter can`t start RPC server"); return -1; @@ -859,8 +837,36 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) return -1; } + schedPolling(srv->srv_root, &ts, NULL); /* main rpc loop */ schedRun(srv->srv_root, &srv->srv_kill); + + /* close all clients connections & server socket */ + for (i = 0; i < io_arraySize(srv->srv_clients); i++) { + c = io_array(srv->srv_clients, i, rpc_cli_t*); + if (c) { + shutdown(c->cli_sock, SHUT_RDWR); + close(c->cli_sock); + + schedCancelby(srv->srv_root, taskMAX, CRITERIA_ARG, c, NULL); + AIT_FREE_VAL(&c->cli_buf); + } + io_arrayDel(srv->srv_clients, i, 42); + } + io_arrayDestroy(&srv->srv_clients); + + close(srv->srv_server.cli_sock); + + /* detach exported calls */ + TAILQ_FOREACH_SAFE(f, &srv->srv_funcs, func_node, tmp) { + TAILQ_REMOVE(&srv->srv_funcs, f, func_node); + + io_freeVars(&f->func_vars); + AIT_FREE_VAL(&f->func_name); + free(f); + } + + schedEnd(&srv->srv_root); return 0; }