--- libaitrpc/src/cli.c	2011/08/29 22:37:06	1.4
+++ libaitrpc/src/cli.c	2012/07/22 20:44:13	1.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.4 2011/08/29 22:37:06 misho Exp $
+* $Id: cli.c,v 1.11 2012/07/22 20:44:13 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
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,8 @@ SUCH DAMAGE.
 
 
 /*
- * rpc_cli_openBLOBClient() Connect to BLOB Server
+ * rpc_cli_openBLOBClient() - Connect to BLOB Server
+ *
  * @rpccli = RPC Client session
  * @Port = Port for bind server, if Port == 0 default port is selected
  * return: NULL == error or !=NULL connection to BLOB server established
@@ -56,148 +57,125 @@ rpc_cli_t *
 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port)
 {
 	rpc_cli_t *cli = NULL;
-	struct sockaddr sa;
-	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
-	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
 
-	if (!rpccli || 
-			(rpccli->cli_sa.sa_family != AF_INET && rpccli->cli_sa.sa_family != AF_INET6 && 
-			 rpccli->cli_sa.sa_family != AF_LOCAL)) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to BLOB server ...\n");
+	if (!rpccli) {
+		rpc_SetErr(EINVAL, "Invalid parameters can`t connect to BLOB server");
 		return NULL;
 	}
-	if (!Port)
-		Port = RPC_DEFPORT + 1;
 
-	cli = malloc(sizeof(rpc_cli_t));
+	cli = io_malloc(sizeof(rpc_cli_t));
 	if (!cli) {
 		LOGERR;
 		return NULL;
 	} else
 		memcpy(cli, rpccli, sizeof(rpc_cli_t));
 
-	memcpy(&sa, &rpccli->cli_sa, sizeof sa);
-	switch (rpccli->cli_sa.sa_family) {
+	memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(io_sockaddr_t));
+	switch (cli->cli_sa.sa.sa_family) {
 		case AF_INET:
-			sin->sin_port = htons(Port);
-			memcpy(&cli->cli_sa, sin, sizeof(struct sockaddr));
+			cli->cli_sa.sin.sin_port = 
+				htons(Port ? Port : ntohs(cli->cli_sa.sin.sin_port) + 1);
 			break;
 		case AF_INET6:
-			sin6->sin6_port = htons(Port);
-			memcpy(&cli->cli_sa, sin6, sizeof(struct sockaddr));
+			cli->cli_sa.sin6.sin6_port = 
+				htons(Port ? Port : ntohs(cli->cli_sa.sin6.sin6_port) + 1);
 			break;
 		case AF_LOCAL:
-			strlcat(sun->sun_path, ".blob", sizeof sun->sun_path);
-			memcpy(&cli->cli_sa, sun, sizeof(struct sockaddr));
+			strlcat(cli->cli_sa.sun.sun_path, ".blob", sizeof cli->cli_sa.sun.sun_path);
 			break;
+		default:
+			rpc_SetErr(EINVAL, "Invalid socket type %d", cli->cli_sa.sa.sa_family);
+			return NULL;
 	}
 
+	AIT_COPY_VAL(&cli->cli_buf, &rpccli->cli_buf);
+
 	/* connect to BLOB server */
-	cli->cli_sock = socket(cli->cli_sa.sa_family, SOCK_STREAM, 0);
+	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0);
 	if (cli->cli_sock == -1) {
 		LOGERR;
-		free(cli);
+		io_free(cli);
 		return NULL;
 	}
-	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
+	if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
 		LOGERR;
-		free(cli);
+		close(cli->cli_sock);
+		io_free(cli);
 		return NULL;
-	}
+	} else
+		fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
 
 	return cli;
 }
 
 /*
- * rpc_cli_closeBLOBClient() Close connection to BLOB server and free resources
+ * rpc_cli_closeBLOBClient() - Close connection to BLOB server and free resources
+ *
  * @cli = BLOB Client session
  * return: none
  */
 void
-rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli)
+rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
 {
-	if (!cli) {
-		rpc_SetErr(EINVAL, "Error:: Can`t close connection because parameter is null!\n");
+	if (!cli || !*cli)
 		return;
-	}
 
-	shutdown(cli->cli_sock, SHUT_RDWR);
-	close(cli->cli_sock);
+	shutdown((*cli)->cli_sock, SHUT_RDWR);
+	close((*cli)->cli_sock);
 
-	free(cli);
-	cli = NULL;
+	AIT_FREE_VAL(&(*cli)->cli_buf);
+
+	io_free(*cli);
+	*cli = NULL;
 }
 
-// --------------------------------------------------------------
+/* -------------------------------------------------------------- */
 
 /*
- * rpc_cli_openClient() Connect to RPC Server
+ * rpc_cli_openClient() - Connect to RPC Server
+ *
  * @ProgID = ProgramID for RPC session request
  * @ProcID = ProcessID for RPC session request
- * @family = Family socket type, AF_INET or AF_INET6
+ * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
  * @csHost = Host name or IP address for bind server
  * @Port = Port for bind server, if Port == 0 default port is selected
  * return: NULL == error or !=NULL connection to RPC server established
  */
 rpc_cli_t *
-rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short family, const char *csHost, u_short Port)
+rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, u_short Port)
 {
 	rpc_cli_t *cli = NULL;
-	struct hostent *host = NULL;
-	struct sockaddr sa;
-	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
-	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
+	io_sockaddr_t sa = IO_SOCKADDR_INIT;
 
-	if (!csHost || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n");
+	if (!io_gethostbyname(csHost, Port, &sa))
 		return NULL;
-	}
 	if (!Port)
 		Port = RPC_DEFPORT;
-	if (csHost && family != AF_LOCAL) {
-		host = gethostbyname2(csHost, family);
-		if (!host) {
-			rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno));
-			return NULL;
-		}
-	}
-	memset(&sa, 0, sizeof sa);
-	sa.sa_family = family;
-	switch (family) {
-		case AF_INET:
-			sin->sin_len = sizeof(struct sockaddr_in);
-			sin->sin_port = htons(Port);
-			if (csHost)
-				memcpy(&sin->sin_addr, host->h_addr, host->h_length);
-			break;
-		case AF_INET6:
-			sin6->sin6_len = sizeof(struct sockaddr_in6);
-			sin6->sin6_port = htons(Port);
-			if (csHost)
-				memcpy(&sin6->sin6_addr, host->h_addr, host->h_length);
-			break;
-		case AF_LOCAL:
-			sun->sun_len = sizeof(struct sockaddr_un);
-			if (csHost)
-				strlcpy(sun->sun_path, csHost, sizeof sun->sun_path);
-			break;
-		default:
-			rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n");
-			return NULL;
-	}
+	if (netBuf < RPC_MIN_BUFSIZ)
+		netBuf = BUFSIZ;
+	else
+		netBuf = io_align(netBuf, 1);	/* align netBuf length */
 
-	cli = malloc(sizeof(rpc_cli_t));
+#ifdef HAVE_SRANDOMDEV
+	srandomdev();
+#else
+	time_t tim;
+
+	srandom((time(&tim) ^ getpid()));
+#endif
+
+	cli = io_malloc(sizeof(rpc_cli_t));
 	if (!cli) {
 		LOGERR;
 		return NULL;
 	} else
 		memset(cli, 0, sizeof(rpc_cli_t));
