--- libaitrpc/src/aitrpc.c	2011/08/29 22:37:06	1.3
+++ libaitrpc/src/aitrpc.c	2013/12/15 23:01:02	1.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.c,v 1.3 2011/08/29 22:37:06 misho Exp $
+* $Id: aitrpc.c,v 1.14 2013/12/15 23:01:02 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 <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -48,39 +48,209 @@ SUCH DAMAGE.
 
 #pragma GCC visibility push(hidden)
 
-// ------------------------------------------------
-
 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);
 }
 
-// ------------------------------------------------------------
 
+/*
+ * rpc_chkPktSession() - Check RPC session
+ *
+ * @p = packet session
+ * @s = active session
+ * return: -1, 1, 2, 3 are errors or 0 ok
+ */
+int
+rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s)
+{
+	if (!p || !s)
+		return -1;
+
+	if (p->sess_version != s->sess_version)
+		return 1;
+	if (p->sess_instance != s->sess_instance)
+		return 2;
+
+	return 0;
+}
+
+/*
+ * rpc_addPktSession() - Prepare session into network format
+ *
+ * @p = packet session
+ * @s = host session
+ * return: -1 error or 0 ok
+ */
+int
+rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s)
+{
+	if (!p || !s)
+		return -1;
+
+	p->sess_version = s->sess_version;
+	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, 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)
+{
+	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);
+
+	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");
+			return -1;
+		}
+		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;
+			}
+		}
+		if (ret == -1) {
+			LOGERR;
+			return -1;
+		}
+		if (!ret)	/* EOF */
+			return 0;
+	}
+	ret = blen - len;
+
+	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, 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)
+{
+	struct pollfd pfd;
+	int ret = 0, len = 0;
+
+	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;
+			return -1;
+		}
+		if (type == SOCK_STREAM)
+			ret = send(sock, buf, len, flags);
+		else if (sa)
+			ret = sendto(sock, buf, len, flags, &sa->sa, sa->sa.sa_len);
+		else {
+			rpc_SetErr(EINVAL, "Invalid argument(s)!");
+			return -1;
+		}
+		if (ret == -1) {
+			LOGERR;
+			return -1;
+		}
+		if (!ret)	/* EOF */
+			return 0;
+	}
+	ret = blen - len;
+	if (ret != blen) {
+		rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, "
+				"really sended %d bytes", len, ret);
+		return -1;
+	}
+
+	return ret;
+}