--- libaitrpc/src/cli.c	2013/04/02 09:17:06	1.14.2.1
+++ libaitrpc/src/cli.c	2013/08/22 08:56:15	1.16.8.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.14.2.1 2013/04/02 09:17:06 misho Exp $
+* $Id: cli.c,v 1.16.8.2 2013/08/22 08:56:15 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -172,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;
@@ -402,27 +394,32 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
  * @tag = Function tag for execution
  * @vars = Function argument array of values, may be NULL
  * @noreply = We not want RPC reply
+ * @nocrc = Without CRC calculation
  * 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)
+		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);
 	rpc->call_tag = htons(tag);
-	rpc->call_seq = htons(random() % USHRT_MAX);
 	if (!vars)
 		rpc->call_argc = 0;
 	else
@@ -444,9 +441,11 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
 	/* total packet length */
 	rpc->call_len = htons(len);
 
-	/* calculate CRC */
-	rpc->call_crc ^= rpc->call_crc;
-	rpc->call_crc = htons(crcFletcher16((u_short*) buf, len / 2));
+	if (!nocrc) {
+		/* calculate CRC */
+		rpc->call_crc ^= rpc->call_crc;
+		rpc->call_crc = htons(crcFletcher16((u_short*) buf, len / 2));
+	}
 
 	return len;
 }
@@ -458,11 +457,12 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
  * @sess = RPC session info
  * @tag = Function 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)
+		array_t ** __restrict vars, int nocrc)
 {
 	struct tagRPCCall *rpc;
 	int len;
@@ -476,12 +476,14 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t 
 		buf = AIT_GET_BUF(pkt);
 
 	rpc = (struct tagRPCCall*) buf;
-	/* 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 (!nocrc) {
+		/* 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;
+		}
 	}
 
 	/* check RPC packet session info */
@@ -541,18 +543,21 @@ int
 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, 
 		array_t * __restrict in_vars, array_t ** __restrict out_vars)
 {
-	int ret = 0, wlen;
+	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
+	} else {
+		if (cli->cli_id == SOCK_STREAM)
+			type = cli->cli_id;
 		buf = AIT_GET_BUF(&cli->cli_buf);
+	}
 	if (out_vars)
 		*out_vars = NULL;
 
-	if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply)) == -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, &cli->cli_buf, wlen) == -1)
@@ -564,10 +569,10 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 	if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf) == -1)
 		return -1;
 
-	if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars)) == -1)
+	if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1)
 		return -1;
 
-	return ret;
+	return 0;
 }
 
 /*
@@ -576,7 +581,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
  * @out_vars = Returned array with variables from RPC call
  * return: none
  */
-inline void
+void
 rpc_cli_freeCall(array_t ** __restrict out_vars)
 {
 #ifdef CLI_RES_ZCOPY
@@ -592,7 +597,7 @@ rpc_cli_freeCall(array_t ** __restrict out_vars)
  * @cli = connected client
  * return: -1 error or !=-1 ping seq id
  */
-inline int
+int
 rpc_cli_ping(rpc_cli_t *cli)
 {
 	int ret = 0;