--- libaitrpc/src/blob.c	2012/03/15 01:55:33	1.5
+++ libaitrpc/src/blob.c	2012/05/11 09:18:13	1.6.2.1
@@ -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.2.1 2012/05/11 09:18:13 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -247,20 +247,18 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_
 {
 	int ret, len;
 	uint8_t *pos;
-	fd_set fds;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
+	struct pollfd pfd;
 
 	if (!cli || !blob || !blob->blob_data) {
 		rpc_SetErr(EINVAL, "Invalid arguments");
 		return -1;
-	} else
-		tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout;
+	}
 
+	pfd.fd = cli->cli_sock;
+	pfd.events = POLLIN | POLLPRI;
 	for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) {
-		FD_ZERO(&fds);
-		FD_SET(cli->cli_sock, &fds);
-		len = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv);
-		if (len < 1) {
+		if ((len = poll(&pfd, 1, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) == -1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 			LOGERR;
 			return -1;
 		}
@@ -307,7 +305,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 +338,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 +392,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 +446,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 +492,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 +518,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;
 	}