--- libaitrpc/src/blob.c 2012/11/13 09:22:10 1.10 +++ libaitrpc/src/blob.c 2014/01/28 14:04:57 1.14.22.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: blob.c,v 1.10 2012/11/13 09:22:10 misho Exp $ +* $Id: blob.c,v 1.14.22.1 2014/01/28 14:04:57 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 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -46,20 +46,31 @@ SUCH DAMAGE. #include "global.h" +static void * +toutBLOB(sched_task_t *task) +{ + rpc_srv_unregisterBLOB(TASK_DATA(task), ((rpc_blob_t*) TASK_ARG(task))->blob_var); + + return NULL; +} + + /* * rpc_srv_blobCreate() - Create and map blob to memory region and return object * * @srv = RPC Server instance * @len = BLOB length object + * @tout = BLOB live timeout in seconds * return: NULL error or !=NULL allocated BLOB object */ -inline rpc_blob_t * -rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len) +rpc_blob_t * +rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len, int tout) { rpc_blob_t *blob = NULL; char szFName[MAXPATHLEN]; int f; u_int rnd; + struct timespec ts = { tout ? tout : RPC_BLOB_TIMEOUT, 0 }; again: rnd = random() % UINT_MAX; @@ -81,7 +92,7 @@ again: return NULL; } - blob = io_malloc(sizeof(rpc_blob_t)); + blob = e_malloc(sizeof(rpc_blob_t)); if (!blob) { LOGERR; close(f); @@ -92,7 +103,7 @@ again: blob->blob_data = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0); if (blob->blob_data == MAP_FAILED) { LOGERR; - io_free(blob); + e_free(blob); close(f); unlink(szFName); return NULL; @@ -101,6 +112,8 @@ again: blob->blob_len = len; blob->blob_var = rnd; + + schedTimer(srv->srv_blob.root, toutBLOB, blob, ts, srv, 0); return blob; } @@ -111,7 +124,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; @@ -155,7 +168,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) { @@ -171,7 +184,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]; @@ -182,6 +195,8 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ } else rpc_srv_blobUnmap(blob); + schedCancelby(srv->srv_blob.root, taskTIMER, CRITERIA_ARG, blob, NULL); + memset(szFName, 0, sizeof szFName); snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var); if (unlink(szFName) == -1) { @@ -272,10 +287,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 =0 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 tout) { int ret, len; uint8_t *pos; @@ -291,11 +308,8 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t rpc_addPktSession(&hdr.hdr_session, cli->cli_parent); hdr.hdr_cmd = set; hdr.hdr_var = 0; - hdr.hdr_ret = 0; + hdr.hdr_ret = tout; 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 */ pfd.fd = cli->cli_sock; @@ -331,21 +345,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; } - - AIT_SET_BLOB(var, ntohl(hdr.hdr_var), ntohl(hdr.hdr_len)); } return hdr.hdr_cmd == error; @@ -356,7 +366,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * * @cli = Client instance * @var = BLOB variable - * @data = BLOB data, must be io_free after use! + * @data = BLOB data, must be e_free after use! * return: -1 error, 0 ok, 1 remote error */ int @@ -372,7 +382,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t return -1; } - *data = io_malloc(AIT_LEN(var)); + *data = e_malloc(AIT_LEN(var)); if (!*data) { LOGERR; return -1; @@ -386,9 +396,6 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t 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; @@ -396,13 +403,13 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { LOGERR; - io_free(*data); + e_free(*data); *data = NULL; return -1; } if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; - io_free(*data); + e_free(*data); *data = NULL; return -1; } @@ -413,14 +420,14 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { LOGERR; - io_free(*data); + e_free(*data); *data = NULL; return -1; } if ((len = recv(cli->cli_sock, pos, ret, 0)) == -1) { LOGERR; - io_free(*data); + e_free(*data); *data = NULL; return -1; } @@ -433,29 +440,20 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t LOGERR; else rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); - io_free(*data); + e_free(*data); *data = NULL; return 1; } if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; - io_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"); - 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"); - io_free(*data); + e_free(*data); *data = NULL; return 1; } @@ -489,9 +487,6 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t 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 */ pfd.fd = cli->cli_sock; @@ -520,13 +515,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; } @@ -536,10 +524,10 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t * * @cli = Client instance * @var = BLOB variable - * @data = BLOB data, must be io_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;