--- libaitrpc/src/cli.c	2013/03/07 23:10:50	1.14
+++ libaitrpc/src/cli.c	2013/04/02 15:50:14	1.15
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.14 2013/03/07 23:10:50 misho Exp $
+* $Id: cli.c,v 1.15 2013/04/02 15:50:14 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -148,8 +148,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
 /*
  * rpc_cli_openClient() - Connect to RPC Server
  *
- * @ProgID = ProgramID for RPC session request
- * @ProcID = ProcessID for RPC session request
+ * @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
@@ -157,8 +156,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
  * return: NULL == error or !=NULL connection to RPC server established
  */
 rpc_cli_t *
-rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, 
-		u_short Port, int proto)
+rpc_cli_openClient(u_char InstID, int netBuf, const char *csHost, u_short Port, int proto)
 {
 	rpc_cli_t *cli = NULL;
 	sockaddr_t sa = E_SOCKADDR_INIT;
@@ -197,8 +195,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 		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;
 	}
 
 	cli->cli_id = proto;
@@ -405,11 +402,12 @@ 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);
@@ -447,9 +445,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;
 }
@@ -461,11 +461,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;
@@ -479,12 +480,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 */
@@ -544,18 +547,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)
@@ -567,10 +573,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;
 }
 
 /*