--- libaitrpc/src/blob.c	2010/07/07 12:32:22	1.1.2.9
+++ libaitrpc/src/blob.c	2010/07/07 15:18:22	1.1.2.10
@@ -244,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) {
@@ -268,7 +268,7 @@ 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;
 	}
@@ -278,7 +278,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t
 			return -1;
 		}
 
-		var->val.blob = (void*) hdr.hdr_var;
+		var->val.blob = hdr.hdr_var;
 	}
 
 	return hdr.hdr_cmd == error;
@@ -289,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)
@@ -298,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");
@@ -311,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);
@@ -330,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;
 }