--- libaitrpc/src/cli.c	2012/05/17 15:24:28	1.9.2.12
+++ libaitrpc/src/cli.c	2012/05/17 21:14:13	1.9.2.13
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.9.2.12 2012/05/17 15:24:28 misho Exp $
+* $Id: cli.c,v 1.9.2.13 2012/05/17 21:14:13 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -102,9 +102,8 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 		close(cli->cli_sock);
 		free(cli);
 		return NULL;
-	} /*else
+	} else
 		fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
-		*/
 
 	return cli;
 }
@@ -203,9 +202,8 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 		free(cli->cli_parent);
 		free(cli);
 		return NULL;
-	} /*else
+	} else
 		fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
-		*/
 
 	return cli;
 }
@@ -290,6 +288,17 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 	rpc->call_crc ^= rpc->call_crc;
 	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
 
+	pfd.fd = cli->cli_sock;
+	pfd.events = POLLOUT;
+	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || 
+			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+		if (ret)
+			LOGERR;
+		else
+			rpc_SetErr(ETIMEDOUT, "Timeout, no ready to send");
+
+		return -1;
+	}
 	if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {
 		LOGERR;
 		return -1;