--- libaitrpc/src/blob.c	2012/05/16 13:17:51	1.7.2.4
+++ libaitrpc/src/blob.c	2012/05/16 13:32:47	1.7.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: blob.c,v 1.7.2.4 2012/05/16 13:17:51 misho Exp $
+* $Id: blob.c,v 1.7.2.5 2012/05/16 13:32:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -294,14 +294,14 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2));
 
 	/* send SET request */
-	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
+	if (send(cli->cli_sock, &hdr, sizeof hdr, MSG_NOSIGNAL) == -1) {
 		LOGERR;
 		return -1;
 	}
 
 	/* send BLOB to server */
 	for (ret = AIT_LEN(var), pos = data; ret > 0; ret -= len, pos += len)
-		if ((len = send(cli->cli_sock, pos, ret, 0)) == -1) {
+		if ((len = send(cli->cli_sock, pos, ret, MSG_NOSIGNAL)) == -1) {
 			LOGERR;
 			return -1;
 		}
@@ -335,7 +335,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 			return 1;
 		}
 
-		var->val.blob = ntohl(hdr.hdr_var);
+		AIT_SET_BLOB(var, ntohl(hdr.hdr_var), ntohl(hdr.hdr_len));
 	}
 
 	return hdr.hdr_cmd == error;
@@ -473,7 +473,7 @@ rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t 
 	hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2));
 
 	/* send UNSET request */
-	if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) {
+	if (send(cli->cli_sock, &hdr, sizeof hdr, MSG_NOSIGNAL) == -1) {
 		LOGERR;
 		return -1;
 	}