--- libaitrpc/src/srv.c 2015/05/18 15:09:59 1.26 +++ libaitrpc/src/srv.c 2015/06/24 22:44:24 1.26.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.26 2015/05/18 15:09:59 misho Exp $ +* $Id: srv.c,v 1.26.2.3 2015/06/24 22:44:24 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -669,7 +669,6 @@ txRAWPacket(sched_task_t *task) struct tagRPCCall *rpc = (struct tagRPCCall*) buf; int ret, estlen, 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], @@ -714,28 +713,13 @@ txRAWPacket(sched_task_t *task) rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); /* 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 = sendto(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL, - &c->cli_sa.sa, c->cli_sa.sa.sa_len); - if (ret == -1) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; - } + ret = sendto(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL, + &c->cli_sa.sa, c->cli_sa.sa.sa_len); + 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; @@ -746,40 +730,60 @@ rxRAWPacket(sched_task_t *task) { rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; - int len, rlen, noreply, estlen; + int len, rlen, noreply; u_short crc; - u_char *buf, b[sizeof(struct ip6_hdr) + sizeof(struct tagRPCCall)]; struct tagRPCCall *rpc; sockaddr_t sa; socklen_t salen; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - struct pollfd pfd; + ait_val_t b = AIT_VAL_INIT; /* receive connect packet */ + AIT_SET_BUF(&b, NULL, srv->srv_netbuf); salen = sa.ss.ss_len = sizeof(sockaddr_t); - rlen = recvfrom(TASK_FD(task), b, sizeof b, MSG_PEEK, &sa.sa, &salen); - if (rlen < sizeof(struct ip) + sizeof(struct tagRPCCall)) { + rlen = recvfrom(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b), 0, &sa.sa, &salen); + if (sa.sa.sa_family == AF_INET) { + struct ip *h; + h = (struct ip*) AIT_GET_BUF(&b); + if (rlen < ntohs(h->ip_len) || h->ip_p != IPPROTO_ERPC) + goto end; + else { + rlen -= sizeof(struct ip); + rpc = (struct tagRPCCall*) + (AIT_GET_BUF(&b) + sizeof(struct ip)); + } + } else { + struct ip6_hdr *h; + h = (struct ip6_hdr*) AIT_GET_BUF(&b); + if (rlen < (ntohs(h->ip6_plen) + sizeof(struct ip6_hdr)) || + h->ip6_nxt != IPPROTO_ERPC) + goto end; + else { + rlen -= sizeof(struct ip6_hdr); + rpc = (struct tagRPCCall*) + (AIT_GET_BUF(&b) + sizeof(struct ip6_hdr)); + } + } + if (rlen < sizeof(struct tagRPCCall)) { rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); goto end; } + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) + goto end; + 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 = sa.sa.sa_family == AF_INET ? - sizeof(struct ip) : sizeof(struct ip6_hdr); - rpc = (struct tagRPCCall*) (b + estlen); - estlen += ntohl(rpc->call_len); - if (estlen > AIT_LEN(&c->cli_buf)) - AIT_RE_BUF(&c->cli_buf, estlen); - rpc = (struct tagRPCCall*) (AIT_GET_BUF(&c->cli_buf) + - (sa.sa.sa_family == AF_INET ? - sizeof(struct ip) : sizeof(struct ip6_hdr))); - buf = AIT_GET_BUF(&c->cli_buf); - len = 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, len); + rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); c->cli_sock = TASK_FD(task); memcpy(&c->cli_sa, &sa, sizeof c->cli_sa); @@ -790,42 +794,6 @@ rxRAWPacket(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; - } - salen = sa.ss.ss_len = sizeof(sockaddr_t); - rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa.sa, &salen); - if (rlen == -1) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], - c, 0, NULL, 0); - goto end; - } - if (e_addrcmp(&c->cli_sa, &sa, 42)) - rlen ^= rlen; /* skip if arrive from different address */ - } - len = estlen; - len -= sa.sa.sa_family == AF_INET ? - sizeof(struct ip) : sizeof(struct ip6_hdr); - memmove(AIT_GET_BUF(&c->cli_buf), rpc, len); - rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); - - /* 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; @@ -856,6 +824,7 @@ rxRAWPacket(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; } @@ -985,7 +954,7 @@ rxBPFPacket(sched_task_t *task) 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)); + memcpy(AIT_GET_BUF(&c->cli_buf), rpc, len); rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); c->cli_sock = TASK_FD(task); @@ -1610,10 +1579,10 @@ rpc_srv_initServer(u_char InstID, int concurentClients rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); return NULL; } + if (!Port && proto < SOCK_RAW) + Port = RPC_DEFPORT; if (!e_gethostbyname(csHost, Port, &sa)) return NULL; - if (!Port) - Port = RPC_DEFPORT; if (!proto) proto = SOCK_STREAM; if (netBuf < RPC_MIN_BUFSIZ)