--- libaitrpc/src/cli.c	2013/08/21 15:28:15	1.16.6.1
+++ libaitrpc/src/cli.c	2013/08/22 15:31:09	1.17
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.16.6.1 2013/08/21 15:28:15 misho Exp $
+* $Id: cli.c,v 1.17 2013/08/22 15:31:09 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -71,13 +71,6 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 	} else
 		memcpy(cli, rpccli, sizeof(rpc_cli_t));
 
-	cli->cli_buf = ait_allocVars(1);
-	if (!cli->cli_buf) {
-		rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
-		e_free(cli);
-		return NULL;
-	}
-
 	memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(sockaddr_t));
 	switch (cli->cli_sa.sa.sa_family) {
 		case AF_INET:
@@ -96,8 +89,8 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 			return NULL;
 	}
 
-	AIT_COPY_VAL(array(cli->cli_buf, 0, ait_val_t*), array(rpccli->cli_buf, 0, ait_val_t*));
-	n = AIT_LEN(array(cli->cli_buf, 0, ait_val_t*));
+	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.sa_family, SOCK_STREAM, 0);
@@ -144,7 +137,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
 	shutdown((*cli)->cli_sock, SHUT_RDWR);
 	close((*cli)->cli_sock);
 
-	ait_freeVars(&(*cli)->cli_buf);
+	AIT_FREE_VAL(&(*cli)->cli_buf);
 
 	e_free(*cli);
 	*cli = NULL;
@@ -179,14 +172,6 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch
 	else
 		netBuf = E_ALIGN(netBuf, 2);	/* align netBuf length */
 