-	cli->cli_parent = malloc(sizeof(rpc_sess_t));
+
+	/* build session */
+	cli->cli_parent = io_malloc(sizeof(rpc_sess_t));
 	if (!cli->cli_parent) {
 		LOGERR;
-		free(cli);
+		io_free(cli);
 		return NULL;
 	} else {
 		((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION;
@@ -205,278 +183,234 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short
 		((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID;
 	}
 
-	switch (family) {
-		case AF_INET:
-			memcpy(&cli->cli_sa, sin, sizeof cli->cli_sa);
-			break;
-		case AF_INET6:
-			memcpy(&cli->cli_sa, sin6, sizeof cli->cli_sa);
-			break;
-		case AF_LOCAL:
-			memcpy(&cli->cli_sa, sun, sizeof cli->cli_sa);
-			break;
-	}
+	memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa);
+	AIT_SET_BUF2(&cli->cli_buf, 0, netBuf);
 
 	/* connect to RPC server */
-	cli->cli_sock = socket(family, SOCK_STREAM, 0);
+	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0);
 	if (cli->cli_sock == -1) {
 		LOGERR;
-		free(cli->cli_parent);
-		free(cli);
+		AIT_FREE_VAL(&cli->cli_buf);
+		io_free(cli->cli_parent);
+		io_free(cli);
 		return NULL;
 	}
-	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
+	if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
 		LOGERR;
-		free(cli->cli_parent);
-		free(cli);
+		AIT_FREE_VAL(&cli->cli_buf);
+		close(cli->cli_sock);
+		io_free(cli->cli_parent);
+		io_free(cli);
 		return NULL;
-	}
+	} else
+		fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
 
 	return cli;
 }
 
 /*
- * rpc_cli_closeClient() Close connection to RPC server and free resources
+ * rpc_cli_closeClient() - Close connection to RPC server and free resources
+ *
  * @cli = RPC Client session
  * return: none
  */
 void
-rpc_cli_closeClient(rpc_cli_t * __restrict cli)
+rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
 {
-	if (!cli) {
-		rpc_SetErr(EINVAL, "Error:: Can`t close connection because parameter is null!\n");
+	if (!cli || !*cli)
 		return;
-	}
 
-	shutdown(cli->cli_sock, SHUT_RDWR);
-	close(cli->cli_sock);
+	shutdown((*cli)->cli_sock, SHUT_RDWR);
+	close((*cli)->cli_sock);
 
-	if (cli->cli_parent)
-		free(cli->cli_parent);
-	free(cli);
-	cli = NULL;
+	AIT_FREE_VAL(&(*cli)->cli_buf);
+
+	if ((*cli)->cli_parent)
+		io_free((*cli)->cli_parent);
+
+	io_free(*cli);
+	*cli = NULL;
 }
 
 
 /*
- * rpc_cli_execCall() Execute RPC call
+ * rpc_cli_execCall() - Execute RPC call
+ *
  * @cli = RPC Client session
- * @csModule = Module name, if NULL self binary
- * @csFunc = Function name for execute
- * @in_argc = IN count of arguments
- * @in_vars = IN RPC call array of rpc values
- * @out_argc = OUT returned count of arguments
- * @out_vars = OUT returned array of rpc values, must be free after use (see rpc_cli_freeVals())
+ * @noreply = We not want RPC reply
+ * @tag = Function tag for execution
+ * @in_vars = IN RPC call array of rpc values, may be NULL
+ * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with io_freeVars()
  * return: -1 error or != -1 ok result
  */
 int
-rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, int in_argc, 
-		rpc_val_t * __restrict in_vars, int *out_argc, rpc_val_t ** __restrict out_vars)
+rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, 
+		array_t * __restrict in_vars, array_t ** __restrict out_vars)
 {
-	fd_set fds;
-	u_char buf[BUFSIZ], str[MAXPATHLEN + UCHAR_MAX + 1], *data;
-	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
-	struct tagRPCRet *rrpc = NULL;
-	int ret = 0, Limit = 0;
-	register int i;
-	rpc_val_t *v;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
+	struct tagRPCCall *rpc;
+	int ret = 0, wlen = sizeof(struct tagRPCCall);
+	uint16_t crc;
+	u_char *buf;
+	struct pollfd pfd;
 
-	FD_ZERO(&fds);
-	memset(buf, 0, sizeof buf);
-	memset(str, 0, sizeof str);
-	if (!cli || !csFunc || (in_argc && !in_vars)) {
-		rpc_SetErr(EINVAL, "Error:: Can`t execute call because parameter is null or invalid!\n");
+	if (!cli) {
+		rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!");
 		return -1;
-	}
-	/* build RPC call string for hash */
-	if (csModule)
-		strlcpy((char*) str, csModule, sizeof str);
-	strlcat((char*) str, "__", sizeof str);
-	strlcat((char*) str, csFunc, sizeof str);
+	} else
+		buf = AIT_GET_BUF(&cli->cli_buf);
+	if (out_vars)
+		*out_vars = NULL;
 
 	/* prepare RPC call */
-	memcpy(&rpc->call_session, cli->cli_parent, sizeof rpc->call_session);
-	rpc->call_argc = in_argc;
-	rpc->call_tag = crcFletcher16((u_short*) str, sizeof str / 2);
-	rpc->call_hash = hash_fnv((char*) str, sizeof str);
-	Limit = sizeof(struct tagRPCCall);
-	if (in_argc) {
-		v = (rpc_val_t*) (buf + sizeof(struct tagRPCCall));
-		if (in_argc * sizeof(rpc_val_t) > sizeof buf - Limit) {
-			rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n");
-			return -7;
-		} else
-			Limit += in_argc * sizeof(rpc_val_t);
-		memcpy(v, in_vars, in_argc * sizeof(rpc_val_t));
-		data = (u_char*) v + in_argc * sizeof(rpc_val_t);
-		for (i = 0; i < in_argc && !ret; i++) {
-			switch (in_vars[i].val_type) {
-				case buffer:
-					if (Limit + in_vars[i].val_len > sizeof buf) {
-						ret = -7;
-						break;
-					}
+	rpc = (struct tagRPCCall*) buf;
+	rpc_addPktSession(&rpc->call_session, cli->cli_parent);
+	rpc->call_argc = htons(io_arraySize(in_vars));
+	rpc->call_tag = htons(tag);
+	rpc->call_seq = htons(random() % USHRT_MAX);
 
-					memcpy(data, in_vars[i].val.buffer, in_vars[i].val_len);
-					v[i].val.buffer = (uint8_t*) ((void*) data - (void*) v);
-					data += in_vars[i].val_len;
-					Limit += in_vars[i].val_len;
-					break;
-				case string:
-					if (Limit + in_vars[i].val_len > sizeof buf) {
-						ret = -7;
-						break;
-					}
+	/* set reply */
+	rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY;
 
-					memcpy(data, in_vars[i].val.string, in_vars[i].val_len);
-					v[i].val.string = (int8_t*) ((void*) data - (void*) v);
-					data += in_vars[i].val_len;
-					Limit += in_vars[i].val_len;
-					break;
-				default:
-					break;
-			}
-		}
-		if (ret < 0) {
-			rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n");
-			return ret;
-		}
+	if (io_arraySize(in_vars)) {
+		/* marshaling variables */
+		ret = io_vars2buffer(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, in_vars);
+		if (ret == -1) {
+			rpc_SetErr(EBADRPC, "Failed to prepare RPC packet values");
+			return -1;
+		} else
+			wlen += ret;
 	}
 
-	if ((ret = send(cli->cli_sock, buf, Limit, 0)) == -1) {
-		LOGERR;
-		return -1;
-	}
-	if (ret != Limit) {
-		rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, really is %d\n", 
-				Limit, ret);
-		return -9;
-	}
+	/* total packet length */
+	rpc->call_len = htons(wlen);
 
-	FD_SET(cli->cli_sock, &fds);
-	if ((ret = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) < 1) {
+	/* calculate CRC */
+	rpc->call_crc ^= rpc->call_crc;
+	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
+
+	pfd.fd = cli->cli_sock;
+	pfd.events = POLLOUT;
+	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
+			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 		if (ret)
 			LOGERR;
 		else
-			rpc_SetErr(ETIMEDOUT, "Error:: timeout, no return from RPC server?\n");
+			rpc_SetErr(ETIMEDOUT, "Timeout, can't send to RPC server");
+		return -1;
+	}
+	do {
+		if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {
+			if (errno == EAGAIN)
+				continue;
+			LOGERR;
+			return -1;
+		} else if (ret != wlen) {
+			rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, "
+					"really sended %d bytes", wlen, ret);
+			return -1;
+		}
+	} while (0);
 
