--- libaitrpc/src/blob.c 2012/05/16 08:20:26 1.7.2.3 +++ libaitrpc/src/blob.c 2013/07/15 13:53:10 1.13.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: blob.c,v 1.7.2.3 2012/05/16 08:20:26 misho Exp $ +* $Id: blob.c,v 1.13.2.2 2013/07/15 13:53:10 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ 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 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -53,7 +53,7 @@ SUCH DAMAGE. * @len = BLOB length object * return: NULL error or !=NULL allocated BLOB object */ -inline rpc_blob_t * +rpc_blob_t * rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len) { rpc_blob_t *blob = NULL; @@ -61,18 +61,11 @@ rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len int f; u_int rnd; -#ifdef HAVE_SRANDOMDEV - srandomdev(); -#else - time_t tim; - - srandom((time(&tim) ^ getpid())); -#endif again: rnd = random() % UINT_MAX; memset(szFName, 0, sizeof szFName); - snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), rnd); + snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), rnd); f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600); if (f == -1) { if (errno == EEXIST) @@ -88,7 +81,7 @@ again: return NULL; } - blob = malloc(sizeof(rpc_blob_t)); + blob = e_malloc(sizeof(rpc_blob_t)); if (!blob) { LOGERR; close(f); @@ -99,7 +92,7 @@ again: blob->blob_data = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0); if (blob->blob_data == MAP_FAILED) { LOGERR; - free(blob); + e_free(blob); close(f); unlink(szFName); return NULL; @@ -118,7 +111,7 @@ again: * @blob = Map to this BLOB element * return: -1 error or 0 ok */ -inline int +int rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob) { int f; @@ -134,7 +127,7 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t } memset(szFName, 0, sizeof szFName); - snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var); + snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var); f = open(szFName, O_RDWR); if (f == -1) { LOGERR; @@ -162,7 +155,7 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t * @blob = Mapped BLOB element * return: none */ -inline void +void rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) { if (blob && blob->blob_data) { @@ -178,7 +171,7 @@ rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) * @blob = Mapped BLOB element * return: -1 error or 0 ok */ -inline int +int rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob) { char szFName[MAXPATHLEN]; @@ -190,7 +183,7 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ rpc_srv_blobUnmap(blob); memset(szFName, 0, sizeof szFName); - snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var); + snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var); if (unlink(szFName) == -1) { LOGERR; return -1; @@ -254,7 +247,10 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) { if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - LOGERR; + if (len) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); return -1; } @@ -276,10 +272,12 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ * @cli = Client instance * @var = BLOB variable * @data = BLOB data + * @tout = BLOB live on server timeout in seconds, if =NULL default timeout * return: -1 error, 0 ok, 1 remote error */ int -rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void * __restrict data) +rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void * __restrict data, + int * __restrict tout) { int ret, len; uint8_t *pos; @@ -289,32 +287,36 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t if (!cli || !var || !data) { rpc_SetErr(EINVAL, "Invalid arguments"); return -1; - } + } else + memset(&hdr, 0, sizeof hdr); rpc_addPktSession(&hdr.hdr_session, cli->cli_parent); hdr.hdr_cmd = set; hdr.hdr_var = 0; - hdr.hdr_ret = 0; + hdr.hdr_ret = tout ? *tout : 0; 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) { + pfd.fd = cli->cli_sock; + pfd.events = POLLOUT; + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { LOGERR; return -1; } + if (send(cli->cli_sock, &hdr, sizeof hdr, MSG_NOSIGNAL) == -1) { + LOGERR; + 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) { + if ((len = send(cli->cli_sock, pos, ret, MSG_NOSIGNAL)) == -1) { LOGERR; return -1; } /* wait for reply */ - pfd.fd = cli->cli_sock; pfd.events = POLLIN | POLLPRI; if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { @@ -328,21 +330,17 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t 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; - } if (hdr.hdr_cmd != error) { + AIT_SET_BLOB(var, ntohl(hdr.hdr_var), ntohl(hdr.hdr_len)); + if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { + rpc_cli_delBLOB(cli, var); + AIT_NEW_BLOB(var, ntohl(hdr.hdr_len)); + rpc_SetErr(ECANCELED, "Bad return length packet"); return 1; } - - var->val.blob = ntohl(hdr.hdr_var); } return hdr.hdr_cmd == error; @@ -353,7 +351,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * * @cli = Client instance * @var = BLOB variable - * @data = BLOB data, must be free after use! + * @data = BLOB data, must be e_free after use! * return: -1 error, 0 ok, 1 remote error */ int @@ -369,45 +367,52 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t return -1; } - *data = malloc(AIT_LEN(var)); + *data = e_malloc(AIT_LEN(var)); if (!*data) { LOGERR; return -1; - } else + } else { + memset(&hdr, 0, sizeof hdr); memset(*data, 0, AIT_LEN(var)); + } rpc_addPktSession(&hdr.hdr_session, cli->cli_parent); hdr.hdr_cmd = get; 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 */ + pfd.fd = cli->cli_sock; + pfd.events = POLLOUT; + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + LOGERR; + e_free(*data); + *data = NULL; + return -1; + } if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; - free(*data); + e_free(*data); *data = NULL; return -1; } /* receive BLOB from server */ - pfd.fd = cli->cli_sock; pfd.events = POLLIN | POLLPRI; for (ret = AIT_LEN(var), pos = *data; ret > 0; ret -= len, pos += len) { if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { LOGERR; - free(*data); + e_free(*data); *data = NULL; return -1; } if ((len = recv(cli->cli_sock, pos, ret, 0)) == -1) { LOGERR; - free(*data); + e_free(*data); *data = NULL; return -1; } @@ -420,29 +425,20 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t LOGERR; else rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); - free(*data); + e_free(*data); *data = NULL; return 1; } if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; - free(*data); + e_free(*data); *data = NULL; 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 (ntohl(hdr.hdr_len) != AIT_LEN(var)) { rpc_SetErr(ECANCELED, "Bad return length packet"); - free(*data); + e_free(*data); *data = NULL; return 1; } @@ -468,25 +464,29 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t if (!cli || !var) { rpc_SetErr(EINVAL, "Invalid arguments"); return -1; - } + } else + memset(&hdr, 0, sizeof hdr); 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) { + pfd.fd = cli->cli_sock; + pfd.events = POLLOUT; + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { LOGERR; return -1; } + if (send(cli->cli_sock, &hdr, sizeof hdr, MSG_NOSIGNAL) == -1) { + LOGERR; + return -1; + } /* wait for reply */ - pfd.fd = cli->cli_sock; pfd.events = POLLIN | POLLPRI; if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { @@ -500,13 +500,6 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t 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; } @@ -516,10 +509,10 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t * * @cli = Client instance * @var = BLOB variable - * @data = BLOB data, must be free after use! + * @data = BLOB data, must be e_free after use! * return: -1 error, 0 ok, 1 remote error */ -inline int +int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data) { int ret;