--- libaitrpc/src/cli.c	2011/09/07 07:24:21	1.5
+++ libaitrpc/src/cli.c	2024/03/20 17:32:31	1.29
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.5 2011/09/07 07:24:21 misho Exp $
+* $Id: cli.c,v 1.29 2024/03/20 17:32:31 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 - 2024
 	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,428 +57,804 @@ 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;
 	int n;
 
-	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 = e_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 cli->cli_sa);
+	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);
+	n = AIT_LEN(&cli->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);
+		e_free(cli);
 		return NULL;
 	}
-	n = cli->cli_netbuf;
 	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
 		LOGERR;
 		close(cli->cli_sock);
-		free(cli);
+		e_free(cli);
 		return NULL;
 	}
 	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
 		LOGERR;
 		close(cli->cli_sock);
-		free(cli);
+		e_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, e_addrlen(&cli->cli_sa)) == -1) {
 		LOGERR;
 		close(cli->cli_sock);
-		free(cli);
+		e_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);
+
+	e_free(*cli);
+	*cli = NULL;
 }
 
-// --------------------------------------------------------------
+/* -------------------------------------------------------------- */
 
 /*
- * rpc_cli_openClient() Connect to RPC Server
- * @ProgID = ProgramID for RPC session request
- * @ProcID = ProcessID for RPC session request
- * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
- * @family = Family socket type, AF_INET or AF_INET6
+ * rpc_cli_openClient() - Connect to RPC Server
+ *
+ * @InstID = InstID for RPC session request
+ * @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
+ * @proto = Protocol, if == 0 choose SOCK_STREAM
  * return: NULL == error or !=NULL connection to RPC server established
  */
 rpc_cli_t *
-rpc_cli_openClient(u_int ProgID, u_int ProcID, int netBuf, u_short family, const char *csHost, u_short Port)
+rpc_cli_openClient(u_char InstID, int netBuf, const char *csHost, u_short Port, int proto)
 {
+	int n = 1;
 	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;
-	int n;
+	sockaddr_t sa = E_SOCKADDR_INIT;
+	socklen_t salen;
 
-	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 (proto < 0 || proto > SOCK_RAW) {
+		rpc_SetErr(EINVAL, "Invalid parameters can`t open RPC client");
 		return NULL;
 	}
-	if (!Port)
+
+	srandom(time(NULL) ^ getpid());
+
+	if (!Port && proto < SOCK_RAW)
 		Port = RPC_DEFPORT;
-	if (!netBuf)
+	if (!(salen = e_gethostbyname(csHost, Port, &sa)))
+		return NULL;
+	if (!proto)
+		proto = SOCK_STREAM;
+	if (netBuf < RPC_MIN_BUFSIZ)
 		netBuf = BUFSIZ;
-	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;
-	}
+	else
+		netBuf = E_ALIGN(netBuf, 2);	/* align netBuf length */
 
-	cli = malloc(sizeof(rpc_cli_t));
+	cli = e_malloc(sizeof(rpc_cli_t));
 	if (!cli) {
 		LOGERR;
 		return NULL;
 	} else
 		memset(cli, 0, sizeof(rpc_cli_t));
 
