--- libaitrpc/src/srv.c	2015/06/28 21:40:46	1.26.2.6
+++ libaitrpc/src/srv.c	2015/06/29 17:05:27	1.26.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.26.2.6 2015/06/28 21:40:46 misho Exp $
+* $Id: srv.c,v 1.26.2.7 2015/06/29 17:05:27 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -183,7 +183,6 @@ 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;
 #ifdef TCP_SESSION_TIMEOUT
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
 
@@ -236,27 +235,12 @@ txPacket(sched_task_t *task)
 #endif
 
 	/* send reply */
-	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! Client 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;
-		}
+	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;