-#ifdef HAVE_SRANDOMDEV
-	srandomdev();
-#else
-	time_t tim;
-
-	srandom((time(&tim) ^ getpid()));
-#endif
-
 	cli = e_malloc(sizeof(rpc_cli_t));
 	if (!cli) {
 		LOGERR;
@@ -205,17 +190,9 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch
 		((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID;
 	}
 
-	cli->cli_buf = ait_allocVars(2);
-	if (!cli->cli_buf) {
-		rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
-		e_free(cli->cli_parent);
-		e_free(cli);
-		return NULL;
-	} else
-		AIT_SET_BUFSIZ(array(cli->cli_buf, 0, ait_val_t*), 0, netBuf);
-
 	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(cli->cli_sa.sa.sa_family, cli->cli_id, 0);
@@ -242,7 +219,7 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch
 	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
 	return cli;
 err:
-	ait_freeVars(&cli->cli_buf);
+	AIT_FREE_VAL(&cli->cli_buf);
 	if (cli->cli_sock > 2)
 		close(cli->cli_sock);
 	e_free(cli->cli_parent);
@@ -266,7 +243,7 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
 		shutdown((*cli)->cli_sock, SHUT_RDWR);
 	close((*cli)->cli_sock);
 
-	ait_freeVars(&(*cli)->cli_buf);
+	AIT_FREE_VAL(&(*cli)->cli_buf);
 
 	if ((*cli)->cli_parent)
 		e_free((*cli)->cli_parent);
@@ -345,10 +322,11 @@ int
 rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt)
 {
 	struct pollfd pfd;
-	int ret, len = 0;
+	int ret, estlen, blen = sizeof(struct tagRPCCall), len = 0;
 	u_char *buf;
 	sockaddr_t sa2;
 	socklen_t salen;
+	struct tagRPCCall *rpc;
 
 	if (!pkt) {
 		rpc_SetErr(EINVAL, "Invalid argument(s)!");
@@ -375,13 +353,19 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
 			return -1;
 		}
 
-		memset(buf, 0, AIT_LEN(pkt));
-		if (type == SOCK_STREAM)
-			ret = recv(sock, buf, AIT_LEN(pkt), 0);
-		else {
+payload:
+		if (type == SOCK_STREAM) {
+			memset(buf, 0, blen);
+			ret = recv(sock, buf, blen, 0);
+			/* handling case for reply without payload */
+			if (!ret && buf != AIT_GET_BUF(pkt))
+				return (buf - AIT_GET_BUF(pkt));
+		} else {
+			blen = AIT_LEN(pkt);
+			memset(buf, 0, blen);
 			memset(&sa2, 0, sizeof sa2);
 			salen = sa2.ss.ss_len = sizeof(sockaddr_t);
-			ret = recvfrom(sock, buf, AIT_LEN(pkt), 0, &sa2.sa, &salen);
+			ret = recvfrom(sock, buf, blen, 0, &sa2.sa, &salen);
 		}
 		if (ret < 1) {
 			if (ret) {
@@ -394,13 +378,33 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
 		}
 
 		/* check for response from known address */
-		if (type == SOCK_DGRAM)
+		if (type == SOCK_DGRAM) {
 			if (e_addrcmp(sa, &sa2, 42)) {
 				rpc_SetErr(ERPCMISMATCH, 
 						"Received RPC response from unknown address");
 				continue;
 			}
+		} else {
+			/* 1st read for RPC header */
+			if (buf == AIT_GET_BUF(pkt)) {
+				if (ret < sizeof(struct tagRPCCall)) {
+					rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
+					return -1;
+				}
+
+				/* calc estimated length */
+				rpc = (struct tagRPCCall*) buf;
+				estlen = ntohl(rpc->call_len);
+				if (estlen > AIT_LEN(pkt))
+					AIT_RE_BUF(pkt, estlen);
+				buf = AIT_GET_BUF(pkt) + blen;
+				blen = estlen - blen;
+				goto payload;
+			} else
+				ret += sizeof(struct tagRPCCall);
+		}
 	} while (0);
+
 	if (ret < sizeof(struct tagRPCCall)) {
 		rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
 		return -1;
@@ -425,15 +429,20 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
 		array_t * __restrict vars, int noreply, int nocrc)
 {
 	struct tagRPCCall *rpc;
-	int ret = 0, len = sizeof(struct tagRPCCall);
+	int ret = 0, estlen, len = sizeof(struct tagRPCCall);
 	u_char *buf;
 
 	if (!pkt || !sess) {
 		rpc_SetErr(EINVAL, "Invalid argument(s)!");
 		return -1;
-	} else
-		buf = AIT_GET_BUF(pkt);
+	}
 
+	/* calc estimated length */
+	estlen = ait_resideVars(vars) + len;
+	if (estlen > AIT_LEN(pkt))
+		AIT_RE_BUF(pkt, estlen);
+	buf = AIT_GET_BUF(pkt);
+
 	/* prepare RPC call */
 	rpc = (struct tagRPCCall*) buf;
 	rpc_addPktSession(&rpc->call_session, sess);
@@ -457,7 +466,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
 	}
 
 	/* total packet length */
-	rpc->call_len = htons(len);
+	rpc->call_len = htonl(len);
 
 	if (!nocrc) {
 		/* calculate CRC */
@@ -498,7 +507,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t 
 		/* calculate CRC */
 		crc = ntohs(rpc->call_crc);
 		rpc->call_crc ^= rpc->call_crc;
-		if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) {
+		if (crc != crcFletcher16((u_short*) buf, ntohl(rpc->call_len) / 2)) {
 			rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
 			return -1;
 		}
@@ -524,7 +533,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t 
 		rpc_SetErr(EMSGSIZE, "Reply RPC packet not enough buffer space ...");
 		return -1;
 	}
-	if (len > ntohs(rpc->call_len) - sizeof(struct tagRPCCall)) {
+	if (len > ntohl(rpc->call_len) - sizeof(struct tagRPCCall)) {
 		rpc_SetErr(EMSGSIZE, "Reply RPC packet is too short ...");
 		return -1;
 	}
@@ -562,29 +571,32 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 		array_t * __restrict in_vars, array_t ** __restrict out_vars)
 {
 	int type = 0, wlen;
+	u_char *buf;
 
 	if (!cli) {
 		rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!");
 		return -1;
+	} else {
+		if (cli->cli_id == SOCK_STREAM)
+			type = cli->cli_id;
+		buf = AIT_GET_BUF(&cli->cli_buf);
 	}
-	if (cli->cli_id == SOCK_STREAM)
-		type = cli->cli_id;
 	if (out_vars)
 		*out_vars = NULL;
 
-	if ((wlen = rpc_pkt_Request(rpc_getBufVar(cli), cli->cli_parent, tag, in_vars, noreply, type)) == -1)
+	if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply, type)) == -1)
 		return -1;
 
-	if (rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, rpc_getBufVar(cli), wlen) == -1)
+	if (rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf, wlen) == -1)
 		return -1;
 
 	if (noreply)	/* we not want reply */
 		return 0;
 
-	if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, rpc_getBufVar(cli)) == -1)
+	if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf) == -1)
 		return -1;
 
-	if ((wlen = rpc_pkt_Replay(rpc_getBufVar(cli), cli->cli_parent, tag, out_vars, type)) == -1)
+	if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1)
 		return -1;
 
 	return 0;