-	cli->cli_netbuf = netBuf;
-	cli->cli_parent = malloc(sizeof(rpc_sess_t));
+	/* build session */
+	cli->cli_parent = e_malloc(sizeof(rpc_sess_t));
 	if (!cli->cli_parent) {
 		LOGERR;
-		free(cli);
+		e_free(cli);
 		return NULL;
 	} else {
 		((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION;
-		((rpc_sess_t*) cli->cli_parent)->sess_program = ProgID;
-		((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID;
+		((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID;
 	}
 
-	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;
-	}
+	cli->cli_id = proto;
+	memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa);
+	AIT_SET_BUFSIZ(&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, cli->cli_id, 
+			cli->cli_id == SOCK_RAW ? IPPROTO_ERPC : 0);
 	if (cli->cli_sock == -1) {
 		LOGERR;
-		free(cli->cli_parent);
-		free(cli);
-		return NULL;
+		goto err;
 	}
-	n = cli->cli_netbuf;
-	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) {
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, 
+				&netBuf, sizeof netBuf) == -1) {
 		LOGERR;
+		goto err;
+	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, 
+				&netBuf, sizeof netBuf) == -1) {
+		LOGERR;
+		goto err;
+	}
+	if (cli->cli_id == SOCK_STREAM) {
+		setsockopt(cli->cli_sock, IPPROTO_TCP, TCP_NODELAY, &n, sizeof n);
+		if (connect(cli->cli_sock, &cli->cli_sa.sa, salen) == -1) {
+			LOGERR;
+			goto err;
+		}
+	}
+	if (cli->cli_id == SOCK_DGRAM) {
+		sockaddr_t sa2;
+
+		if (!(salen = e_gethostbyname(csHost, 0, &sa2)))
+			goto err;
+		if (bind(cli->cli_sock, &sa2.sa, salen) == -1) {
+			LOGERR;
+			goto err;
+		}
+	}
+
+	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
+	return cli;
+err:
+	AIT_FREE_VAL(&cli->cli_buf);
+	if (cli->cli_sock > 2)
 		close(cli->cli_sock);
-		free(cli->cli_parent);
-		free(cli);
-		return NULL;
+	e_free(cli->cli_parent);
+	e_free(cli);
+	return NULL;
+}
+
+/*
+ * rpc_cli_reconnectClient() - Reconnecting client to RPC server
+ *
+ * @cli = RPC Client session
+ * return: -1 error or 0 ok
+ */
+int
+rpc_cli_reconnectClient(rpc_cli_t * __restrict cli)
+{
+	int netBuf;
+
+	if (!cli)
+		return -1;
+	else
+		netBuf = AIT_LEN(&cli->cli_buf);
+
+	if (cli->cli_id == SOCK_STREAM)
+		shutdown(cli->cli_sock, SHUT_RDWR);
+	if (cli->cli_id == SOCK_DGRAM && cli->cli_sa.sa.sa_family == AF_LOCAL) {
+		sockaddr_t sa2 = E_SOCKADDR_INIT;
+		socklen_t salen = sizeof sa2;
+
+#ifndef __linux__
+		sa2.sa.sa_len = salen;
+#endif
+		if (!getsockname(cli->cli_sock, &sa2.sa, &salen))
+			unlink(sa2.sun.sun_path);
 	}
-	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) {
+	close(cli->cli_sock);
+
+	srandom(time(NULL) ^ getpid());
+
+	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0);
+	if (cli->cli_sock == -1) {
 		LOGERR;
+		return -1;
+	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, 
+				&netBuf, sizeof netBuf) == -1) {
+		LOGERR;
 		close(cli->cli_sock);
-		free(cli->cli_parent);
-		free(cli);
-		return NULL;
+		return -1;
 	}
-	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, 
+				&netBuf, sizeof netBuf) == -1) {
 		LOGERR;
 		close(cli->cli_sock);
-		free(cli->cli_parent);
-		free(cli);
-		return NULL;
+		return -1;
 	}
+	if (cli->cli_id == SOCK_STREAM)
+		if (connect(cli->cli_sock, &cli->cli_sa.sa, e_addrlen(&cli->cli_sa)) == -1) {
+			LOGERR;
+			close(cli->cli_sock);
+			return -1;
+		}
 
