--- libaitrpc/src/blob.c	2012/03/15 01:55:33	1.5
+++ libaitrpc/src/blob.c	2012/03/29 01:34:16	1.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: blob.c,v 1.5 2012/03/15 01:55:33 misho Exp $
+* $Id: blob.c,v 1.6 2012/03/29 01:34:16 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -307,7 +307,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	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));
+	hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2));
 
 	/* send SET request */
 	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
@@ -340,7 +340,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, io_align(sizeof hdr, 1) / 2)) {
+	if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
 		return 1;
 	}
@@ -394,7 +394,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	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));
+	hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2));
 
 	/* send GET request */
 	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
@@ -448,7 +448,7 @@ rpc_cli_recvBLOB(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, io_align(sizeof hdr, 1) / 2)) {
+	if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
 		free(*data);
 		*data = NULL;
@@ -494,7 +494,7 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t 
 	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));
+	hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2));
 
 	/* send UNSET request */
 	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
@@ -520,7 +520,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, io_align(sizeof hdr, 1) / 2)) {
+	if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
 		return 1;
 	}