--- libaitrpc/src/blob.c	2010/06/28 17:10:39	1.1.2.6
+++ libaitrpc/src/blob.c	2010/07/07 15:18:22	1.1.2.10
@@ -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;
 }
 
@@ -72,7 +81,7 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
 
 	memset(szFName, 0, MAXPATHLEN);
 	snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, blob->blob_var);
-	f = open(szFName, O_RDONLY);
+	f = open(szFName, O_RDWR);
 	if (f == -1) {
 		LOGERR;
 		return -1;
@@ -83,7 +92,7 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
 		return -1;
 	}
 
-	blob->blob_data = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, f, 0);
+	blob->blob_data = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0);
 	if (blob->blob_data == MAP_FAILED) {
 		LOGERR;
 		close(f);
@@ -235,7 +244,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 
 	memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t));
 	hdr.hdr_cmd = set;
-	hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var);
+	hdr.hdr_var = 0;
 	hdr.hdr_seq = 0;
 	hdr.hdr_len = var->val_len;
 	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
@@ -259,11 +268,19 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 			rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n");
 			return -1;
 	}
-	if (read(cli->cli_sock, &hdr, sizeof hdr) == -1) {
+	if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -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 = hdr.hdr_var;
+	}
+
 	return hdr.hdr_cmd == error;
 }
 
@@ -272,7 +289,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
  * @cli = Client instance
  * @var = BLOB variable
  * @data = BLOB data, must be free after use!
- * return: -1 error, 0 ok, >0 unreceived data from server, may be error?
+ * return: -1 error, 0 ok, 1 remote error
  */
 int
 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void ** data)
@@ -281,6 +298,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 	uint8_t *pos;
 	fd_set fds;
 	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
+	struct tagBLOBHdr hdr;
 
 	if (!cli || !var || !data) {
 		rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n");
@@ -294,6 +312,18 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 	} else
 		memset(*data, 0, var->val_len);
 
+	memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t));
+	hdr.hdr_cmd = get;
+	hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var);
+	hdr.hdr_seq = 0;
+	hdr.hdr_len = 0;
+	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
+		LOGERR;
+		free(*data);
+		*data = NULL;
+		return -1;
+	}
+
 	for (ret = var->val_len, pos = *data; ret > 0; ret -= len, pos += len) {
 		FD_ZERO(&fds);
 		FD_SET(cli->cli_sock, &fds);
@@ -313,5 +343,34 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 		}
 	}
 
-	return ret;
+	FD_ZERO(&fds);
+	FD_SET(cli->cli_sock, &fds);
+	switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) {
+		case -1:
+			LOGERR;
+			free(*data);
+			*data = NULL;
+			return -1;
+		case 0:
+			rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n");
+			free(*data);
+			*data = NULL;
+			return -1;
+	}
+	if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
+		LOGERR;
+		free(*data);
+		*data = NULL;
+		return -1;
+	}
+	if (hdr.hdr_cmd != error) {
+		if (hdr.hdr_len != var->val_len) {
+			rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n");
+			free(*data);
+			*data = NULL;
+			return -1;
+		}
+	}
+
+	return hdr.hdr_cmd == error;
 }