-	return cli;
+	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
+	return 0;
 }
 
 /*
- * 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 || (*cli)->cli_id == SOCK_BPF)
 		return;
+
+	if ((*cli)->cli_id == SOCK_STREAM)
+		shutdown((*cli)->cli_sock, SHUT_RDWR);
+	if ((*cli)->cli_id == SOCK_DGRAM && (*cli)->cli_sa.sa.sa_family == AF_LOCAL) {
+		sockaddr_t sa2 = E_SOCKADDR_INIT;
+		socklen_t salen = sizeof sa2;
+
+#ifndef __linux__
+		sa2.sa.sa_len = salen;
+#endif
+		if (!getsockname((*cli)->cli_sock, &sa2.sa, &salen))
+			unlink(sa2.sun.sun_path);
 	}
+	close((*cli)->cli_sock);
 
-	shutdown(cli->cli_sock, SHUT_RDWR);
-	close(cli->cli_sock);
+	AIT_FREE_VAL(&(*cli)->cli_buf);
 
-	if (cli->cli_parent)
-		free(cli->cli_parent);
-	free(cli);
-	cli = NULL;
+	if ((*cli)->cli_parent)
+		e_free((*cli)->cli_parent);
+
+	e_free(*cli);
+	*cli = NULL;
 }
 
+/*
+ * rpc_pkt_Send() - Send RPC packet
+ *
+ * @sock = Socket
+ * @type = Type of socket
+ * @sa = Server address
+ * @pkt = RPC packet
+ * @len = Length of packet
+ * return: -1 error, 0  EOF or >0 sended bytes
+ */
+int
+rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len)
+{
+	if (!pkt) {
+		rpc_SetErr(EINVAL, "Invalid argument(s)!");
+		return -1;
+	}
 
+	return rpc_Write(sock, type, MSG_NOSIGNAL, sa, pkt, len);
+}
+
 /*
- * rpc_cli_execCall() Execute RPC call
- * @cli = RPC Client session
- * @csModule = Module name, if NULL self binary
- * @csFunc = Function name for execute
- * @in_vars = IN RPC call array of rpc values
- * @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals()
- * return: -1 error or != -1 ok result
+ * rpc_pkt_Receive() - Receive RPC packet
+ *
+ * @sock = Socket
+ * @type = Type of socket
+ * @sa = Server address
+ * @pkt = RPC packet
+ * @seq = Signed packet with seq.no
+ * return: -1 error, 0 EOF or >0 received bytes
  */
 int
-rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, 
-		array_t * __restrict in_vars, array_t ** __restrict out_vars)
+rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int seq)
 {
-	fd_set fds;
-	u_char *buf, str[MAXPATHLEN + UCHAR_MAX + 1];
+	int ret;
 	struct tagRPCCall *rpc;
-	struct tagRPCRet *rrpc = NULL;
-	int ret = 0, Limit = 0;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
 
-	if (!cli || !csFunc) {
-		rpc_SetErr(EINVAL, "Error:: Can`t execute call because parameter is null or invalid!\n");
+	if (!pkt) {
+		rpc_SetErr(EINVAL, "Invalid argument(s)!");
 		return -1;
 	}
-	if (out_vars)
-		*out_vars = NULL;
 
-	buf = malloc(cli->cli_netbuf);
-	if (!buf) {
-		LOGERR;
+	/* reply from RPC server */
+	do {
+		if (type == SOCK_STREAM || type == SOCK_EXT)
+			ret = rpc_Read(sock, type, 0, NULL, pkt);
+		else
+			ret = rpc_Read(sock, type, 0, sa, pkt);
+
+		if (ret > 0) {
+			rpc = (struct tagRPCCall*) AIT_GET_BUF(pkt);
+			if (ret < ntohl(rpc->call_len))
+				continue;
+
+			/* check for loop request */
+			if (!(rpc->call_io & RPC_ACK))
+				continue;
+			/* check for signed request */
+			if (seq != ntohl(rpc->call_seq))
+				continue;
+		}
+	} while (ret < 0);
+
+	return ret;
+}
+
+/*
+ * rpc_pkt_Request() - Build RPC Request packet
+ *
+ * @pkt = Packet buffer
+ * @sess = RPC session info
+ * @tag = Function tag for execution
+ * @vars = Function argument array of values, may be NULL
+ * @noreply = >0 We not want RPC reply, -1 IPC request with reply
+ * @nocrc = Without CRC calculation
+ * @seq = Sign packet with seq.no
+ * return: -1 error or != -1 prepared bytes into packet
+ */
+int
+rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, u_short tag, 
+		array_t * __restrict vars, int noreply, int nocrc, int seq)
+{
+	struct tagRPCCall *rpc;
+	int ret = 0, estlen, len = sizeof(struct tagRPCCall);
+	u_char *buf;
+
+	if (!pkt || !sess) {
+		rpc_SetErr(EINVAL, "Invalid argument(s)!");
 		return -1;
-	} else
-		memset(buf, 0, cli->cli_netbuf);
+	}
 
-	/* build RPC call string for hash */
-	memset(str, 0, sizeof str);
-	if (csModule)
-		strlcpy((char*) str, csModule, sizeof str);
-	strlcat((char*) str, "__", sizeof str);
-	strlcat((char*) str, csFunc, sizeof str);
+	/* calc estimated length */
+	estlen = ait_resideVars(vars) + len;
+	if (estlen > AIT_LEN(pkt)) {
+		rpc_SetErr(EMSGSIZE, "Message too long");
+		return -1;
+	}
+	buf = AIT_GET_BUF(pkt);
 
 	/* prepare RPC call */
 	rpc = (struct tagRPCCall*) buf;
-	memcpy(&rpc->call_session, cli->cli_parent, sizeof rpc->call_session);
-	rpc->call_argc = in_vars ? io_arraySize(in_vars) : 0;
-	rpc->call_tag = crcFletcher16((u_short*) str, sizeof str / 2);
-	rpc->call_hash = hash_fnv((char*) str, sizeof str);
-	Limit = sizeof(struct tagRPCCall);
+	rpc_addPktSession(&rpc->call_session, sess);
+	rpc->call_tag = htons(tag);
+	if (!vars)
+		rpc->call_argc = 0;
+	else
+		rpc->call_argc = (u_char) array_Size(vars);
 
-	if (in_vars && io_arraySize(in_vars)) {
+	/* set reply */
+	rpc->call_req.flags = (uint64_t) htonl((noreply > 0) ? RPC_NOREPLY : RPC_REPLY);
+
+	if (array_Size(vars)) {
 		/* marshaling variables */
-		ret = io_vals2buffer(buf + Limit, cli->cli_netbuf - Limit, in_vars);
+		ret = ait_vars2buffer(buf + len, AIT_LEN(pkt) - len, vars);
 		if (ret == -1) {
-			rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n");
-			free(buf);
-			return -7;
+			rpc_SetErr(EBADRPC, "Failed to prepare RPC packet values");
+			return -1;
 		} else
-			Limit += ret;
+			len += ret;
 	}
 
-	if ((ret = send(cli->cli_sock, buf, Limit, 0)) == -1) {
-		LOGERR;
-		free(buf);
-		return -1;
+	/* total packet length */
+	rpc->call_len = htonl(len);
+	rpc->call_io = (noreply == -1) ? RPC_IPC : RPC_REQ;
+
+	/* sign packet */
+	rpc->call_seq = htonl(seq);
+
+	if (!nocrc) {
+		/* calculate CRC */
+		rpc->call_crc ^= rpc->call_crc;
+		rpc->call_crc = htons(crcFletcher16((u_short*) buf, len / 2));
 	}
-	if (ret != Limit) {
-		rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, really is %d\n", 
-				Limit, ret);
-		free(buf);
-		return -9;
-	}
 
-	/* reply from RPC server */
-	FD_ZERO(&fds);
-	FD_SET(cli->cli_sock, &fds);
-	if ((ret = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) < 1) {
-		if (ret)
-			LOGERR;
-		else
-			rpc_SetErr(ETIMEDOUT, "Error:: timeout, no return from RPC server?\n");
+	return len;
+}
 
-		free(buf);
+/*
+ * rpc_pkt_Replay() - Decode RPC Replay packet
+ *
+ * @pkt = Packet buffer
+ * @sess = RPC session info, if =NULL don't check session
+ * @tag = Function tag, if =CALL_TAG_MAX don't check tag
+ * @vars = Function argument array of values, may be NULL
+ * @nocrc = Without CRC calculation
+ * return: -1 error or != -1 return value from function
+ */
+int
+rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, u_short tag, 
+		array_t ** __restrict vars, int nocrc)
+{
+	struct tagRPCCall *rpc;
+	int len;
+	u_char *buf;
+	uint16_t crc;
+
+	if (!pkt) {
+		rpc_SetErr(EINVAL, "Invalid argument(s)!");
 		return -1;
+	} else
+		buf = AIT_GET_BUF(pkt);
+
+	rpc = (struct tagRPCCall*) buf;
+	if (!nocrc) {
+		/* calculate CRC */
+		crc = ntohs(rpc->call_crc);
+		rpc->call_crc ^= rpc->call_crc;
+		if (crc != crcFletcher16((u_short*) buf, ntohl(rpc->call_len) / 2)) {
+			rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
+			return -1;
+		}
 	}
-	memset(buf, 0, cli->cli_netbuf);
-	if ((ret = recv(cli->cli_sock, buf, cli->cli_netbuf, 0)) == -1) {
-		LOGERR;
-		free(buf);
-		return -3;
+
+	/* check RPC packet session info */
+	if (sess && rpc_chkPktSession(&rpc->call_session, sess)) {
+		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
+		return -1;
 	}
-	if (!ret) {	/* receive EOF! */
-		free(buf);
-		return 0;
+	if (tag != CALL_TAG_MAX && ntohs(rpc->call_tag) != tag) {
+		rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply");
+		return -1;
 	}
-	if (ret < sizeof(struct tagRPCRet)) {
-		rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
-		free(buf);
-		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(ERPCMISMATCH, "Error:: get invalid RPC session ...\n");
-		free(buf);
-		return -5;
-	} else
-		Limit = sizeof(struct tagRPCRet);
-	if (rrpc->ret_retcode < 0 && rrpc->ret_errno) {
-		rpc_SetErr(rrpc->ret_errno, "Error::Server side: retcode=%d #%d %s\n", 
-				rrpc->ret_retcode, rrpc->ret_errno, strerror(rrpc->ret_errno));
-		free(buf);
-		return -6;
+	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 (rrpc->ret_argc * sizeof(ait_val_t) > cli->cli_netbuf - Limit) {
-		rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too long ...\n");
-		free(buf);
-		return -7;
+	len = rpc->call_argc * sizeof(ait_val_t);
+	if (len > AIT_LEN(pkt) - sizeof(struct tagRPCCall)) {
+		rpc_SetErr(EMSGSIZE, "Reply RPC packet not enough buffer space ...");
+		return -1;
 	}
+	if (len > ntohl(rpc->call_len) - sizeof(struct tagRPCCall)) {
+		rpc_SetErr(EMSGSIZE, "Reply RPC packet is too short ...");
+		return -1;
+	}
 
 	/* RPC is OK! Go de-marshaling variables ... */
-	if (rrpc->ret_argc) {
-		*out_vars = io_buffer2vals(buf + Limit, cli->cli_netbuf - Limit, rrpc->ret_argc, 0);
-		if (!*out_vars) {
-			free(buf);
+	if (vars && rpc->call_argc) {
+#ifdef CLI_RES_ZCOPY
+		*vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, 
+				rpc->call_argc, 42);
+#else
+		*vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, 
+				rpc->call_argc, 0);
+#endif
+		if (!*vars) {
+			rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
 			return -1;
 		}
 	}
 
-	ret = rrpc->ret_retcode;
-	free(buf);
-	return ret;
+	return ntohl(rpc->call_rep.ret);
 }
 
 /*
- * rpc_cli_freeVals() Free ait_val_t array returned from RPC call
- * @vars = Variable array
+ * rpc_cli_execCall() - Execute RPC call
+ *
+ * @cli = RPC Client session
+ * @noreply = >0 We not want RPC reply, -1 IPC request with reply
+ * @tag = Function tag for execution
+ * @in_vars = IN function argument array of values, may be NULL
+ * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars()
+ * return: -1 error, 0 ok result or 1 closed rpc connection
+ */
+int
+rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, 
+		array_t * __restrict in_vars, array_t ** __restrict out_vars)
+{
+	int type = 0, wlen;
+	u_int seq = 0;
+
+	if (!cli) {
+		rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!");
+		return -1;
+	} else {
+		if (cli->cli_id == SOCK_STREAM || cli->cli_id == SOCK_EXT)
+			type = cli->cli_id;
+		else
+			seq = random();	/* sign package */
+	}
+	if (out_vars)
+		*out_vars = NULL;
+
+	if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, 
+					in_vars, noreply, type, seq)) == -1)
+		return -1;
+
+	if ((wlen = rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, 
+					&cli->cli_buf, wlen)) == -1)
+		return -1;
+	if (!wlen)		/* closed rpc connection */
+		return 1;
+
+	if (noreply > 0)	/* we not want reply */
+		return 0;
+
+	if ((wlen = rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, 
+					&cli->cli_buf, seq)) == -1)
+		return -1;
+	if (!wlen) {	/* closed rpc connection */
+		rpc_SetErr(ECONNRESET, "Closed connection");
+		return -1;
+	}
+
+	if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, 
+					out_vars, type)) == -1)
+		return -1;
+
+	return wlen;
+}
+
+/*
+ * rpc_cli_freeCall() - Free resouce allocated by RPC call
+ *
+ * @out_vars = Returned array with variables from RPC call
  * return: none
  */
