--- libaitrpc/src/blob.c	2012/05/16 13:32:47	1.7.2.5
+++ libaitrpc/src/blob.c	2012/05/17 21:40:02	1.7.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: blob.c,v 1.7.2.5 2012/05/16 13:32:47 misho Exp $
+* $Id: blob.c,v 1.7.2.8 2012/05/17 21:40:02 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -247,7 +247,10 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_
 	for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) {
 		if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-			LOGERR;
+			if (len)
+				LOGERR;
+			else
+				rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
 			return -1;
 		}
 
@@ -282,7 +285,8 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	if (!cli || !var || !data) {
 		rpc_SetErr(EINVAL, "Invalid arguments");
 		return -1;
-	}
+	} else
+		memset(&hdr, 0, sizeof hdr);
 
 	rpc_addPktSession(&hdr.hdr_session, cli->cli_parent);
 	hdr.hdr_cmd = set;
@@ -294,6 +298,13 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2));
 
 	/* send SET request */
+	pfd.fd = cli->cli_sock;
+	pfd.events = POLLOUT;
+	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || 
+			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+		LOGERR;
+		return -1;
+	}
 	if (send(cli->cli_sock, &hdr, sizeof hdr, MSG_NOSIGNAL) == -1) {
 		LOGERR;
 		return -1;
@@ -307,7 +318,6 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 		}
 
 	/* wait for reply */
-	pfd.fd = cli->cli_sock;
 	pfd.events = POLLIN | POLLPRI;
 	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
@@ -366,8 +376,10 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	if (!*data) {
 		LOGERR;
 		return -1;
-	} else
+	} else {
+		memset(&hdr, 0, sizeof hdr);
 		memset(*data, 0, AIT_LEN(var));
+	}
 
 	rpc_addPktSession(&hdr.hdr_session, cli->cli_parent);
 	hdr.hdr_cmd = get;
@@ -379,6 +391,15 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2));
 
 	/* send GET request */
+	pfd.fd = cli->cli_sock;
+	pfd.events = POLLOUT;
+	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || 
+			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+		LOGERR;
+		free(*data);
+		*data = NULL;
+		return -1;
+	}
 	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
 		LOGERR;
 		free(*data);
@@ -387,7 +408,6 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	}
 
 	/* receive BLOB from server */
-	pfd.fd = cli->cli_sock;
 	pfd.events = POLLIN | POLLPRI;
 	for (ret = AIT_LEN(var), pos = *data; ret > 0; ret -= len, pos += len) {
 		if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
@@ -461,7 +481,8 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t 
 	if (!cli || !var) {
 		rpc_SetErr(EINVAL, "Invalid arguments");
 		return -1;
-	}
+	} else
+		memset(&hdr, 0, sizeof hdr);
 
 	rpc_addPktSession(&hdr.hdr_session, cli->cli_parent);
 	hdr.hdr_cmd = unset;
@@ -473,13 +494,19 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t 
 	hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2));
 
 	/* send UNSET request */
+	pfd.fd = cli->cli_sock;
+	pfd.events = POLLOUT;
+	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || 
+			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+		LOGERR;
+		return -1;
+	}
 	if (send(cli->cli_sock, &hdr, sizeof hdr, MSG_NOSIGNAL) == -1) {
 		LOGERR;
 		return -1;
 	}
 
 	/* wait for reply */
-	pfd.fd = cli->cli_sock;
 	pfd.events = POLLIN | POLLPRI;
 	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {