--- libaitrpc/src/blob.c 2010/07/08 07:32:53 1.1.2.11 +++ libaitrpc/src/blob.c 2012/03/29 01:34:16 1.6 @@ -1,8 +1,54 @@ +/************************************************************************* +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: blob.c,v 1.6 2012/03/29 01:34:16 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, 2012 + 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" /* - * rpc_srv_blobCreate() Create map blob to memory region and return object + * rpc_srv_blobCreate() - Create map blob to memory region and return object + * * @srv = RPC Server instance * @len = BLOB length object * return: NULL error or !=NULL allocated BLOB object @@ -15,13 +61,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, AIT_GET_STR(&srv->srv_blob.dir), rnd); f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600); if (f == -1) { if (errno == EEXIST) @@ -62,7 +113,8 @@ again: } /* - * rpc_srv_blobMap() Map blob to memory region + * rpc_srv_blobMap() - Map blob to memory region + * * @srv = RPC Server instance * @blob = Map to this BLOB element * return: -1 error or 0 ok @@ -71,45 +123,43 @@ 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"); + rpc_SetErr(EINVAL, "Invalid argument BLOB"); return -1; } + if (blob->blob_data) { + rpc_SetErr(EPERM, "Already mmapped object found!"); + 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, AIT_GET_STR(&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; } /* - * rpc_srv_blobUnmap() Unmap blob memory region + * rpc_srv_blobUnmap() - Unmap blob memory region + * * @blob = Mapped BLOB element * return: none */ @@ -117,16 +167,16 @@ inline void rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) { if (!blob || !blob->blob_data) - rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid arguments"); else { munmap(blob->blob_data, blob->blob_len); blob->blob_data = NULL; - blob->blob_len = 0; } } /* - * rpc_srv_blobFree() Free blob from disk & memory + * rpc_srv_blobFree() - Free blob from disk & memory + * * @srv = RPC Server instance * @blob = Mapped BLOB element * return: -1 error or 0 ok @@ -137,16 +187,16 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ char szFName[MAXPATHLEN]; if (!blob) { - rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid argument BLOB"); return -1; } 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, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var); + if (unlink(szFName) == -1) { LOGERR; return -1; } @@ -157,7 +207,8 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ // ------------------------------------------------------------ /* - * rpc_srv_sendBLOB() Send mapped BLOB to client + * rpc_srv_sendBLOB() - Send mapped BLOB to client + * * @cli = Client instance * @blob = Mapped BLOB element * return: -1 error, 0 ok @@ -169,21 +220,24 @@ rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_ uint8_t *pos; if (!cli || !blob || !blob->blob_data) { - rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid arguments"); 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; } /* - * rpc_srv_recvBLOB() Receive BLOB from client + * rpc_srv_recvBLOB() - Receive BLOB from client + * * @cli = Client instance * @blob = Mapped BLOB element * return: -1 error, 0 ok, >0 unreceived data from client, may be error? @@ -197,9 +251,10 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; if (!cli || !blob || !blob->blob_data) { - rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid arguments"); return -1; - } + } else + tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) { FD_ZERO(&fds); @@ -210,7 +265,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; } @@ -222,14 +278,15 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ // ------------------------------------------------------------ /* - * rpc_cli_sendBLOB() Send BLOB to server + * rpc_cli_sendBLOB() - Send BLOB to server + * * @cli = Client instance * @var = BLOB variable * @data = BLOB data * 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; @@ -238,61 +295,78 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; if (!cli || !var || !data) { - rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid arguments"); return -1; - } + } else + tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; - memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t)); + rpc_addPktSession(&hdr.hdr_session, cli->cli_parent); hdr.hdr_cmd = set; hdr.hdr_var = 0; hdr.hdr_ret = 0; - hdr.hdr_len = var->val_len; + hdr.hdr_len = htonl(AIT_LEN(var)); + /* calculate CRC */ + hdr.hdr_crc ^= hdr.hdr_crc; + hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2)); + + /* send SET request */ 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; } + /* wait for reply */ FD_ZERO(&fds); FD_SET(cli->cli_sock, &fds); switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { case -1: LOGERR; - return -1; + return 1; case 0: - rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); - return -1; + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not responde"); + return 1; } if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; - return -1; + return 1; } + /* check CRC */ + ret = ntohs(hdr.hdr_crc); + hdr.hdr_crc ^= hdr.hdr_crc; + if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); + 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; + if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { + rpc_SetErr(ECANCELED, "Bad return length packet"); + return 1; } - var->val.blob = hdr.hdr_var; + var->val.blob = ntohl(hdr.hdr_var); } return hdr.hdr_cmd == error; } /* - * rpc_cli_recvBLOB() Receive BLOB from server + * rpc_cli_recvBLOB() - Receive BLOB from server + * * @cli = Client instance * @var = BLOB variable * @data = BLOB data, must be free after use! * 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; @@ -301,22 +375,28 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t struct tagBLOBHdr hdr; if (!cli || !var || !data) { - rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid arguments"); return -1; - } + } else + tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; - *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)); + rpc_addPktSession(&hdr.hdr_session, cli->cli_parent); hdr.hdr_cmd = get; - hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var); + hdr.hdr_var = htonl((uint32_t) AIT_GET_BLOB(var)); hdr.hdr_ret = 0; hdr.hdr_len = 0; + /* calculate CRC */ + hdr.hdr_crc ^= hdr.hdr_crc; + hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2)); + + /* send GET request */ if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; free(*data); @@ -324,7 +404,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,15 +416,15 @@ 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); + /* wait for reply */ FD_ZERO(&fds); FD_SET(cli->cli_sock, &fds); switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { @@ -351,27 +432,117 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t LOGERR; free(*data); *data = NULL; - return -1; + return 1; case 0: - rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not responde"); free(*data); *data = NULL; - return -1; + return 1; } if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; free(*data); *data = NULL; - return -1; + return 1; } + /* check CRC */ + ret = ntohs(hdr.hdr_crc); + hdr.hdr_crc ^= hdr.hdr_crc; + if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); + 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"); + if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { + rpc_SetErr(ECANCELED, "Bad return length packet"); free(*data); *data = NULL; - return -1; + return 1; } } 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 }; + int ret; + + if (!cli || !var) { + rpc_SetErr(EINVAL, "Invalid arguments"); + return -1; + } else + tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; + + rpc_addPktSession(&hdr.hdr_session, cli->cli_parent); + hdr.hdr_cmd = unset; + hdr.hdr_var = htonl((uint32_t) AIT_GET_BLOB(var)); + hdr.hdr_ret = 0; + hdr.hdr_len = 0; + /* calculate CRC */ + hdr.hdr_crc ^= hdr.hdr_crc; + hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2)); + + /* send UNSET request */ + if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { + LOGERR; + return -1; + } + + /* wait for reply */ + 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, "Timeout reached! Server not responde"); + return 1; + } + if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { + LOGERR; + return 1; + } + /* check CRC */ + ret = ntohs(hdr.hdr_crc); + hdr.hdr_crc ^= hdr.hdr_crc; + if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); + 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; }