--- libaitrpc/src/aitrpc.c 2014/12/11 01:15:34 1.15.6.1 +++ libaitrpc/src/aitrpc.c 2015/05/18 14:50:12 1.17.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.c,v 1.15.6.1 2014/12/11 01:15:34 misho Exp $ +* $Id: aitrpc.c,v 1.17.2.2 2015/05/18 14:50:12 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2014 +Copyright 2004 - 2015 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -147,19 +147,29 @@ rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s) * @type = type of socket * @flags = receive flags * @sa = check client address, if you use udp protocol - * @buf = buffer - * @blen = buffer length + * @pkt = RPC packet * return: -1 error, 0 EOF or or >0 readed bytes into buffer */ ssize_t -rpc_Read(int sock, int type, int flags, sockaddr_t * __restrict sa, - u_char * __restrict buf, size_t blen) +rpc_Read(int sock, int type, int flags, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt) { struct pollfd pfd; sockaddr_t sa2; socklen_t salen; - int ret = 0, len; + int ret = 0, len, hlen, cx = 0; + ait_val_t v = AIT_VAL_INIT; + 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; + if (type == SOCK_BPF && sa) { + AIT_SET_BUF(&v, NULL, blen); + h = (struct bpf_hdr*) AIT_GET_BUF(&v); + } + pfd.fd = sock; pfd.events = POLLIN | POLLPRI; memset(buf, 0, blen); @@ -167,33 +177,128 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _ salen = sa2.ss.ss_len = sizeof(sockaddr_t); for (len = blen; len > 0; len -= ret, buf += ret) { + printf("%s_0. buf=%p len=%d\n", __func__, buf, len); 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 { + else if (type == SOCK_EXT) + ret = read(sock, buf, len); + else if (type == SOCK_BPF && sa) { + 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)) { + if (cx < 3) { + cx++; + ret ^= ret; + continue; /* wait for known address */ + } else { + AIT_FREE_VAL(&v); + 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)) { + if (cx < 3) { + cx++; + ret ^= ret; + continue; /* wait for known address */ + } else { + AIT_FREE_VAL(&v); + return -1; + } + } + + if (!memcmp(bcst.octet, eh->ether_dhost, sizeof bcst) || + !memcmp(bcst.octet, eh->ether_shost, sizeof bcst)) { + if (cx < 3) { + cx++; + ret ^= ret; + continue; /* wait for known address */ + } else { + AIT_FREE_VAL(&v); + return -1; + } + } + memcpy(buf, (u_char*) (eh + 1), MIN(ret, len)); + 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)) { - rpc_SetErr(ERPCMISMATCH, - "Received RPC response from unknown address"); - return -1; + if (cx < 3) { + cx++; + ret ^= ret; + continue; /* wait for known address */ + } else + return -1; } } - if (ret == -1) { + if (ret < 0) { LOGERR; + if (type == SOCK_BPF) + AIT_FREE_VAL(&v); return -1; } - if (!ret) /* EOF */ + if (!ret) { /* EOF */ + if (type == SOCK_BPF) + AIT_FREE_VAL(&v); return 0; + } + + /* check RPC packet header */ + if ((u_char*) rpc == buf) { + if (type == SOCK_RAW) { + printf("raw: ret=%d\n", ret); + hlen = sa->sa.sa_family == AF_INET ? sizeof(struct ip) : sizeof(struct ip6_hdr); + ret -= hlen; + printf("raw-cx: ret=%d\n", ret); + if (ret > 0) + memmove(buf, buf + hlen, blen - hlen); + printf("%s ret=%d call_io=0x%x call_len=%d call_seq=%u\n", __func__, ret, rpc->call_io, ntohl(rpc->call_len), ntohl(rpc->call_seq)); + fflush(stdout); + } + + /* 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); + printf("blen=%d len=%d ret=%d\n", blen, len, ret); + if (blen > AIT_LEN(pkt)) { + AIT_RE_BUF(pkt, blen); + buf = AIT_GET_BUF(pkt); + rpc = (struct tagRPCCall*) buf; + } + } } ret = blen - len; + if (type == SOCK_BPF) + AIT_FREE_VAL(&v); + printf("exit from %s with ret=%d\n", __func__, ret); return ret; } @@ -204,18 +309,19 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _ * @type = type of socket * @flags = send flags * @sa = send to client address, if you use udp protocol - * @buf = buffer + * @pkt = RPC packet * @blen = buffer length * return: -1 error, 0 EOF or >0 written bytes into buffer */ ssize_t rpc_Write(int sock, int type, int flags, sockaddr_t * __restrict sa, - u_char * __restrict buf, size_t blen) + ait_val_t * __restrict pkt, size_t blen) { struct pollfd pfd; int ret = 0, len = 0; 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)); @@ -245,6 +351,8 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * } 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) { ret = write(sock, AIT_GET_BUF(&v), AIT_LEN(&v)); } else if (sa) @@ -255,7 +363,7 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * AIT_FREE_VAL(&v); return -1; } - if (ret == -1) { + if (ret < 0) { LOGERR; if (type == SOCK_BPF) AIT_FREE_VAL(&v);