--- libaitrpc/src/blob.c 2010/07/08 09:18:51 1.1.2.13 +++ libaitrpc/src/blob.c 2011/08/19 14:10:53 1.2.4.5 @@ -1,3 +1,48 @@ +/************************************************************************* +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: blob.c,v 1.2.4.5 2011/08/19 14:10:53 misho Exp $ +* +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" @@ -15,13 +60,18 @@ rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len int f; u_int rnd; +#ifdef HAVE_SRANDOMDEV srandomdev(); - srandom(getpid() ^ time(NULL)); +#else + time_t tim; + + srandom((time(&tim) ^ getpid())); +#endif again: rnd = random() % UINT_MAX; - memset(szFName, 0, MAXPATHLEN); - snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, rnd); + memset(szFName, 0, sizeof szFName); + snprintf(szFName, sizeof szFName, BLOB_FILE, srv->srv_blob.dir, rnd); f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600); if (f == -1) { if (errno == EEXIST) @@ -78,8 +128,8 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t return -1; } - memset(szFName, 0, MAXPATHLEN); - snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); + memset(szFName, 0, sizeof szFName); + snprintf(szFName, sizeof szFName, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); f = open(szFName, O_RDWR); if (f == -1) { LOGERR; @@ -136,9 +186,9 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ if (blob->blob_data) rpc_srv_blobUnmap(blob); - memset(szFName, 0, MAXPATHLEN); - snprintf(szFName, MAXPATHLEN, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); - if (remove(szFName) == -1) { + memset(szFName, 0, sizeof szFName); + snprintf(szFName, sizeof szFName, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); + if (unlink(szFName) == -1) { LOGERR; return -1; } @@ -165,11 +215,13 @@ rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_ return -1; } - for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) - if ((len = send(cli->cli_sock, pos, ret > BLOBSIZ ? BLOBSIZ : ret, 0)) == -1) { + for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) { + len = send(cli->cli_sock, pos, ret, 0); + if (len == -1) { LOGERR; return -1; } + } return ret; } @@ -202,7 +254,8 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ return -1; } - if ((len = recv(cli->cli_sock, pos, BLOBSIZ, 0)) == -1) { + len = recv(cli->cli_sock, pos, ret, 0); + if (len == -1) { LOGERR; return -1; } @@ -245,7 +298,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t } for (ret = var->val_len, pos = data; ret > 0; ret -= len, pos += len) - if ((len = send(cli->cli_sock, pos, ret > BLOBSIZ ? BLOBSIZ : ret, 0)) == -1) { + if ((len = send(cli->cli_sock, pos, ret, 0)) == -1) { LOGERR; return -1; } @@ -266,7 +319,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t } if (hdr.hdr_cmd != error) { if (hdr.hdr_len != var->val_len) { - rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n"); + rpc_SetErr(ECANCELED, "Error:: Bad return length packet ...\n"); return -1; } @@ -327,7 +380,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t return -1; } - if ((len = recv(cli->cli_sock, pos, BLOBSIZ, 0)) == -1) { + if ((len = recv(cli->cli_sock, pos, ret, 0)) == -1) { LOGERR; free(*data); *data = NULL; @@ -357,7 +410,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t } if (hdr.hdr_cmd != error) { if (hdr.hdr_len != var->val_len) { - rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n"); + rpc_SetErr(ECANCELED, "Error:: Bad return length packet ...\n"); free(*data); *data = NULL; return -1;