+	if (noreply)	/* we not want reply */
+		return 0;
+
+	wlen = 0;
+	/* reply from RPC server */
+	pfd.events = POLLIN | POLLPRI;
+	do {
+		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			if (ret)
+				LOGERR;
+			else {
+				if (wlen++ < 7)
+					continue;
+				else
+					rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server");
+			}
+			return -1;
+		}
+	} while (0);
+	do {
+		memset(buf, 0, AIT_LEN(&cli->cli_buf));
+		if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) {
+			if (ret) {
+				if (errno == EAGAIN)
+					continue;
+				else
+					LOGERR;
+			}
+			return -1;
+		}
+	} while (0);
+	if (ret < sizeof(struct tagRPCCall)) {
+		rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
 		return -1;
 	}
-	memset(buf, 0, sizeof buf);
-	if ((ret = recv(cli->cli_sock, buf, sizeof buf, 0)) == -1) {
-		LOGERR;
-		return -3;
+
+	/* calculate CRC */
+	crc = ntohs(rpc->call_crc);
+	rpc->call_crc ^= rpc->call_crc;
+	if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) {
+		rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
+		return -1;
 	}
-	if (!ret)	/* receive EOF! */
-		return 0;
-	if (ret < sizeof(struct tagRPCRet)) {
-		rpc_SetErr(EMSGSIZE, "Error:: too short RPC packet ...\n");
-		return -4;
-	} else
-		rrpc = (struct tagRPCRet*) buf;
+
 	/* check RPC packet session info */