-inline void
-rpc_cli_freeVals(array_t ** __restrict vars)
+void
+rpc_cli_freeCall(array_t ** __restrict out_vars)
 {
-	register int i;
+#ifdef CLI_RES_ZCOPY
+	array_Destroy(out_vars);
+#else
+	ait_freeVars(out_vars);
+#endif
+}
 
-	if (!vars || !*vars)
-		return;
+/*
+ * rpc_cli_ping() - Ping RPC server
+ *
+ * @cli = connected client
+ * return: -1 error or !=-1 ping seq id
+ */
+int
+rpc_cli_ping(rpc_cli_t *cli)
+{
+	int ret = 0;
+	array_t *arr = NULL;
 
-	for (i = 0; i < io_arraySize(*vars); i++)
-		if (io_arrayGet(*vars, i))
-			AIT_FREE_VAL(io_array(*vars, i, ait_val_t*));
+	if (!cli)
+		return -1;
 
-	io_arrayFree(*vars);
-	io_arrayDestroy(vars);
+	if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr))
+		return -1;
+	else
+		ret = AIT_GET_U16(array(arr, 0, ait_val_t*));
+	rpc_cli_freeCall(&arr);
+
+	return ret;
 }
 
+
 /*
- * rpc_cli_allocVals() Allocate ait_val_t array for RPC call
- * @args = Number of arguments
- * return: =NULL error or !=NULL allocated array
+ * rpc_cli_openClient2() - Connect to layer2 RPC Server
+ *
+ * @InstID = InstID for RPC session request
+ * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
+ * @csIface = Interface name for bind client, if NULL first interface on host
+ * @csHost = Host ethernet address
+ * return: NULL == error or !=NULL connection to RPC server established
  */
