--- libaitrpc/src/srv.c	2013/08/23 13:13:07	1.18.2.1
+++ libaitrpc/src/srv.c	2013/08/23 13:34:52	1.18.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.18.2.1 2013/08/23 13:13:07 misho Exp $
+* $Id: srv.c,v 1.18.2.2 2013/08/23 13:34:52 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -180,6 +180,7 @@ txPacket(sched_task_t *task)
 			if (estlen > AIT_LEN(&c->cli_buf))
 				AIT_RE_BUF(&c->cli_buf, estlen);
 			buf = AIT_GET_BUF(&c->cli_buf);
+			rpc = (struct tagRPCCall*) buf;
 
 			rpc->call_argc = htons(array_Size(RPC_RETVARS(c)));
 			/* Go Encapsulate variables */
@@ -216,14 +217,12 @@ txPacket(sched_task_t *task)
 				LOGERR;
 			else
 				rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
-
 			/* close connection */
 			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
 					TASK_ARG(task), 0, NULL, 0);
 			return NULL;
 		}
 		ret = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL);
-			printf("...ret=%d %s %d\n", ret, strerror(errno), wlen);
 		if (ret == -1) {
 			/* close connection */
 			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
@@ -305,7 +304,7 @@ rxPacket(sched_task_t *task)
 	struct pollfd pfd;
 
 	memset(buf, 0, sizeof(struct tagRPCCall));
-	rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), 0);
+	rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), MSG_PEEK);
 	if (rlen < sizeof(struct tagRPCCall)) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
@@ -316,33 +315,31 @@ rxPacket(sched_task_t *task)
 		if (estlen > AIT_LEN(&c->cli_buf))
 			AIT_RE_BUF(&c->cli_buf, estlen);
 		rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf);
-		buf = AIT_GET_BUF(&c->cli_buf) + sizeof(struct tagRPCCall);
-		len = estlen - sizeof(struct tagRPCCall);
+		buf = AIT_GET_BUF(&c->cli_buf);
+		len = estlen;
 	}
 
-	if (len) {
-		/* get next part of packet */
-		memset(buf, 0, len);
-		pfd.fd = TASK_FD(task);
-		pfd.events = POLLIN | POLLPRI;
-		for (; len > 0; len -= rlen, buf += rlen) {
-			if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
-					pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-				if (rlen)
-					LOGERR;
-				else
-					rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
-				schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-						TASK_ARG(task), 0, NULL, 0);
-				return NULL;
-			}
-			rlen = recv(TASK_FD(task), buf, len, 0);
-			if (rlen == -1) {
-				/* close connection */
-				schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-						TASK_ARG(task), 0, NULL, 0);
-				return NULL;
-			}
+	/* get next part of packet */
+	memset(buf, 0, len);
+	pfd.fd = TASK_FD(task);
+	pfd.events = POLLIN | POLLPRI;
+	for (; len > 0; len -= rlen, buf += rlen) {
+		if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			if (rlen)
+				LOGERR;
+			else
+				rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond");
+			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+					TASK_ARG(task), 0, NULL, 0);
+			return NULL;
+		}
+		rlen = recv(TASK_FD(task), buf, len, 0);
+		if (rlen == -1) {
+			/* close connection */
+			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+					TASK_ARG(task), 0, NULL, 0);
+			return NULL;
 		}
 	}