--- libaitrpc/src/aitrpc.c 2012/05/19 00:29:50 1.6 +++ libaitrpc/src/aitrpc.c 2013/11/11 22:48:53 1.12 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.c,v 1.6 2012/05/19 00:29:50 misho Exp $ +* $Id: aitrpc.c,v 1.12 2013/11/11 22:48:53 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 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -51,32 +51,51 @@ 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 -inline int +int rpc_GetErrno() { return rpc_Errno; } // rpc_GetError() Get error text of last operation -inline const char * +const char * rpc_GetError() { return rpc_Error; } // rpc_SetErr() Set error to variables for internal use!!! -inline void +void rpc_SetErr(int eno, char *estr, ...) { va_list lst; rpc_Errno = eno; - memset(rpc_Error, 0, STRSIZ); + memset(rpc_Error, 0, sizeof rpc_Error); va_start(lst, estr); - vsnprintf(rpc_Error, STRSIZ, estr, lst); + vsnprintf(rpc_Error, sizeof rpc_Error, estr, lst); va_end(lst); } @@ -88,7 +107,7 @@ rpc_SetErr(int eno, char *estr, ...) * @s = active session * return: -1, 1, 2, 3 are errors or 0 ok */ -inline int +int rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) { if (!p || !s) @@ -96,10 +115,8 @@ rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) if (p->sess_version != s->sess_version) return 1; - if (ntohl(p->sess_program) != s->sess_program) + if (p->sess_instance != s->sess_instance) return 2; - if (p->sess_process != s->sess_process) - return 3; return 0; } @@ -111,15 +128,148 @@ rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s) * @s = host session * return: -1 error or 0 ok */ -inline int +int rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s) { if (!p || !s) return -1; p->sess_version = s->sess_version; - p->sess_program = htonl(s->sess_program); - p->sess_process = s->sess_process; + p->sess_instance = s->sess_instance; return 0; +} + +/* + * rpc_Read() - RPC read operation + * + * @sock = socket + * @type = type of socket + * @flags = receive flags + * @sa = check client address, if you use udp protocol + * @buf = buffer + * @blen = buffer length + * return: -1 error or >-1 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) +{ + struct pollfd pfd; + sockaddr_t sa2; + socklen_t salen; + int ret = 0, len; + + pfd.fd = sock; + pfd.events = POLLIN | POLLPRI; + memset(buf, 0, blen); + 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)) { + LOGERR; + return -1; + } else + ret = recv(sock, buf, len, flags); + if (ret == -1) { + LOGERR; + 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; + 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); + } + + return ret; +} + +/* + * rpc_Write() - RPC write operation + * + * @sock = socket + * @type = type of socket + * @flags = send flags + * @sa = send to client address, if you use udp protocol + * @buf = buffer + * @blen = buffer length + * return: -1 error or >-1 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) +{ + struct pollfd pfd; + int ret = 0, len = 0; + + 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) { + LOGERR; + 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 (ret == -1) { + LOGERR; + return -1; + } else if (ret != blen) { + rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, " + "really sended %d bytes", len, ret); + return -1; + } + + return ret; }