-inline array_t *
-rpc_cli_allocVals(u_short args)
+rpc_cli_t *
+rpc_cli_openClient2(u_char InstID, int netBuf, const char *csIface, const char *csHost)
 {
-	array_t *arr;
+#ifndef __linux__
+	rpc_cli_t *cli = NULL;
+	sockaddr_t sa = E_SOCKADDR_INIT, sal = E_SOCKADDR_INIT;
+	char szIface[64], szStr[STRSIZ];
 	register int i;
-	ait_val_t *v;
+	struct ifreq ifr;
+	int n = 1;
+	struct bpf_insn insns[] = {
+		BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12),
+		BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, RPC_DEFPORT, 0, 1),
+		BPF_STMT(BPF_RET + BPF_K, -1),
+		BPF_STMT(BPF_RET + BPF_K, 0),
+	};
+	struct bpf_program fcode = { 
+		.bf_len = sizeof(insns) / sizeof(struct bpf_insn), 
+       		.bf_insns = insns
+	};
 
-	if (!args)
+	if (!csHost || !e_getlinkbyname(csHost, &sa))
 		return NULL;
+	if (!csIface) {
+		if (e_get1stiface(szIface, sizeof szIface))
+			return NULL;
+	} else
+		strlcpy(szIface, csIface, sizeof szIface);
+	if (!e_getifacebyname(szIface, &sal))
+		return NULL;
 
-	if (!(arr = io_arrayInit(args)))
+	cli = e_malloc(sizeof(rpc_cli_t));
+	if (!cli) {
+		LOGERR;
 		return NULL;
+	} else
+		memset(cli, 0, sizeof(rpc_cli_t));
 
