--- libaitrpc/src/blob.c	2012/05/16 08:20:26	1.7.2.3
+++ libaitrpc/src/blob.c	2012/08/06 15:01:55	1.9.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: blob.c,v 1.7.2.3 2012/05/16 08:20:26 misho Exp $
+* $Id: blob.c,v 1.9.2.1 2012/08/06 15:01:55 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -61,18 +61,11 @@ rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
 	int f;
 	u_int rnd;
 
-#ifdef HAVE_SRANDOMDEV
-	srandomdev();
-#else
-	time_t tim;
-
-	srandom((time(&tim) ^ getpid()));
-#endif
 again:
 	rnd = random() % UINT_MAX;
 
 	memset(szFName, 0, sizeof szFName);
-	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), rnd);
+	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), rnd);
 	f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600);
 	if (f == -1) {
 		if (errno == EEXIST)
@@ -88,7 +81,7 @@ again:
 		return NULL;
 	}
 
-	blob = malloc(sizeof(rpc_blob_t));
+	blob = io_malloc(sizeof(rpc_blob_t));
 	if (!blob) {
 		LOGERR;
 		close(f);
@@ -99,7 +92,7 @@ again:
 	blob->blob_data = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0);
 	if (blob->blob_data == MAP_FAILED) {
 		LOGERR;
-		free(blob);
+		io_free(blob);
 		close(f);
 		unlink(szFName);
 		return NULL;
@@ -134,7 +127,7 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
 	}
 
 	memset(szFName, 0, sizeof szFName);
-	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var);
+	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var);
 	f = open(szFName, O_RDWR);
 	if (f == -1) {
 		LOGERR;
@@ -190,7 +183,7 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_
 		rpc_srv_blobUnmap(blob);
 
 	memset(szFName, 0, sizeof szFName);
-	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var);
+	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var);
 	if (unlink(szFName) == -1) {
 		LOGERR;
 		return -1;
@@ -254,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;
 		}
 
@@ -289,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;
@@ -301,20 +298,26 @@ 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 */
-	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
+	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;
+	}
 
 	/* send BLOB to server */
 	for (ret = AIT_LEN(var), pos = data; ret > 0; ret -= len, pos += len)
-		if ((len = send(cli->cli_sock, pos, ret, 0)) == -1) {
+		if ((len = send(cli->cli_sock, pos, ret, 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)) {
@@ -342,7 +345,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 			return 1;
 		}
 
-		var->val.blob = ntohl(hdr.hdr_var);
+		AIT_SET_BLOB(var, ntohl(hdr.hdr_var), ntohl(hdr.hdr_len));
 	}
 
 	return hdr.hdr_cmd == error;
@@ -353,7 +356,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
  *
  * @cli = Client instance
  * @var = BLOB variable
- * @data = BLOB data, must be free after use!
+ * @data = BLOB data, must be io_free after use!
  * return: -1 error, 0 ok, 1 remote error
  */
 int
@@ -369,12 +372,14 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 		return -1;
 	}
 
-	*data = malloc(AIT_LEN(var));
+	*data = io_malloc(AIT_LEN(var));
 	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;
@@ -386,28 +391,36 @@ 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;
+		io_free(*data);
+		*data = NULL;
+		return -1;
+	}
 	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
 		LOGERR;
-		free(*data);
+		io_free(*data);
 		*data = NULL;
 		return -1;
 	}
 
 	/* 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 || 
 				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 			LOGERR;
-			free(*data);
+			io_free(*data);
 			*data = NULL;
 			return -1;
 		}
 
 		if ((len = recv(cli->cli_sock, pos, ret, 0)) == -1) {
 			LOGERR;
-			free(*data);
+			io_free(*data);
 			*data = NULL;
 			return -1;
 		}
@@ -420,13 +433,13 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 			LOGERR;
 		else
 			rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
-		free(*data);
+		io_free(*data);
 		*data = NULL;
 		return 1;
 	}
 	if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
 		LOGERR;
-		free(*data);
+		io_free(*data);
 		*data = NULL;
 		return 1;
 	}
@@ -435,14 +448,14 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	hdr.hdr_crc ^= hdr.hdr_crc;
 	if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
-		free(*data);
+		io_free(*data);
 		*data = NULL;
 		return 1;
 	}
 	if (hdr.hdr_cmd != error) {
 		if (ntohl(hdr.hdr_len) != AIT_LEN(var)) {
 			rpc_SetErr(ECANCELED, "Bad return length packet");
-			free(*data);
+			io_free(*data);
 			*data = NULL;
 			return 1;
 		}
@@ -468,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;
@@ -480,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 */
-	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
+	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)) {
@@ -516,7 +536,7 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t 
  *
  * @cli = Client instance
  * @var = BLOB variable
- * @data = BLOB data, must be free after use!
+ * @data = BLOB data, must be io_free after use!
  * return: -1 error, 0 ok, 1 remote error
  */
 inline int