--- libaitrpc/src/blob.c 2011/05/02 23:12:08 1.2 +++ libaitrpc/src/blob.c 2012/05/16 08:20:26 1.7.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: blob.c,v 1.2 2011/05/02 23:12:08 misho Exp $ +* $Id: blob.c,v 1.7.2.3 2012/05/16 08:20:26 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 +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 @@ -47,7 +47,8 @@ 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 * return: NULL error or !=NULL allocated BLOB object @@ -70,8 +71,8 @@ rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len 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) @@ -80,13 +81,12 @@ 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)); if (!blob) { @@ -112,7 +112,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 @@ -124,12 +125,16 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t 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; @@ -152,23 +157,23 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t } /* - * rpc_srv_blobUnmap() Unmap blob memory region + * rpc_srv_blobUnmap() - Unmap blob memory region + * * @blob = Mapped BLOB element * return: none */ inline void rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) { - if (!blob || !blob->blob_data) - rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); - else { + if (blob && blob->blob_data) { munmap(blob->blob_data, blob->blob_len); blob->blob_data = NULL; } } /* - * 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 @@ -179,16 +184,14 @@ 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) + } else 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; } @@ -196,10 +199,11 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ return 0; } -// ------------------------------------------------------------ +/* ------------------------------------------------------------ */ /* - * 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 @@ -211,21 +215,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, MSG_NOSIGNAL); + 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? @@ -235,24 +242,24 @@ 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, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid arguments"); return -1; } + 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) { + if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { LOGERR; 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; } @@ -261,104 +268,124 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ return ret; } -// ------------------------------------------------------------ +/* ------------------------------------------------------------ */ /* - * 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; struct tagBLOBHdr hdr; - fd_set fds; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; + struct pollfd pfd; if (!cli || !var || !data) { - rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid arguments"); return -1; } - 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; } - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { - case -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)) { + if (ret) LOGERR; - return -1; - case 0: - rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); - return -1; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + 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(ECANCELED, "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; - fd_set fds; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; + struct pollfd pfd; struct tagBLOBHdr hdr; if (!cli || !var || !data) { - rpc_SetErr(EINVAL, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid arguments"); 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)); + 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); @@ -366,18 +393,19 @@ 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) { - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - len = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv); - if (len < 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); *data = NULL; 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; @@ -385,32 +413,38 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t } } - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { - case -1: + /* wait for reply */ + 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, "Error:: Timeout reached! Server not responde ...\n"); - free(*data); - *data = NULL; - return -1; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + free(*data); + *data = NULL; + 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(ECANCELED, "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; } } @@ -418,60 +452,75 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t } /* - * rpc_cli_delBLOB() Delete BLOB from server + * 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, rpc_val_t * __restrict var) +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, "Error:: invalid arguments ...\n"); + rpc_SetErr(EINVAL, "Invalid arguments"); return -1; } - 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 = (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 UNSET request */ 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: + /* 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)) { + if (ret) LOGERR; - return -1; - case 0: - rpc_SetErr(ETIMEDOUT, "Error:: Timeout reached! Server not responde ...\n"); - return -1; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); + 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; + } return hdr.hdr_cmd == error; } /* - * rpc_cli_getBLOB() Receive BLOB from server and Delete after that + * 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, rpc_val_t * __restrict var, void ** data) +rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data) { int ret;