--- libaitrpc/src/blob.c	2012/05/14 08:39:05	1.7
+++ libaitrpc/src/blob.c	2012/05/16 13:17:51	1.7.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: blob.c,v 1.7 2012/05/14 08:39:05 misho Exp $
+* $Id: blob.c,v 1.7.2.4 2012/05/16 13:17:51 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,7 +47,7 @@ SUCH DAMAGE.
 
 
 /*
- * rpc_srv_blobCreate() - Create map blob to memory region and return object
+ * rpc_srv_blobCreate() - Create and map blob to memory region and return object
  *
  * @srv = RPC Server instance
  * @len = BLOB length object
@@ -61,13 +61,6 @@ 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;
 
@@ -81,13 +74,12 @@ again:
 		LOGERR;
 		return NULL;
 	}
-	if (lseek(f, len - 1, SEEK_SET) == -1) {
+	if (ftruncate(f, len) == -1) {
 		LOGERR;
 		close(f);
 		unlink(szFName);
 		return NULL;
-	} else
-		write(f, "", 1);
+	}
 
 	blob = malloc(sizeof(rpc_blob_t));
 	if (!blob) {
@@ -166,9 +158,7 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
 inline void
 rpc_srv_blobUnmap(rpc_blob_t * __restrict blob)
 {
-	if (!blob || !blob->blob_data)
-		rpc_SetErr(EINVAL, "Invalid arguments");
-	else {
+	if (blob && blob->blob_data) {
 		munmap(blob->blob_data, blob->blob_len);
 		blob->blob_data = NULL;
 	}
@@ -189,9 +179,7 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_
 	if (!blob) {
 		rpc_SetErr(EINVAL, "Invalid argument BLOB");
 		return -1;
-	}
-
-	if (blob->blob_data)
+	} else
 		rpc_srv_blobUnmap(blob);
 
 	memset(szFName, 0, sizeof szFName);
@@ -204,7 +192,7 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_
 	return 0;
 }
 
-// ------------------------------------------------------------
+/* ------------------------------------------------------------ */
 
 /*
  * rpc_srv_sendBLOB() - Send mapped BLOB to client
@@ -225,7 +213,7 @@ rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_
 	}
 
 	for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) {
-		len = send(cli->cli_sock, pos, ret, 0);
+		len = send(cli->cli_sock, pos, ret, MSG_NOSIGNAL);
 		if (len == -1) {
 			LOGERR;
 			return -1;
@@ -257,7 +245,7 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_
 	pfd.fd = cli->cli_sock;
 	pfd.events = POLLIN | POLLPRI;
 	for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) {
-		if ((len = poll(&pfd, 1, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) < 1 || 
+		if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 			LOGERR;
 			return -1;
@@ -273,7 +261,7 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_
 	return ret;
 }
 
-// ------------------------------------------------------------
+/* ------------------------------------------------------------ */
 
 /*
  * rpc_cli_sendBLOB() - Send BLOB to server
@@ -321,7 +309,7 @@ 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, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) < 1 || 
+	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 		if (ret)
 			LOGERR;
@@ -402,7 +390,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	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, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) < 1 || 
+		if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 			LOGERR;
 			free(*data);
@@ -419,7 +407,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	}
 
 	/* wait for reply */
-	if ((len = poll(&pfd, 1, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) < 1 || 
+	if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 		if (len)
 			LOGERR;
@@ -493,7 +481,7 @@ rpc_cli_delBLOB(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, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) < 1 || 
+	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 		if (ret)
 			LOGERR;