--- libaitrpc/src/blob.c	2010/07/08 07:32:53	1.1.2.11
+++ libaitrpc/src/blob.c	2010/07/08 11:16:47	1.1.2.14
@@ -16,7 +16,6 @@ rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
 	u_int rnd;
 
 	srandomdev();
-	srandom(getpid() ^ time(NULL));
 again:
 	rnd = random() % UINT_MAX;
 
@@ -71,7 +70,6 @@ inline int
 rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob)
 {
 	int f;
-	struct stat sb;
 	char szFName[MAXPATHLEN];
 
 	if (!blob) {
@@ -86,23 +84,17 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
 		LOGERR;
 		return -1;
 	}
-	if (fstat(f, &sb) == -1) {
-		LOGERR;
-		close(f);
-		return -1;
-	}
 
-	blob->blob_data = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0);
+	blob->blob_data = mmap(NULL, blob->blob_len, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0);
 	if (blob->blob_data == MAP_FAILED) {
 		LOGERR;
 		close(f);
 		blob->blob_data = NULL;
 		return -1;
 	} else {
-		blob->blob_len = sb.st_size;
 		close(f);
 
-		madvise(blob->blob_data, sb.st_size, MADV_SEQUENTIAL);
+		madvise(blob->blob_data, blob->blob_len, MADV_SEQUENTIAL);
 	}
 
 	return 0;
@@ -121,7 +113,6 @@ rpc_srv_blobUnmap(rpc_blob_t * __restrict blob)
 	else {
 		munmap(blob->blob_data, blob->blob_len);
 		blob->blob_data = NULL;
-		blob->blob_len = 0;
 	}
 }
 
@@ -342,7 +333,6 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 			return -1;
 		}
 	}
-	printf("get all bytes ret=%d *data=%s", ret, *data);
 
 	FD_ZERO(&fds);
 	FD_SET(cli->cli_sock, &fds);
@@ -374,4 +364,68 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 	}
 
 	return hdr.hdr_cmd == error;
+}
+
+/*
+ * rpc_cli_delBLOB() Delete BLOB from server
+ * @cli = Client instance
+ * @var = BLOB variable
+ * return: -1 error, 0 ok, 1 remote error
+ */
+int
+rpc_cli_delBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var)
+{
+	struct tagBLOBHdr hdr;
+	fd_set fds;
+	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
+
+	if (!cli || !var) {
+		rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n");
+		return -1;
+	}
+
+	memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t));
+	hdr.hdr_cmd = unset;
+	hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var);
+	hdr.hdr_ret = 0;
+	hdr.hdr_len = 0;
+	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
+		LOGERR;
+		return -1;
+	}
+
+	FD_ZERO(&fds);
+	FD_SET(cli->cli_sock, &fds);
+	switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) {
+		case -1:
+			LOGERR;
+			return -1;
+		case 0:
+			rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n");
+			return -1;
+	}
+	if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
+		LOGERR;
+		return -1;
+	}
+
+	return hdr.hdr_cmd == error;
+}
+
+/*
+ * rpc_cli_getBLOB() Receive BLOB from server and Delete after that
+ * @cli = Client instance
+ * @var = BLOB variable
+ * @data = BLOB data, must be free after use!
+ * return: -1 error, 0 ok, 1 remote error
+ */
+inline int
+rpc_cli_getBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void ** data)
+{
+	int ret;
+
+	ret = rpc_cli_recvBLOB(cli, var, data);
+	ret |= rpc_cli_delBLOB(cli, var) > 0 ? 2 : 0;
+
+	return ret;
 }