--- libaitrpc/src/srv.c	2013/08/22 15:31:09	1.18
+++ libaitrpc/src/srv.c	2013/08/23 13:53:15	1.19
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.18 2013/08/22 15:31:09 misho Exp $
+* $Id: srv.c,v 1.19 2013/08/23 13:53:15 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -164,6 +164,7 @@ txPacket(sched_task_t *task)
 	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
 	int ret, estlen, wlen = sizeof(struct tagRPCCall);
+	struct pollfd pfd;
 
 	if (rpc->call_argc) {
 		f = rpc_srv_getCall(s, ntohs(rpc->call_tag));
@@ -179,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 */
@@ -188,6 +190,7 @@ txPacket(sched_task_t *task)
 			ait_freeVars(&c->cli_vars);
 			if (ret == -1) {
 				rpc_SetErr(EBADRPC, "Prepare RPC packet failed");
+
 				rpc->call_argc ^= rpc->call_argc;
 				rpc->call_rep.ret = RPC_ERROR(-1);
 				rpc->call_rep.eno = RPC_ERROR(rpc_Errno);
@@ -205,11 +208,27 @@ txPacket(sched_task_t *task)
 #endif
 
 	/* send reply */
-	ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL);
-	if (ret == -1 || ret != wlen) {
-		/* close connection */
-		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-				TASK_ARG(task), 0, NULL, 0);
+	pfd.fd = TASK_FD(task);
+	pfd.events = POLLOUT;
+	for (; wlen > 0; wlen -= ret, buf += ret) {
+		if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			if (ret)
+				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);
+		if (ret == -1) {
+			/* close connection */
+			schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+					TASK_ARG(task), 0, NULL, 0);
+			return NULL;
+		}
 	}
 
 	return NULL;
@@ -282,9 +301,10 @@ rxPacket(sched_task_t *task)
 #endif
 	u_char *buf = AIT_GET_BUF(&c->cli_buf);
 	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
+	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], 
@@ -295,13 +315,25 @@ 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);
+	/* 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 */