--- libaitrpc/src/blob.c	2010/06/28 17:10:39	1.1.2.6
+++ libaitrpc/src/blob.c	2010/07/07 09:29:42	1.1.2.7
@@ -13,11 +13,20 @@ rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
 	rpc_blob_t *blob = NULL;
 	char szFName[MAXPATHLEN];
 	int f;
+	u_int rnd;
 
+	srandomdev();
+	srandom(getpid() ^ time(NULL));
+again:
+	rnd = random() % UINT_MAX;
+
 	memset(szFName, 0, MAXPATHLEN);
-	snprintf(szFName, MAXPATHLEN, "%s/BLOB-XXXXXXXX", srv->srv_blob.dir);
-	f = mkstemp(szFName);
+	snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, rnd);
+	f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600);
 	if (f == -1) {
+		if (errno == EEXIST)
+			goto again;
+
 		LOGERR;
 		return NULL;
 	}
@@ -48,7 +57,7 @@ rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
 		close(f);
 
 	blob->blob_len = len;
-	blob->blob_var = strtol(strrchr(szFName, '-') + 1, NULL, 16);
+	blob->blob_var = rnd;
 	return blob;
 }
 
@@ -137,6 +146,7 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_
 
 	memset(szFName, 0, MAXPATHLEN);
 	snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, blob->blob_var);
+	printf("remove %s\n", szFName);
 	if (remove(szFName) == -1) {
 		LOGERR;
 		return -1;
@@ -262,6 +272,14 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 	if (read(cli->cli_sock, &hdr, sizeof hdr) == -1) {
 		LOGERR;
 		return -1;
+	}
+	if (hdr.hdr_cmd != error) {
+		if (hdr.hdr_len != var->val_len) {
+			rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n");
+			return -1;
+		}
+
+		var->val.blob = (void*) hdr.hdr_var;
 	}
 
 	return hdr.hdr_cmd == error;