--- libaitrpc/src/blob.c 2011/08/29 23:26:56 1.3.2.1 +++ libaitrpc/src/blob.c 2011/09/07 07:24:21 1.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: blob.c,v 1.3.2.1 2011/08/29 23:26:56 misho Exp $ +* $Id: blob.c,v 1.4 2011/09/07 07:24:21 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -127,6 +127,10 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); return -1; } + if (blob->blob_data) { + rpc_SetErr(EPERM, "Error:: already mmapped object found!\n"); + return -1; + } memset(szFName, 0, sizeof szFName); snprintf(szFName, sizeof szFName, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); @@ -297,6 +301,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t return -1; } + /* send BLOB to server */ for (ret = AIT_LEN(var), pos = data; ret > 0; ret -= len, pos += len) if ((len = send(cli->cli_sock, pos, ret, 0)) == -1) { LOGERR; @@ -337,7 +342,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * return: -1 error, 0 ok, 1 remote error */ int -rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** data) +rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data) { int ret, len; uint8_t *pos; @@ -369,6 +374,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t return -1; } + /* receive BLOB from server */ for (ret = AIT_LEN(var), pos = *data; ret > 0; ret -= len, pos += len) { FD_ZERO(&fds); FD_SET(cli->cli_sock, &fds);