--- libaitrpc/src/srv.c	2013/07/15 14:16:52	1.16.2.1
+++ libaitrpc/src/srv.c	2013/07/16 12:53:54	1.16.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.16.2.1 2013/07/15 14:16:52 misho Exp $
+* $Id: srv.c,v 1.16.2.7 2013/07/16 12:53:54 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -559,16 +559,6 @@ closeBLOBClient(sched_task_t *task)
 }
 
 static void *
-toutBLOB(sched_task_t *task)
-{
-	rpc_cli_t *c = TASK_DATA(task);
-
-	rpc_srv_unregisterBLOB((rpc_srv_t*) c->cli_parent, (uint32_t) TASK_ARG(task));
-
-	return NULL;
-}
-
-static void *
 txBLOB(sched_task_t *task)
 {
 	rpc_cli_t *c = TASK_ARG(task);
@@ -593,7 +583,6 @@ rxBLOB(sched_task_t *task)
 	rpc_blob_t *b;
 	struct tagBLOBHdr blob;
 	int rlen;
-	struct timespec ts = { RPC_BLOB_TIMEOUT, 0 };
 
 	memset(&blob, 0, sizeof blob);
 	rlen = recv(TASK_FD(task), &blob, sizeof blob, 0);
@@ -639,20 +628,14 @@ rxBLOB(sched_task_t *task)
 			}
 			break;
 		case set:
-			if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len)))) {
+			if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len), 
+							ntohl(blob.hdr_ret)))) {
 				/* set new BLOB variable for reply :) */
 				blob.hdr_var = htonl(b->blob_var);
 
-				/* set live BLOB timeout */
-				ts.tv_sec = blob.hdr_ret ? blob.hdr_ret : RPC_BLOB_TIMEOUT;
-
 				/* receive BLOB from client */
 				blob.hdr_ret = htonl(rpc_srv_recvBLOB(c, b));
 				rpc_srv_blobUnmap(b);
-
-				schedTimer(TASK_ROOT(task), toutBLOB, 
-						(void*) (intptr_t) ntohl(blob.hdr_var), ts, 
-						TASK_ARG(task), ntohl(blob.hdr_len));
 			} else {
 				blob.hdr_cmd = error;
 				blob.hdr_ret = RPC_ERROR(-1);
@@ -663,9 +646,6 @@ rxBLOB(sched_task_t *task)
 				blob.hdr_cmd = error;
 				blob.hdr_ret = RPC_ERROR(-1);
 			}
-
-			schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_ARG, 
-					(void*) (intptr_t) ntohl(blob.hdr_var), NULL);
 			break;
 		default:
 			rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd);
@@ -681,6 +661,23 @@ end:
 }
 
 static void *
+flushBLOB(sched_task_t *task)
+{
+	rpc_srv_t *srv = TASK_ARG(task);
+	rpc_blob_t *b, *tmp;
+
+	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
+		TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
+
+		rpc_srv_blobFree(srv, b);
+		e_free(b);
+	}
+
+	schedSignalSelf(task);
+	return NULL;
+}
+
+static void *
 acceptBLOBClients(sched_task_t *task)
 {
 	rpc_srv_t *srv = TASK_ARG(task);
@@ -854,6 +851,8 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 		return;
 
 	srv->srv_blob.kill = 1;
+
+	schedEnd(&srv->srv_blob.root);
 }
 
 /*
@@ -880,6 +879,7 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
+	schedSignal(srv->srv_blob.root, flushBLOB, srv, SIGFBLOB, NULL, 0);
 	if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, 
 				srv->srv_blob.server.cli_sock, NULL, 0)) {
 		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
@@ -890,6 +890,14 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
 	/* main rpc loop */
 	schedRun(srv->srv_blob.root, &srv->srv_blob.kill);
 
+	/* detach blobs */
+	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
+		TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
+
+		rpc_srv_blobFree(srv, b);
+		e_free(b);
+	}
+
 	/* close all clients connections & server socket */
 	for (i = 0; i < array_Size(srv->srv_blob.clients); i++) {
 		c = array(srv->srv_blob.clients, i, rpc_cli_t*);
@@ -906,15 +914,6 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
 
 	close(srv->srv_blob.server.cli_sock);
 
-	/* detach blobs */
-	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
-		TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node);
-
-		rpc_srv_blobFree(srv, b);
-		e_free(b);
-	}
-
-	schedEnd(&srv->srv_blob.root);
 	AIT_FREE_VAL(&srv->srv_blob.dir);
 	return 0;
 }
@@ -1057,12 +1056,13 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 		return;
 
 	/* if send kill to blob server */
-	if (!(*psrv)->srv_blob.kill)
-		rpc_srv_endBLOBServer(*psrv);
+	rpc_srv_endBLOBServer(*psrv);
 
 	(*psrv)->srv_kill = 1;
 	sleep(RPC_SCHED_POLLING);
 
+	schedEnd(&(*psrv)->srv_root);
+
 	pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx);
 	e_free(*psrv);
 	*psrv = NULL;
@@ -1131,7 +1131,6 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 	srv->srv_funcs.avlh_root = NULL;
 	RPC_FUNCS_UNLOCK(&srv->srv_funcs);
 
-	schedEnd(&srv->srv_root);
 	return 0;
 }