--- libaitrpc/src/cli.c	2015/01/21 21:17:05	1.24
+++ libaitrpc/src/cli.c	2015/01/28 00:06:22	1.24.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.24 2015/01/21 21:17:05 misho Exp $
+* $Id: cli.c,v 1.24.2.2 2015/01/28 00:06:22 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -161,6 +161,11 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch
 	rpc_cli_t *cli = NULL;
 	sockaddr_t sa = E_SOCKADDR_INIT;
 
+	if (proto < 0 || proto > SOCK_RAW) {
+		rpc_SetErr(EINVAL, "Invalid parameters can`t open RPC client");
+		return NULL;
+	}
+
 	if (!e_gethostbyname(csHost, Port, &sa))
 		return NULL;
 	if (!Port)
@@ -195,7 +200,8 @@ rpc_cli_openClient(u_char InstID, int netBuf, const ch
 	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);
+	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;
 		goto err;
@@ -474,7 +480,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
  *
  * @pkt = Packet buffer
  * @sess = RPC session info, if =NULL don't check session
- * @tag = Function tag
+ * @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
@@ -510,7 +516,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t 
 		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
 		return -1;
 	}
-	if (ntohs(rpc->call_tag) != tag) {
+	if (tag != CALL_TAG_MAX && ntohs(rpc->call_tag) != tag) {
 		rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply");
 		return -1;
 	}