--- libaitrpc/src/blob.c 2011/09/07 07:24:21 1.4 +++ libaitrpc/src/blob.c 2012/03/15 01:22:55 1.4.4.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: blob.c,v 1.4 2011/09/07 07:24:21 misho Exp $ +* $Id: blob.c,v 1.4.4.4 2012/03/15 01:22:55 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 map blob to memory region and return object + * * @srv = RPC Server instance * @len = BLOB length object * return: NULL error or !=NULL allocated BLOB object @@ -71,7 +72,7 @@ again: rnd = random() % UINT_MAX; memset(szFName, 0, sizeof szFName); - snprintf(szFName, sizeof szFName, BLOB_FILE, srv->srv_blob.dir, rnd); + 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) @@ -112,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 @@ -124,16 +126,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, "Error:: already mmapped object found!\n"); + rpc_SetErr(EPERM, "Already mmapped object found!"); return -1; } memset(szFName, 0, sizeof szFName); - snprintf(szFName, sizeof szFName, BLOB_FILE, srv->srv_blob.dir, blob->blob_var); + 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; @@ -156,7 +158,8 @@ 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 */ @@ -164,7 +167,7 @@ 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; @@ -172,7 +175,8 @@ rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) } /* - * 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 @@ -183,7 +187,7 @@ 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; } @@ -191,7 +195,8 @@ 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, srv->srv_blob.dir, blob->blob_var); + LOGGER("dir=%s", AIT_GET_LIKE(&srv->srv_blob.dir, char*)); + snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var); if (unlink(szFName) == -1) { LOGERR; return -1; @@ -203,7 +208,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 @@ -215,7 +221,7 @@ 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; } @@ -231,7 +237,8 @@ rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_ } /* - * 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? @@ -245,9 +252,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); @@ -271,7 +279,8 @@ 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 @@ -287,15 +296,21 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_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 = 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, io_align(sizeof hdr, 1) / 2)); + + /* send SET request */ if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; return -1; @@ -308,34 +323,44 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t 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, io_align(sizeof hdr, 1) / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); + return 1; + } + if (hdr.hdr_cmd != error) { - if (hdr.hdr_len != AIT_LEN(var)) { - 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! @@ -351,9 +376,10 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_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(AIT_LEN(var)); if (!*data) { @@ -362,11 +388,16 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t } else 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) AIT_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, io_align(sizeof hdr, 1) / 2)); + + /* send GET request */ if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; free(*data); @@ -394,6 +425,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t } } + /* wait for reply */ FD_ZERO(&fds); FD_SET(cli->cli_sock, &fds); switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { @@ -401,25 +433,34 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_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, io_align(sizeof hdr, 1) / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); + free(*data); + *data = NULL; + return 1; + } if (hdr.hdr_cmd != error) { - if (hdr.hdr_len != AIT_LEN(var)) { - 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; } } @@ -427,7 +468,8 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_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 @@ -438,42 +480,58 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t struct tagBLOBHdr hdr; fd_set fds; struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; + int ret; if (!cli || !var) { - 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 = unset; - hdr.hdr_var = (uint32_t) AIT_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, io_align(sizeof hdr, 1) / 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; + 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, io_align(sizeof hdr, 1) / 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!