--- libaitrpc/src/aitrpc.c 2015/05/18 15:09:59 1.18 +++ libaitrpc/src/aitrpc.c 2015/07/22 20:01:46 1.20 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.c,v 1.18 2015/05/18 15:09:59 misho Exp $ +* $Id: aitrpc.c,v 1.20 2015/07/22 20:01:46 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -51,25 +51,6 @@ SUCH DAMAGE. int rpc_Errno; char rpc_Error[STRSIZ]; -inline int -rpc_funcs_cmp(struct tagRPCFunc *a, struct tagRPCFunc *b) -{ - int ret; - - assert(a && b); - - ret = AIT_KEY(&a->func_name) - AIT_KEY(&b->func_name); - - if (ret < 0) - return -1; - else if (ret > 0) - return 1; - - return ret; -} - -AVL_GENERATE(tagRPCFuncs, tagRPCFunc, func_node, rpc_funcs_cmp); - #pragma GCC visibility pop // rpc_GetErrno() Get error code of last operation @@ -156,142 +137,140 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _ struct pollfd pfd; sockaddr_t sa2; socklen_t salen; - int ret = 0, len, hlen, cx = 0; - ait_val_t v = AIT_VAL_INIT; + int ret = 0, hlen, cx = 0; struct ether_header *eh; struct bpf_hdr *h; ether_addr_t bcst = {{ [0 ... sizeof bcst - 1] = 0xff }}; u_char *buf = AIT_GET_BUF(pkt); size_t blen = AIT_LEN(pkt); struct tagRPCCall *rpc = (struct tagRPCCall *) buf; + ait_val_t v = AIT_VAL_INIT; - if (type == SOCK_BPF && sa) { - AIT_SET_BUF(&v, NULL, blen); - h = (struct bpf_hdr*) AIT_GET_BUF(&v); - } - +try2read: pfd.fd = sock; pfd.events = POLLIN | POLLPRI; memset(buf, 0, blen); memset(&sa2, 0, sizeof sa2); - salen = sa2.ss.ss_len = sizeof(sockaddr_t); + salen = sa2.ss.ss_len = (u_char) MIN(sizeof(sockaddr_t), 0xff); + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (ret) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + return -1; + } - for (len = blen; len > 0; len -= 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! Server not respond"); - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); - return -1; - } - if (type == SOCK_STREAM) - ret = recv(sock, buf, len, flags); - else if (type == SOCK_EXT) - ret = read(sock, buf, len); - else if (type == SOCK_BPF && sa) { + switch (type) { + case SOCK_STREAM: + ret = recv(sock, buf, blen, flags); + break; + case SOCK_EXT: + ret = read(sock, buf, blen); + break; + case SOCK_BPF: + if (!sa) { + rpc_SetErr(EINVAL, "Invalid argument(s)!"); + return -1; + } + + AIT_SET_BUF(&v, NULL, blen); + h = (struct bpf_hdr*) AIT_GET_BUF(&v); + ret = read(sock, AIT_GET_BUF(&v), AIT_LEN(&v)); if (ret > 0) { ret -= h->bh_hdrlen; if (ret < h->bh_caplen || h->bh_caplen != h->bh_datalen || ret < ETHER_HDR_LEN + sizeof(struct tagRPCCall)) { + AIT_FREE_VAL(&v); if (cx < 3) { cx++; ret ^= ret; - continue; /* wait for known address */ - } else { - AIT_FREE_VAL(&v); + goto try2read; /* wait for known address */ + } else return -1; - } } ret = h->bh_caplen; eh = (struct ether_header*) (AIT_GET_BUF(&v) + h->bh_hdrlen); ret -= ETHER_HDR_LEN; if (eh->ether_type != ntohs(RPC_DEFPORT)) { + AIT_FREE_VAL(&v); if (cx < 3) { cx++; ret ^= ret; - continue; /* wait for known address */ - } else { - AIT_FREE_VAL(&v); + goto try2read; /* wait for known address */ + } else return -1; - } } if (!memcmp(bcst.octet, eh->ether_dhost, sizeof bcst) || !memcmp(bcst.octet, eh->ether_shost, sizeof bcst)) { + AIT_FREE_VAL(&v); if (cx < 3) { cx++; ret ^= ret; - continue; /* wait for known address */ - } else { - AIT_FREE_VAL(&v); + goto try2read; /* wait for known address */ + } else return -1; - } } - memcpy(buf, (u_char*) (eh + 1), MIN(ret, len)); + memcpy(buf, (u_char*) (eh + 1), MIN(ret, blen)); AIT_FREE_VAL(&v); - return ret; } - } else { - ret = recvfrom(sock, buf, len, flags, &sa2.sa, &salen); - if (ret > -1 && sa && e_addrcmp(sa, &sa2, 42)) { + break; + case SOCK_RAW: + case SOCK_DGRAM: + if (!sa) { + rpc_SetErr(EINVAL, "Invalid argument(s)!"); + return -1; + } + + ret = recvfrom(sock, buf, blen, flags, &sa2.sa, &salen); + if (ret > -1 && e_addrcmp(sa, &sa2, 42)) { if (cx < 3) { cx++; ret ^= ret; - continue; /* wait for known address */ + goto try2read; /* wait for known address */ } else return -1; } - } - if (ret < 0) { - LOGERR; - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); + break; + default: + rpc_SetErr(EINVAL, "Invalid argument(s)!"); return -1; - } - if (!ret) { /* EOF */ - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); - return 0; - } + } + if (ret < 0) { + LOGERR; + return -1; + } + if (!ret) /* EOF */ + return 0; - /* check RPC packet header */ - if ((u_char*) rpc == buf) { - if (type == SOCK_RAW) { - hlen = sa->sa.sa_family == AF_INET ? sizeof(struct ip) : sizeof(struct ip6_hdr); - ret -= hlen; - if (ret > 0) - memmove(buf, buf + hlen, blen - hlen); - } + /* check RPC packet header */ + if (type == SOCK_RAW) { + hlen = sa->sa.sa_family == AF_INET ? + sizeof(struct ip) : sizeof(struct ip6_hdr); + ret -= hlen; + if (ret > 0) + memmove(buf, buf + hlen, blen - hlen); + } - /* 1st read for RPC header */ - if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); - return -1; - } - /* check for loop request */ - if (!(rpc->call_io & RPC_ACK)) { - ret ^= ret; - continue; - } - /* calc estimated length */ - blen = len = ntohl(rpc->call_len); - if (blen > AIT_LEN(pkt)) { - AIT_RE_BUF(pkt, blen); - buf = AIT_GET_BUF(pkt); - rpc = (struct tagRPCCall*) buf; - } + /* 1st read for RPC header */ + if (ret < sizeof(struct tagRPCCall) || ret < ntohl(rpc->call_len)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); + return -1; + } + /* check for loop request */ + if (!(rpc->call_io & RPC_ACK)) { + if (cx < 3) { + cx++; + ret ^= ret; + goto try2read; /* wait for known address */ + } else { + rpc_SetErr(ERPCMISMATCH, "Loop in RPC communication"); + return -1; } } - ret = blen - len; - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); return ret; } @@ -311,73 +290,84 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * ait_val_t * __restrict pkt, size_t blen) { struct pollfd pfd; - int ret = 0, len = 0; + int ret = 0; + u_char *buf = AIT_GET_BUF(pkt); ait_val_t v = AIT_VAL_INIT; struct ether_header *eh; - u_char *buf = AIT_GET_BUF(pkt); - if (type == SOCK_BPF && sa) { - AIT_SET_BUF(&v, NULL, blen + sizeof(struct ether_header)); - eh = (struct ether_header*) AIT_GET_BUF(&v); - memcpy(eh->ether_dhost, LLADDR(&sa->sdl), ETHER_ADDR_LEN); - eh->ether_type = htons(RPC_DEFPORT); - memcpy(eh + 1, buf, blen); - blen += sizeof(struct ether_header); - } pfd.fd = sock; pfd.events = POLLOUT; - for (len = blen; len > 0; len -= ret, buf += ret) { - if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { -#if 0 - if (!ret) - continue; -#endif - if (ret > 0) - rpc_SetErr(EPIPE, "Disconnected RPC session\n"); - else - LOGERR; - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); - return -1; - } - if (type == SOCK_STREAM) - ret = send(sock, buf, len, flags); - else if (type == SOCK_EXT) - ret = write(sock, buf, len); - else if (type == SOCK_BPF && sa) { + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (ret > 0) + rpc_SetErr(EPIPE, "Disconnected RPC session\n"); + else + LOGERR; + return -1; + } + + switch (type) { + case SOCK_STREAM: + ret = send(sock, buf, blen, flags); + break; + case SOCK_EXT: + ret = write(sock, buf, blen); + break; + case SOCK_BPF: + if (!sa) { + rpc_SetErr(EINVAL, "Invalid argument(s)!"); + return -1; + } + + AIT_SET_BUF(&v, NULL, blen + sizeof(struct ether_header)); + eh = (struct ether_header*) AIT_GET_BUF(&v); + memcpy(eh->ether_dhost, LLADDR(&sa->sdl), ETHER_ADDR_LEN); + eh->ether_type = htons(RPC_DEFPORT); + memcpy(eh + 1, buf, blen); + blen += sizeof(struct ether_header); + ret = write(sock, AIT_GET_BUF(&v), AIT_LEN(&v)); - } else if (sa) - ret = sendto(sock, buf, len, flags, &sa->sa, sa->sa.sa_len); - else { + + AIT_FREE_VAL(&v); + break; + case SOCK_RAW: + case SOCK_DGRAM: + if (!sa) { + rpc_SetErr(EINVAL, "Invalid argument(s)!"); + return -1; + } + + ret = sendto(sock, buf, blen, flags, &sa->sa, sa->sa.sa_len); + break; + default: rpc_SetErr(EINVAL, "Invalid argument(s)!"); - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); return -1; - } - if (ret < 0) { - LOGERR; - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); - return -1; - } - if (!ret) { /* EOF */ - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); - return 0; - } } - ret = blen - len; + if (ret < 0) { + LOGERR; + return -1; + } + if (!ret) /* EOF */ + return 0; + if (ret != blen) { rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, " "really sended %d bytes", blen, ret); - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); return -1; } - if (type == SOCK_BPF) - AIT_FREE_VAL(&v); return ret; +} + +/* + * rpc_pktFreeSpace() - Get free space for payload into RPC packet + * + * @c = RPC client + * return: remains free bytes from packet + */ +size_t +rpc_pktFreeSpace(rpc_cli_t * __restrict c) +{ + return (sizeof(struct tagRPCCall) + ait_resideVars(RPC_RETVARS(c))); }