--- libaitrpc/src/blob.c	2013/05/30 09:22:01	1.13
+++ libaitrpc/src/blob.c	2013/07/16 12:35:25	1.13.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: blob.c,v 1.13 2013/05/30 09:22:01 misho Exp $
+* $Id: blob.c,v 1.13.2.4 2013/07/16 12:35:25 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -46,20 +46,31 @@ SUCH DAMAGE.
 #include "global.h"
 
 
+static void *
+toutBLOB(sched_task_t *task)
+{
+	rpc_srv_unregisterBLOB(TASK_DATA(task), ((rpc_blob_t*) TASK_ARG(task))->blob_var);
+
+	return NULL;
+}
+
+
 /*
  * rpc_srv_blobCreate() - Create and map blob to memory region and return object
  *
  * @srv = RPC Server instance
  * @len = BLOB length object
+ * @tout = BLOB live timeout in seconds
  * return: NULL error or !=NULL allocated BLOB object
  */
 rpc_blob_t *
-rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len)
+rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len, int tout)
 {
 	rpc_blob_t *blob = NULL;
 	char szFName[MAXPATHLEN];
 	int f;
 	u_int rnd;
+	struct timespec ts = { tout ? tout : RPC_BLOB_TIMEOUT, 0 };
 
 again:
 	rnd = random() % UINT_MAX;
@@ -101,6 +112,8 @@ again:
 
 	blob->blob_len = len;
 	blob->blob_var = rnd;
+
+	schedTimer(srv->srv_blob.root, toutBLOB, blob, ts, srv, 0);
 	return blob;
 }
 
@@ -182,6 +195,8 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_
 	} else
 		rpc_srv_blobUnmap(blob);
 
+	schedCancelby(srv->srv_blob.root, taskTIMER, CRITERIA_ARG, blob, NULL);
+
 	memset(szFName, 0, sizeof szFName);
 	snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var);
 	if (unlink(szFName) == -1) {
@@ -272,10 +287,12 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_
  * @cli = Client instance
  * @var = BLOB variable
  * @data = BLOB data
+ * @tout = BLOB live on server timeout in seconds, if =0 default timeout
  * return: -1 error, 0 ok, 1 remote error
  */
 int
-rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void * __restrict data)
+rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, 
+		void * __restrict data, int tout)
 {
 	int ret, len;
 	uint8_t *pos;
@@ -291,7 +308,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	rpc_addPktSession(&hdr.hdr_session, cli->cli_parent);
 	hdr.hdr_cmd = set;
 	hdr.hdr_var = 0;
-	hdr.hdr_ret = 0;
+	hdr.hdr_ret = tout;
 	hdr.hdr_len = htonl(AIT_LEN(var));
 
 	/* send SET request */
@@ -330,12 +347,15 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	}
 
 	if (hdr.hdr_cmd != error) {
+		AIT_SET_BLOB(var, ntohl(hdr.hdr_var), ntohl(hdr.hdr_len));
+
 		if (ntohl(hdr.hdr_len) != AIT_LEN(var)) {
+			rpc_cli_delBLOB(cli, var);
+			AIT_NEW_BLOB(var, ntohl(hdr.hdr_len));
+
 			rpc_SetErr(ECANCELED, "Bad return length packet");
 			return 1;
 		}
-
-		AIT_SET_BLOB(var, ntohl(hdr.hdr_var), ntohl(hdr.hdr_len));
 	}
 
 	return hdr.hdr_cmd == error;