-	for (i = 0; i < io_arraySize(arr); i++) {
-		v = malloc(sizeof(ait_val_t));
-		if (!v) {
-			LOGERR;
-			rpc_cli_freeVals(&arr);
-			return NULL;
-		} else {
-			memset(v, 0, sizeof(ait_val_t));
-			io_arraySet(arr, i, v);
-		}
+	/* build session */
+	cli->cli_parent = e_malloc(sizeof(rpc_sess_t));
+	if (!cli->cli_parent) {
+		LOGERR;
+		e_free(cli);
+		return NULL;
+	} else {
+		((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION;
+		((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID;
 	}
 
-	return arr;
+	cli->cli_id = SOCK_BPF;
+	memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa);
+
+	/* connect to RPC server */
+	for (i = 0; i < 10; i++) {
+		memset(szStr, 0, sizeof szStr);
+		snprintf(szStr, sizeof szStr, "/dev/bpf%d", i);
+		cli->cli_sock = open(szStr, O_RDWR);
+		if (cli->cli_sock > STDERR_FILENO)
+			break;
+	}
+	if (cli->cli_sock < 3) {
+		LOGERR;
+		e_free(cli->cli_parent);
+		e_free(cli);
+		return NULL;
+	}
+
+	if (ioctl(cli->cli_sock, BIOCIMMEDIATE, &n) == -1) {
+		LOGERR;
+		goto err;
+	}
+	if (ioctl(cli->cli_sock, BIOCSETF, &fcode) == -1) {
+		LOGERR;
+		goto err;
+	}
+	n = (netBuf < RPC_MIN_BUFSIZ) ? getpagesize() : E_ALIGN(netBuf, 2);
+	if (ioctl(cli->cli_sock, BIOCSBLEN, &n) == -1) {
+		LOGERR;
+		goto err;
+	} else
+		AIT_SET_BUFSIZ(&cli->cli_buf, 0, n);
+
+	memset(&ifr, 0, sizeof ifr);
+	strlcpy(ifr.ifr_name, szIface, sizeof ifr.ifr_name);
+	if (ioctl(cli->cli_sock, BIOCSETIF, &ifr) == -1) {
+		LOGERR;
+		goto err;
+	} else
+		fcntl(cli->cli_sock, F_SETFL, 
+				fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
+
+	return cli;
+err:
+	AIT_FREE_VAL(&cli->cli_buf);
+	if (cli->cli_sock > 2)
+		close(cli->cli_sock);
+	e_free(cli->cli_parent);
+	e_free(cli);
+#else
+	rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!");
+#endif
+	return NULL;
+}
+
+/*
+ * rpc_cli_closeClient2() - Close layer2 connection to RPC server and free resources
+ *
+ * @cli = RPC Client session
+ * return: none
+ */
+void
+rpc_cli_closeClient2(rpc_cli_t ** __restrict cli)
+{
+	if (!cli || !*cli || (*cli)->cli_id != SOCK_BPF)
+		return;
+
+	close((*cli)->cli_sock);
+
+	AIT_FREE_VAL(&(*cli)->cli_buf);
+
+	if ((*cli)->cli_parent)
+		e_free((*cli)->cli_parent);
+
+	e_free(*cli);
+	*cli = NULL;
+}
+
+/*
+ * rpc_cli_openClientExt() - Connect to pipe RPC Server
+ *
+ * @InstID = InstID for RPC session request
+ * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
+ * @fd = File descriptor
+ * return: NULL == error or !=NULL connection to RPC server established
+ */
+rpc_cli_t *
+rpc_cli_openClientExt(u_char InstID, int netBuf, int fd)
+{
+	rpc_cli_t *cli = NULL;
+	int n;
+
+	cli = e_malloc(sizeof(rpc_cli_t));
+	if (!cli) {
+		LOGERR;
+		return NULL;
+	} else
+		memset(cli, 0, sizeof(rpc_cli_t));
+
+	/* build session */
+	cli->cli_parent = e_malloc(sizeof(rpc_sess_t));
+	if (!cli->cli_parent) {
+		LOGERR;
+		e_free(cli);
+		return NULL;
+	} else {
+		((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION;
+		((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID;
+	}
+
+	cli->cli_id = SOCK_EXT;
+	cli->cli_sock = fd;
+
+	n = (netBuf < RPC_MIN_BUFSIZ) ? getpagesize() : E_ALIGN(netBuf, 2);
+	AIT_SET_BUFSIZ(&cli->cli_buf, 0, n);
+
+	fcntl(cli->cli_sock, F_SETFL, 
+			fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
+
+	return cli;
+}
+
+/*
+ * rpc_cli_closeClientExt() - Close pipe connection to RPC server and free resources
+ *
+ * @cli = RPC Client session
+ * return: none
+ */
+void
+rpc_cli_closeClientExt(rpc_cli_t ** __restrict cli)
+{
+	if (!cli || !*cli || (*cli)->cli_id != SOCK_EXT)
+		return;
+
+	AIT_FREE_VAL(&(*cli)->cli_buf);
+
+	if ((*cli)->cli_parent)
+		e_free((*cli)->cli_parent);
+
+	e_free(*cli);
+	*cli = NULL;
 }