--- libaitrpc/src/srv.c	2012/05/16 09:09:42	1.9.2.13
+++ libaitrpc/src/srv.c	2012/05/16 12:20:05	1.9.2.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.9.2.13 2012/05/16 09:09:42 misho Exp $
+* $Id: srv.c,v 1.9.2.14 2012/05/16 12:20:05 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -186,14 +186,14 @@ rxPacket(sched_task_t *task)
 	rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0);
 	if (rlen < 1) {
 		/* close connection */
-		schedEvent(TASK_ROOT(task), closeClient, c, 0, NULL, 0);
+		schedEvent(TASK_ROOT(task), closeClient, c, 42, NULL, 0);
 		return NULL;
 	}
 
 	do {
 		/* check RPC packet */
 		if (rlen < sizeof(struct tagRPCCall)) {
-			rpc_SetErr(ERPCMISMATCH, "Too short RPC packet");
+			rpc_SetErr(ERPCMISMATCH, "Short RPC packet");
 
 			schedReadSelf(task);
 			return NULL;
@@ -287,11 +287,31 @@ end:
 
 /* ------------------------------------------------------ */
 
-#if 0
 static void *
+closeBLOBClient(sched_task_t *task)
+{
+	rpc_cli_t *c = TASK_ARG(task);
+	rpc_srv_t *s = c->cli_parent;
+
+	schedCancelby(s->srv_blob.root, taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL);
+
+	/* close client socket */
+	if (TASK_VAL(task))
+		shutdown(c->cli_sock, SHUT_RDWR);
+	close(c->cli_sock);
+
+	/* free buffer */
+	AIT_FREE_VAL(&c->cli_buf);
+
+	io_arrayDel(s->srv_blob.clients, c->cli_id, 42);
+	return NULL;
+}
+
+static void *
 txBLOB(sched_task_t *task)
 {
-	u_char *buf = TASK_DATA(task);
+	rpc_cli_t *c = TASK_ARG(task);
+	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf;
 	int wlen = sizeof(struct tagBLOBHdr);
 
@@ -300,12 +320,11 @@ txBLOB(sched_task_t *task)
 	blob->hdr_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
 
 	/* send reply */
-	wlen = send(TASK_FD(task), buf, wlen, 0);
-	if (wlen == -1)
-		LOGERR;
-	else if (wlen != sizeof(struct tagBLOBHdr))
-		rpc_SetErr(EPROCUNAVAIL, "RPC reply, should be send %d bytes, "
-				"really sended %d bytes", sizeof(struct tagBLOBHdr), wlen);
+	wlen = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL);
+	if (wlen == -1 || wlen != sizeof(struct tagBLOBHdr)) {
+		/* close blob connection */
+		schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0);
+	}
 
 	return NULL;
 }
@@ -316,38 +335,24 @@ rxBLOB(sched_task_t *task)
 	rpc_cli_t *c = TASK_ARG(task);
 	rpc_srv_t *s = c->cli_parent;
 	rpc_blob_t *b;
-	u_char *buf = TASK_DATA(task);
+	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	struct tagBLOBHdr *blob = (struct tagBLOBHdr *) buf;
 	int rlen;
 	u_short crc;
-	struct timespec ts;
 
-	/* check for disable service at this moment? */
-	if (!s || s->srv_blob.state == disable) {
-		usleep(100000);
-#ifdef HAVE_PTHREAD_YIELD
-		pthread_yield();
-#endif
-		schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), 
-				TASK_DATA(task), TASK_DATLEN(task));
+	memset(buf, 0, AIT_LEN(&c->cli_buf));
+	rlen = recv(TASK_FD(task), buf, AIT_LEN(&c->cli_buf), 0);
+	if (rlen < 1) {
+		/* close blob connection */
+		schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0);
 		return NULL;
 	}
 
-	memset(buf, 0, TASK_DATLEN(task));
-	rlen = recv(TASK_FD(task), buf, TASK_DATLEN(task), 0);
-	if (rlen == -1) {
-		LOGERR;
-		c->cli_kill = kill;
-		return NULL;
-	} else if (!rlen) { /* receive EOF */
-		c->cli_kill = kill;
-		return NULL;
-	}
-
+	/* check BLOB packet */
 	if (rlen < sizeof(struct tagBLOBHdr)) {
-		rpc_SetErr(ERPCMISMATCH, "Too short BLOB packet");
-		schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), 
-				TASK_DATA(task), TASK_DATLEN(task));
+		rpc_SetErr(ERPCMISMATCH, "Short BLOB packet");
+
+		schedReadSelf(task);
 		return NULL;
 	}
 
@@ -356,8 +361,8 @@ rxBLOB(sched_task_t *task)
 	blob->hdr_crc ^= blob->hdr_crc;
 	if (crc != crcFletcher16((u_short*) buf, rlen / 2)) {
 		rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet");
-		schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), 
-				TASK_DATA(task), TASK_DATLEN(task));
+
+		schedReadSelf(task);
 		return NULL;
 	}
 
@@ -366,11 +371,6 @@ rxBLOB(sched_task_t *task)
 		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
 		blob->hdr_cmd = error;
 		goto end;
-	} else {
-		/* change socket timeout from last packet */
-		ts.tv_sec = blob->hdr_session.sess_timeout;
-		ts.tv_nsec = 0;
-		schedPolling(TASK_ROOT(task), &ts, NULL);
 	}
 
 	/* Go to proceed packet ... */
@@ -419,13 +419,10 @@ rxBLOB(sched_task_t *task)
 	}
 
 end:
-	schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), 
-			TASK_DATA(task), TASK_DATLEN(task));
-	schedRead(TASK_ROOT(task), rxBLOB, TASK_ARG(task), TASK_FD(task), 
-			TASK_DATA(task), TASK_DATLEN(task));
+	schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0);
+	schedReadSelf(task);
 	return NULL;
 }
-#endif
 
 static void *
 acceptBLOBClients(sched_task_t *task)
@@ -465,7 +462,7 @@ acceptBLOBClients(sched_task_t *task)
 	} else
 		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
 
-//	schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0);
+	schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0);
 end:
 	schedReadSelf(task);
 	return NULL;