--- libaitrpc/src/blob.c 2012/03/14 23:15:33 1.4.4.2 +++ libaitrpc/src/blob.c 2012/11/13 09:22:10 1.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: blob.c,v 1.4.4.2 2012/03/14 23:15:33 misho Exp $ +* $Id: blob.c,v 1.10 2012/11/13 09:22:10 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -47,7 +47,7 @@ SUCH DAMAGE. /* - * rpc_srv_blobCreate() - Create map blob to memory region and return object + * rpc_srv_blobCreate() - Create and map blob to memory region and return object * * @srv = RPC Server instance * @len = BLOB length object @@ -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) @@ -81,15 +74,14 @@ again: LOGERR; return NULL; } - if (lseek(f, len - 1, SEEK_SET) == -1) { + if (ftruncate(f, len) == -1) { LOGERR; close(f); unlink(szFName); return NULL; - } else - write(f, "", 1); + } - blob = malloc(sizeof(rpc_blob_t)); + blob = io_malloc(sizeof(rpc_blob_t)); if (!blob) { LOGERR; close(f); @@ -100,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); + io_free(blob); close(f); unlink(szFName); return NULL; @@ -135,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; @@ -166,9 +158,7 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t inline void rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) { - if (!blob || !blob->blob_data) - rpc_SetErr(EINVAL, "Invalid arguments"); - else { + if (blob && blob->blob_data) { munmap(blob->blob_data, blob->blob_len); blob->blob_data = NULL; } @@ -189,13 +179,11 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ if (!blob) { rpc_SetErr(EINVAL, "Invalid argument BLOB"); return -1; - } - - if (blob->blob_data) + } else 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; @@ -204,7 +192,7 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ return 0; } -// ------------------------------------------------------------ +/* ------------------------------------------------------------ */ /* * rpc_srv_sendBLOB() - Send mapped BLOB to client @@ -225,7 +213,7 @@ rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_ } for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) { - len = send(cli->cli_sock, pos, ret, 0); + len = send(cli->cli_sock, pos, ret, MSG_NOSIGNAL); if (len == -1) { LOGERR; return -1; @@ -247,21 +235,22 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ { int ret, len; uint8_t *pos; - fd_set fds; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; + struct pollfd pfd; if (!cli || !blob || !blob->blob_data) { rpc_SetErr(EINVAL, "Invalid arguments"); return -1; - } else - tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; + } + pfd.fd = cli->cli_sock; + pfd.events = POLLIN | POLLPRI; for (ret = blob->blob_len, pos = blob->blob_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); - if (len < 1) { - LOGERR; + if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (len) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); return -1; } @@ -275,7 +264,7 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ return ret; } -// ------------------------------------------------------------ +/* ------------------------------------------------------------ */ /* * rpc_cli_sendBLOB() - Send BLOB to server @@ -291,47 +280,52 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t int ret, len; uint8_t *pos; struct tagBLOBHdr hdr; - fd_set fds; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; + struct pollfd pfd; if (!cli || !var || !data) { rpc_SetErr(EINVAL, "Invalid arguments"); return -1; } else - tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; + memset(&hdr, 0, sizeof hdr); - 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 = htons(AIT_LEN(var)); + 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 + 1) & ~1) / 2)); + 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 */ - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { - case -1: + pfd.events = POLLIN | POLLPRI; + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (ret) LOGERR; - return 1; - case 0: - rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not responde"); - return 1; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + return -1; } if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; @@ -340,7 +334,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t /* check CRC */ ret = ntohs(hdr.hdr_crc); hdr.hdr_crc ^= hdr.hdr_crc; - if (ret != crcFletcher16((u_short*) &hdr, ((sizeof hdr + 1) & ~1) / 2)) { + if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); return 1; } @@ -351,7 +345,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t return 1; } - var->val.blob = ntohl(hdr.hdr_var); + AIT_SET_BLOB(var, ntohl(hdr.hdr_var), ntohl(hdr.hdr_len)); } return hdr.hdr_cmd == error; @@ -362,7 +356,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 io_free after use! * return: -1 error, 0 ok, 1 remote error */ int @@ -370,94 +364,98 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t { int ret, len; uint8_t *pos; - fd_set fds; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; + struct pollfd pfd; struct tagBLOBHdr hdr; if (!cli || !var || !data) { rpc_SetErr(EINVAL, "Invalid arguments"); return -1; - } else - tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; + } - *data = malloc(AIT_LEN(var)); + *data = io_malloc(AIT_LEN(var)); if (!*data) { LOGERR; return -1; - } else + } else { + memset(&hdr, 0, sizeof hdr); 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 = 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 + 1) & ~1) / 2)); + 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; + io_free(*data); + *data = NULL; + return -1; + } if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; - free(*data); + io_free(*data); *data = NULL; return -1; } /* receive BLOB from server */ + pfd.events = POLLIN | POLLPRI; 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); - if (len < 1) { + if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { LOGERR; - free(*data); + io_free(*data); *data = NULL; return -1; } if ((len = recv(cli->cli_sock, pos, ret, 0)) == -1) { LOGERR; - free(*data); + io_free(*data); *data = NULL; 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: + if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (len) LOGERR; - free(*data); - *data = NULL; - return 1; - case 0: - rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not responde"); - free(*data); - *data = NULL; - return 1; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + io_free(*data); + *data = NULL; + return 1; } if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; - free(*data); + io_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 + 1) & ~1) / 2)) { + if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); - free(*data); + io_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); + io_free(*data); *data = NULL; return 1; } @@ -477,41 +475,46 @@ 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 }; + struct pollfd pfd; int ret; if (!cli || !var) { rpc_SetErr(EINVAL, "Invalid arguments"); return -1; } else - tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; + memset(&hdr, 0, sizeof hdr); - memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t)); + 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 + 1) & ~1) / 2)); + 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 */ - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { - case -1: + pfd.events = POLLIN | POLLPRI; + if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (ret) LOGERR; - return 1; - case 0: - rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not responde"); - return 1; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + return 1; } if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; @@ -520,7 +523,7 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t /* check CRC */ ret = ntohs(hdr.hdr_crc); hdr.hdr_crc ^= hdr.hdr_crc; - if (ret != crcFletcher16((u_short*) &hdr, ((sizeof hdr + 1) & ~1) / 2)) { + if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); return 1; } @@ -533,7 +536,7 @@ 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 io_free after use! * return: -1 error, 0 ok, 1 remote error */ inline int