--- libaitrpc/src/blob.c 2013/03/07 23:10:50 1.11 +++ libaitrpc/src/blob.c 2013/04/02 09:17:06 1.11.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: blob.c,v 1.11 2013/03/07 23:10:50 misho Exp $ +* $Id: blob.c,v 1.11.2.1 2013/04/02 09:17:06 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -293,9 +293,6 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t hdr.hdr_var = 0; hdr.hdr_ret = 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 */ pfd.fd = cli->cli_sock; @@ -331,13 +328,6 @@ 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) { if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { @@ -386,9 +376,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; @@ -443,15 +430,6 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t *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"); - e_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"); @@ -489,9 +467,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; @@ -518,13 +493,6 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t } if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { 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; }