--- libaitrpc/src/cli.c	2015/01/18 01:03:49	1.23.2.2
+++ libaitrpc/src/cli.c	2015/01/21 20:28:41	1.23.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.23.2.2 2015/01/18 01:03:49 misho Exp $
+* $Id: cli.c,v 1.23.2.5 2015/01/21 20:28:41 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -350,7 +350,11 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
 	do {
 		if (type == SOCK_STREAM)
 			ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen);
-		else if (type == SOCK_BPF) {
+		else if (type == SOCK_EXT) {
+			ret = rpc_Read(sock, type, 0, NULL, AIT_GET_BUF(pkt), AIT_LEN(pkt));
+			if (ret > 0)
+				estlen = ret;
+		} else if (type == SOCK_BPF) {
 			ret = rpc_Read(sock, type, 0, sa, AIT_GET_BUF(pkt), AIT_LEN(pkt));
 			if (ret > 0)
 				estlen = ret;
@@ -359,14 +363,18 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
 		if (ret < 1)
 			return ret;
 
+		/* 1st read for RPC header */
+		if (ret < sizeof(struct tagRPCCall)) {
+			rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
+			return -1;
+		}
+
+		/* check for loop request */
+		if (!(rpc->call_io & RPC_ACK))
+			continue;
+
 		/* check for response from known address */
 		if (!estlen) {
-			/* 1st read for RPC header */
-			if (ret < sizeof(struct tagRPCCall)) {
-				rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret);
-				return -1;
-			}
-
 			/* calc estimated length */
 			estlen = ntohl(rpc->call_len);
 			if (estlen > AIT_LEN(pkt))
@@ -381,7 +389,7 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
 		break;
 	} while (42);
 
-	if (ret < sizeof(struct tagRPCCall) || estlen != ret) {
+	if (estlen != ret) {
 		rpc_SetErr(ERPCMISMATCH, "RPC packet mismatch estimate %d bytes, but received %d\n", 
 				estlen, ret);
 		return -1;
@@ -427,7 +435,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
 	if (!vars)
 		rpc->call_argc = 0;
 	else
-		rpc->call_argc = htons(array_Size(vars));
+		rpc->call_argc = (u_char) array_Size(vars);
 
 	/* set reply */
 	rpc->call_req.flags = (uint64_t) htonl(noreply ? RPC_NOREPLY : RPC_REPLY);
@@ -444,6 +452,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
 
 	/* total packet length */
 	rpc->call_len = htonl(len);
+	rpc->call_io = RPC_REQ;
 
 	if (!nocrc) {
 		/* calculate CRC */
@@ -505,7 +514,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t 
 				strerror(ntohl(rpc->call_rep.eno)));
 		return -1;
 	}
-	len = ntohs(rpc->call_argc) * sizeof(ait_val_t);
+	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;
@@ -516,13 +525,13 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t 
 	}
 
 	/* RPC is OK! Go de-marshaling variables ... */
-	if (vars && ntohs(rpc->call_argc)) {
+	if (vars && rpc->call_argc) {
 #ifdef CLI_RES_ZCOPY
 		*vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, 
-				ntohs(rpc->call_argc), 42);
+				rpc->call_argc, 42);
 #else
 		*vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, 
-				ntohs(rpc->call_argc), 0);
+				rpc->call_argc, 0);
 #endif
 		if (!*vars) {
 			rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
@@ -554,7 +563,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 		rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!");
 		return -1;
 	} else {
-		if (cli->cli_id == SOCK_STREAM)
+		if (cli->cli_id == SOCK_STREAM || cli->cli_id == SOCK_EXT)
 			type = cli->cli_id;
 		buf = AIT_GET_BUF(&cli->cli_buf);
 	}