--- libaitrpc/src/srv.c 2012/05/16 09:02:48 1.9.2.12 +++ libaitrpc/src/srv.c 2012/05/16 12:20:05 1.9.2.14 @@ -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.14 2012/05/16 12:20:05 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -186,14 +186,14 @@ rxPacket(sched_task_t *task) rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 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; } do { /* check RPC packet */ if (rlen < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Too short RPC packet"); + rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); schedReadSelf(task); return NULL; @@ -257,7 +257,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 +270,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 +288,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(s->srv_blob.root, 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 +320,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 +335,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 +361,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 +371,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 +419,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 /* ------------------------------------------------------ */