--- libaitrpc/src/blob.c 2010/07/08 07:32:53 1.1.2.11 +++ libaitrpc/src/blob.c 2011/09/07 07:24:21 1.4 @@ -1,3 +1,48 @@ +/************************************************************************* +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: blob.c,v 1.4 2011/09/07 07:24:21 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) @@ -71,38 +121,35 @@ inline int rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob) { int f; - struct stat sb; char szFName[MAXPATHLEN]; if (!blob) { 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, 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; return -1; } - if (fstat(f, &sb) == -1) { - LOGERR; - close(f); - return -1; - } - blob->blob_data = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0); + blob->blob_data = mmap(NULL, blob->blob_len, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0); if (blob->blob_data == MAP_FAILED) { LOGERR; close(f); blob->blob_data = NULL; return -1; } else { - blob->blob_len = sb.st_size; close(f); - madvise(blob->blob_data, sb.st_size, MADV_SEQUENTIAL); + madvise(blob->blob_data, blob->blob_len, MADV_SEQUENTIAL); } return 0; @@ -121,7 +168,6 @@ rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) else { munmap(blob->blob_data, blob->blob_len); blob->blob_data = NULL; - blob->blob_len = 0; } } @@ -144,9 +190,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; } @@ -173,11 +219,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; } @@ -210,7 +258,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; } @@ -229,7 +278,7 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ * return: -1 error, 0 ok, 1 remote error */ int -rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t * __restrict var, void * __restrict data) +rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void * __restrict data) { int ret, len; uint8_t *pos; @@ -246,14 +295,15 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t hdr.hdr_cmd = set; hdr.hdr_var = 0; hdr.hdr_ret = 0; - hdr.hdr_len = var->val_len; + hdr.hdr_len = AIT_LEN(var); if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; return -1; } - 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) { + /* 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; return -1; } @@ -273,8 +323,8 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t return -1; } if (hdr.hdr_cmd != error) { - if (hdr.hdr_len != var->val_len) { - rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n"); + if (hdr.hdr_len != AIT_LEN(var)) { + rpc_SetErr(ECANCELED, "Error:: Bad return length packet ...\n"); return -1; } @@ -292,7 +342,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t * return: -1 error, 0 ok, 1 remote error */ int -rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_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; @@ -305,16 +355,16 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t return -1; } - *data = malloc(var->val_len); + *data = malloc(AIT_LEN(var)); if (!*data) { LOGERR; return -1; } else - memset(*data, 0, var->val_len); + memset(*data, 0, AIT_LEN(var)); 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_var = (uint32_t) AIT_GET_BLOB(var); hdr.hdr_ret = 0; hdr.hdr_len = 0; if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { @@ -324,7 +374,8 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t return -1; } - for (ret = var->val_len, pos = *data; ret > 0; ret -= len, pos += len) { + /* 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); len = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv); @@ -335,14 +386,13 @@ 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; return -1; } } - printf("get all bytes ret=%d *data=%s", ret, *data); FD_ZERO(&fds); FD_SET(cli->cli_sock, &fds); @@ -365,8 +415,8 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t return -1; } if (hdr.hdr_cmd != error) { - if (hdr.hdr_len != var->val_len) { - rpc_SetErr(EBADMSG, "Error:: Bad return length packet ...\n"); + if (hdr.hdr_len != AIT_LEN(var)) { + rpc_SetErr(ECANCELED, "Error:: Bad return length packet ...\n"); free(*data); *data = NULL; return -1; @@ -374,4 +424,68 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t } return hdr.hdr_cmd == error; +} + +/* + * rpc_cli_delBLOB() Delete BLOB from server + * @cli = Client instance + * @var = BLOB variable + * return: -1 error, 0 ok, 1 remote error + */ +int +rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var) +{ + struct tagBLOBHdr hdr; + fd_set fds; + struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; + + if (!cli || !var) { + rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + return -1; + } + + memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t)); + hdr.hdr_cmd = unset; + hdr.hdr_var = (uint32_t) AIT_GET_BLOB(var); + hdr.hdr_ret = 0; + hdr.hdr_len = 0; + if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { + LOGERR; + return -1; + } + + FD_ZERO(&fds); + FD_SET(cli->cli_sock, &fds); + switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { + case -1: + LOGERR; + return -1; + case 0: + rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); + return -1; + } + if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { + LOGERR; + return -1; + } + + return hdr.hdr_cmd == error; +} + +/* + * rpc_cli_getBLOB() Receive BLOB from server and Delete after that + * @cli = Client instance + * @var = BLOB variable + * @data = BLOB data, must be free after use! + * return: -1 error, 0 ok, 1 remote error + */ +inline int +rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data) +{ + int ret; + + ret = rpc_cli_recvBLOB(cli, var, data); + ret |= rpc_cli_delBLOB(cli, var) > 0 ? 2 : 0; + + return ret; }