--- libaitrpc/src/blob.c	2012/03/14 23:15:33	1.4.4.2
+++ libaitrpc/src/blob.c	2012/03/15 00:44:23	1.4.4.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: blob.c,v 1.4.4.2 2012/03/14 23:15:33 misho Exp $
+* $Id: blob.c,v 1.4.4.3 2012/03/15 00:44:23 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -300,14 +300,14 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	} 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 = htons(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, ((sizeof hdr + 1) & ~1) / 2));
+	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) {
@@ -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, ((sizeof hdr + 1) & ~1) / 2)) {
+	if (ret != crcFletcher16((u_short*) &hdr, io_align(sizeof hdr, 1) / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
 		return 1;
 	}
@@ -387,14 +387,14 @@ 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 = 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 + 1) & ~1) / 2));
+	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) {
@@ -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, ((sizeof hdr + 1) & ~1) / 2)) {
+	if (ret != crcFletcher16((u_short*) &hdr, io_align(sizeof hdr, 1) / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
 		free(*data);
 		*data = NULL;
@@ -487,14 +487,14 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t 
 	} 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 = 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 + 1) & ~1) / 2));
+	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) {
@@ -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, ((sizeof hdr + 1) & ~1) / 2)) {
+	if (ret != crcFletcher16((u_short*) &hdr, io_align(sizeof hdr, 1) / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
 		return 1;
 	}