-	if (memcmp(&rrpc->ret_session, cli->cli_parent, sizeof rrpc->ret_session)) {
-		rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n");
-		return -5;
+	if (rpc_chkPktSession(&rpc->call_session, cli->cli_parent)) {
+		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
+		return -1;
 	} else
-		Limit = sizeof(struct tagRPCRet);
-	if (rrpc->ret_retcode < 0 && rrpc->ret_errno) {
-		rpc_SetErr(rrpc->ret_errno, "Error::Server side: %d %s\n", 
-				rrpc->ret_retcode, strerror(rrpc->ret_errno));
-		return -6;
+		wlen = sizeof(struct tagRPCCall);
+	if (ntohs(rpc->call_tag) != tag) {
+		rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply");
+		return -1;
 	}
-	if (rrpc->ret_argc * sizeof(rpc_val_t) > sizeof buf - Limit) {
-		rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too long ...\n");
-		return -7;
-	} else
-		Limit += rrpc->ret_argc * sizeof(rpc_val_t);
-	/* RPC is OK! Go decapsulate variables ... */
-	if (rrpc->ret_argc) {
-		*out_argc = rrpc->ret_argc;
-		*out_vars = calloc(rrpc->ret_argc, sizeof(rpc_val_t));
+	if (ntohl(rpc->call_rep.eno) && ntohl(rpc->call_rep.ret) == -1) {
+		rpc_SetErr(ntohl(rpc->call_rep.eno), "Server side: retcode=%d #%d %s", 
+				ntohl(rpc->call_rep.ret), ntohl(rpc->call_rep.eno), 
+				strerror(ntohl(rpc->call_rep.eno)));
+		return -1;
+	}
+	if (ntohs(rpc->call_argc) * sizeof(ait_val_t) > AIT_LEN(&cli->cli_buf) - wlen) {
+		rpc_SetErr(EMSGSIZE, "Reply RPC packet is too long ...");
+		return -1;
+	}
+
+	/* RPC is OK! Go de-marshaling variables ... */
+	if (out_vars && ntohs(rpc->call_argc)) {
+		*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, 
+				ntohs(rpc->call_argc), 0);
 		if (!*out_vars) {
-			LOGERR;
-			*out_argc = 0;
+			rpc_SetErr(io_GetErrno(), "%s", io_GetError());
 			return -1;
-		} else
-			memcpy(*out_vars, buf + sizeof(struct tagRPCRet), Limit - sizeof(struct tagRPCRet));
-		/* RPC received variables types OK! */
-		data = (u_char*) buf + Limit;
-		for (i = 0; i < rrpc->ret_argc; i++)
-			switch ((*out_vars)[i].val_type) {
-				case buffer:
-					if ((*out_vars)[i].val_len > sizeof buf - Limit) {
-						rpc_SetErr(EMSGSIZE, "Error:: Too long RPC packet ...\n");
-						free(*out_vars);
-						*out_vars = NULL;
-						*out_argc = 0;
-						return -7;
-					} else
-						Limit += (*out_vars)[i].val_len;
-
-					(*out_vars)[i].val.buffer = malloc((*out_vars)[i].val_len);
-					if (!(*out_vars)[i].val.buffer) {
-						rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n");
-						free(*out_vars);
-						*out_vars = NULL;
-						*out_argc = 0;
-						return -1;
-					} else
-						memcpy((*out_vars)[i].val.buffer, data, (*out_vars)[i].val_len);
-				       	data += (*out_vars)[i].val_len;
-					break;
-				case string:
-					if ((*out_vars)[i].val_len > sizeof buf - Limit) {
-						rpc_SetErr(EMSGSIZE, "Error:: Too long RPC packet ...\n");
-						free(*out_vars);
-						*out_vars = NULL;
-						*out_argc = 0;
-						return -7;
-					} else
-						Limit += (*out_vars)[i].val_len;
-
-					(*out_vars)[i].val.string = malloc((*out_vars)[i].val_len);
-					if (!(*out_vars)[i].val.string) {
-						rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n");
-						free(*out_vars);
-						*out_vars = NULL;
-						*out_argc = 0;
-						return -1;
-					} else
-						memcpy((*out_vars)[i].val.string, data, (*out_vars)[i].val_len);
-				       	data += (*out_vars)[i].val_len;
-					break;
-				default:
-					break;
-			}
-	} else {
-		if (out_argc)
-			*out_argc = 0;
-		if (out_vars)
-			*out_vars = NULL;
+		}
 	}
 
-	return rrpc->ret_retcode;
+	ret = ntohl(rpc->call_rep.ret);
+	return ret;
 }
 
 /*
- * rpc_cli_freeVals() Free rpc_val_t array returned from RPC call
- * @args = Number of arguments in array
- * @vars = Value elements
- * return: none
+ * rpc_cli_ping() - Ping RPC server
+ *
+ * @cli = connected client
+ * return: -1 error or !=-1 ping seq id
  */
-inline void
-rpc_cli_freeVals(int args, rpc_val_t *vars)
+inline int
+rpc_cli_ping(rpc_cli_t *cli)
 {
-	register int i;
+	int ret = 0;
+	array_t *arr = NULL;
 
-	if (!vars)
-		return;
+	if (!cli)
+		return -1;
 
-	for (i = 0; i < args; i++)
-		RPC_FREE_VAL(&vars[i]);
+	if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr))
+		return -1;
+	else
+		ret = AIT_GET_U16(io_array(arr, 0, ait_val_t*));
+	io_freeVars(&arr);
 
-	free(vars);
-	vars = NULL;
+	return ret;
 }