--- libaitrpc/src/srv.c 2015/01/18 01:03:50 1.24.2.6 +++ libaitrpc/src/srv.c 2015/01/21 00:37:04 1.24.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.24.2.6 2015/01/18 01:03:50 misho Exp $ +* $Id: srv.c,v 1.24.2.7 2015/01/21 00:37:04 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -206,7 +206,7 @@ txPacket(sched_task_t *task) buf = AIT_GET_BUF(&c->cli_buf); rpc = (struct tagRPCCall*) buf; - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); /* Go Encapsulate variables */ ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, RPC_RETVARS(c)); @@ -224,6 +224,7 @@ txPacket(sched_task_t *task) } rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; #if 0 /* calculate CRC */ @@ -267,7 +268,7 @@ execCall(sched_task_t *task) array_t *arr = NULL; u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc = (struct tagRPCCall*) buf; - int argc = ntohs(rpc->call_argc); + int argc = rpc->call_argc; /* Go decapsulate variables ... */ if (argc) { @@ -308,7 +309,7 @@ execCall(sched_task_t *task) rpc->call_argc ^= rpc->call_argc; } else { /* reply */ - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); } } } @@ -378,6 +379,12 @@ rxPacket(sched_task_t *task) } len = estlen; + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) { + schedReadSelf(task); + return NULL; + } + #if 0 /* check integrity of packet */ crc = ntohs(rpc->call_crc); @@ -488,7 +495,7 @@ txUDPPacket(sched_task_t *task) buf = AIT_GET_BUF(&c->cli_buf); rpc = (struct tagRPCCall*) buf; - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); /* Go Encapsulate variables */ ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, RPC_RETVARS(c)); @@ -505,6 +512,7 @@ txUDPPacket(sched_task_t *task) } rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -610,6 +618,10 @@ rxUDPPacket(sched_task_t *task) } len = estlen; + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) + goto end; + /* check integrity of packet */ crc = ntohs(rpc->call_crc); rpc->call_crc ^= rpc->call_crc; @@ -677,7 +689,7 @@ txBPFPacket(sched_task_t *task) buf = AIT_GET_BUF(&c->cli_buf); rpc = (struct tagRPCCall*) buf; - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); /* Go Encapsulate variables */ ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, RPC_RETVARS(c)); @@ -694,6 +706,7 @@ txBPFPacket(sched_task_t *task) } rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -746,6 +759,13 @@ rxBPFPacket(sched_task_t *task) eh = (struct ether_header*) (AIT_GET_BUF(&b) + h->bh_hdrlen); rlen -= ETHER_HDR_LEN; rpc = (struct tagRPCCall*) (eh + 1); + +#if 0 + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) + goto end; +#endif + if (eh->ether_type != ntohs(RPC_DEFPORT)) goto end; else @@ -817,9 +837,8 @@ txEXTPacket(sched_task_t *task) rpc_func_t *f = NULL; u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc = (struct tagRPCCall*) buf; - int ret, estlen, wlen = sizeof(struct tagRPCCall); + int ret, len, wlen = sizeof(struct tagRPCCall); struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - struct pollfd pfd; schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], @@ -834,18 +853,18 @@ txEXTPacket(sched_task_t *task) rpc->call_rep.eno = RPC_ERROR(rpc_Errno); } else { /* calc estimated length */ - estlen = ait_resideVars(RPC_RETVARS(c)) + wlen; - if (estlen > AIT_LEN(&c->cli_buf)) - AIT_RE_BUF(&c->cli_buf, estlen); + len = ait_resideVars(RPC_RETVARS(c)) + wlen; + if (len > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, len); buf = AIT_GET_BUF(&c->cli_buf); rpc = (struct tagRPCCall*) buf; - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); /* Go Encapsulate variables */ ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, RPC_RETVARS(c)); /* Free return values */ - ait_freeVars(&c->cli_vars); + ait_freeVars(&RPC_RETVARS(c)); if (ret == -1) { rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); rpc->call_argc ^= rpc->call_argc; @@ -857,29 +876,15 @@ txEXTPacket(sched_task_t *task) } rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; /* send reply */ - pfd.fd = TASK_FD(task); - pfd.events = POLLOUT; - for (; wlen > 0; wlen -= ret, buf += ret) { - if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - if (ret) - LOGERR; - else - rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; - } - ret = write(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf)); - if (ret == -1) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; - } + ret = write(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf)); + if (ret == -1) { + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; } return NULL; @@ -890,32 +895,38 @@ rxEXTPacket(sched_task_t *task) { rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; - int len, rlen, noreply, estlen; - u_char *buf, b[sizeof(struct tagRPCCall)]; - struct tagRPCCall *rpc = (struct tagRPCCall*) b; + int len, rlen, noreply; + struct tagRPCCall *rpc; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - struct pollfd pfd; + ait_val_t b = AIT_VAL_INIT; + sockaddr_t sa; + memset(&sa, 0, sizeof sa); /* receive connect packet */ - rlen = read(TASK_FD(task), b, sizeof b); + AIT_SET_BUF(&b, NULL, srv->srv_netbuf); + rlen = read(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b)); if (rlen < sizeof(struct tagRPCCall)) { rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); goto end; + } else { + rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); + + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) + goto end; } - c = _allocClient(srv, (sockaddr_t*) -1); + c = _allocClient(srv, &sa); if (!c) { EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); usleep(2000); /* blocked client delay */ goto end; } else { - estlen = ntohl(rpc->call_len); - if (estlen > AIT_LEN(&c->cli_buf)) - AIT_RE_BUF(&c->cli_buf, estlen); + len = ntohl(rpc->call_len); + if (len > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, len); + memcpy(AIT_GET_BUF(&c->cli_buf), rpc, AIT_LEN(&c->cli_buf)); rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); - memcpy(rpc, b, sizeof b); - buf = (u_char*) (rpc + 1); - len = estlen; c->cli_sock = TASK_FD(task); @@ -925,31 +936,6 @@ rxEXTPacket(sched_task_t *task) c, ts, c, 0); } - /* get next part of packet */ - memset(buf, 0, len); - pfd.fd = TASK_FD(task); - pfd.events = POLLIN | POLLPRI; - for (; len > 0; len -= rlen, buf += rlen) { - if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - if (rlen) - LOGERR; - else - rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); - schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], - c, 0, NULL, 0); - goto end; - } - rlen = read(TASK_FD(task), buf, len); - if (rlen == -1) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], - c, 0, NULL, 0); - goto end; - } - } - len = estlen; - noreply = RPC_CHK_NOREPLY(rpc); /* check RPC packet session info */ @@ -969,6 +955,7 @@ rxEXTPacket(sched_task_t *task) schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], c, TASK_FD(task), rpc, len); end: + AIT_FREE_VAL(&b); schedReadSelf(task); return NULL; }