--- libaitrpc/src/aitrpc.c 2013/11/11 22:48:53 1.12 +++ libaitrpc/src/aitrpc.c 2014/12/11 01:15:34 1.15.6.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.c,v 1.12 2013/11/11 22:48:53 misho Exp $ +* $Id: aitrpc.c,v 1.15.6.1 2014/12/11 01:15:34 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -149,7 +149,7 @@ rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s) * @sa = check client address, if you use udp protocol * @buf = buffer * @blen = buffer length - * return: -1 error or >-1 readed bytes into buffer + * 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, @@ -166,39 +166,33 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _ memset(&sa2, 0, sizeof sa2); salen = sa2.ss.ss_len = sizeof(sockaddr_t); - if (type == SOCK_STREAM) { - for (len = blen; len > 0; len -= ret, buf += ret) { - if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + 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; - return -1; - } else - ret = recv(sock, buf, len, flags); - if (ret == -1) { - LOGERR; - return -1; - } + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + return -1; } - if (ret > -1) - ret = blen - len; - } else { - do { - if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - LOGERR; + if (type == SOCK_STREAM) + ret = recv(sock, buf, len, flags); + 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; - } else - ret = recvfrom(sock, buf, blen, flags, &sa2.sa, &salen); - if (ret < 0) { - LOGERR; - return -1; } - if (e_addrcmp(sa, &sa2, 42)) - rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address"); - else - break; - } while (42); + } + if (ret == -1) { + LOGERR; + return -1; + } + if (!ret) /* EOF */ + return 0; } + ret = blen - len; return ret; } @@ -212,7 +206,7 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _ * @sa = send to client address, if you use udp protocol * @buf = buffer * @blen = buffer length - * return: -1 error or >-1 written bytes into buffer + * 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, @@ -220,56 +214,69 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * { struct pollfd pfd; int ret = 0, len = 0; + ait_val_t v = AIT_VAL_INIT; + struct ether_header *eh; + 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; - - if (type == SOCK_STREAM) { - 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) - continue; - if (ret > 0) - rpc_SetErr(EPIPE, "Disconnected RPC session\n"); - else - LOGERR; - return -1; - } else - ret = send(sock, buf, len, flags); - if (ret == -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 0 + if (!ret) + continue; +#endif + if (ret > 0) + rpc_SetErr(EPIPE, "Disconnected RPC session\n"); + else LOGERR; - return -1; - } + if (type == SOCK_BPF) + AIT_FREE_VAL(&v); + return -1; } - if (ret > -1) - ret = blen - len; - } else if (sa) { - do { - if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - if (!ret) - continue; - if (ret > 0) - rpc_SetErr(EPIPE, "Disconnected RPC session\n"); - else - LOGERR; - return -1; - } else - ret = sendto(sock, buf, blen, flags, &sa->sa, sa->sa.sa_len); - } while (0); - } else { - rpc_SetErr(EINVAL, "Invalid argument(s)!"); - return -1; + if (type == SOCK_STREAM) + ret = send(sock, buf, len, flags); + else if (type == SOCK_BPF && sa) { + 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 { + rpc_SetErr(EINVAL, "Invalid argument(s)!"); + if (type == SOCK_BPF) + AIT_FREE_VAL(&v); + return -1; + } + if (ret == -1) { + LOGERR; + if (type == SOCK_BPF) + AIT_FREE_VAL(&v); + return -1; + } + if (!ret) { /* EOF */ + if (type == SOCK_BPF) + AIT_FREE_VAL(&v); + return 0; + } } - if (ret == -1) { - LOGERR; - return -1; - } else if (ret != blen) { + ret = blen - len; + if (ret != blen) { rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, " - "really sended %d bytes", len, ret); + "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; }