--- libaitrpc/src/srv.c	2012/11/19 10:29:02	1.12.2.5
+++ libaitrpc/src/srv.c	2012/11/19 14:51:52	1.12.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.12.2.5 2012/11/19 10:29:02 misho Exp $
+* $Id: srv.c,v 1.12.2.7 2012/11/19 14:51:52 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -204,7 +204,7 @@ txPacket(sched_task_t *task)
 	if (ret == -1 || ret != wlen) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-				c, 42, NULL, 0);
+				TASK_ARG(task), 42, NULL, 0);
 	}
 
 	return NULL;
@@ -281,7 +281,7 @@ rxPacket(sched_task_t *task)
 	if (rlen < 1) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-				c, 42, NULL, 0);
+				TASK_ARG(task), 42, NULL, 0);
 		return NULL;
 	} else {
 		rlen += off;	/* add reminded bytes from previous rxPacket, if exists! */
@@ -387,9 +387,9 @@ txUDPPacket(sched_task_t *task)
 	int ret, wlen = sizeof(struct tagRPCCall);
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
 
-	schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL);
+	schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL);
 	schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-			c, ts, c, 0);
+			 TASK_ARG(task), ts, TASK_ARG(task), 0);
 
 	/* copy RPC header */
 	memcpy(buf, TASK_DATA(task), wlen);
@@ -429,7 +429,7 @@ txUDPPacket(sched_task_t *task)
 	if (ret == -1 || ret != wlen) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
-				c, 42, NULL, 0);
+				 TASK_ARG(task), 42, NULL, 0);
 	}
 
 	return NULL;
@@ -457,8 +457,9 @@ rxUDPPacket(sched_task_t *task)
 	if (!c)
 		goto end;
 	else {
-		/* armed timer for close stateless connection */
+		memcpy(&c->cli_sa, &sa, sizeof c->cli_sa);
 		memcpy(AIT_GET_BUF(&c->cli_buf), buf, AIT_LEN(&c->cli_buf));
+		/* armed timer for close stateless connection */
 		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL);
 		schedTimer(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], 
 				c, ts, c, 0);
@@ -503,13 +504,13 @@ rxUDPPacket(sched_task_t *task)
 			rpc->call_rep.eno = RPC_ERROR(errno);
 		} else {
 			/* execute RPC call */
-			schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), off, NULL, 0);
+			schedEvent(TASK_ROOT(task), execCall, c, off, NULL, 0);
 		}
 
 		/* send RPC reply */
 		if (!noreply)
 			schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], 
-					TASK_ARG(task), TASK_FD(task), rpc, len);
+					c, TASK_FD(task), rpc, len);
 
 		off += len;
 	} while (rlen > 0);
@@ -924,12 +925,12 @@ rpc_srv_initServer(u_int regProgID, u_char regProcID, 
 		rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server");
 		return NULL;
 	}
-	if (!proto)
-		proto = SOCK_STREAM;
 	if (!io_gethostbyname(csHost, Port, &sa))
 		return NULL;
 	if (!Port)
 		Port = RPC_DEFPORT;
+	if (!proto)
+		proto = SOCK_STREAM;
 	if (netBuf < RPC_MIN_BUFSIZ)
 		netBuf = BUFSIZ;
 	else
@@ -1069,10 +1070,12 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
-	if (listen(srv->srv_server.cli_sock, io_arraySize(srv->srv_clients)) == -1) {
-		LOGERR;
-		return -1;
-	}
+	if (srv->srv_proto == SOCK_STREAM)
+		if (listen(srv->srv_server.cli_sock, 
+					io_arraySize(srv->srv_clients)) == -1) {
+			LOGERR;
+			return -1;
+		}
 
 	if (!schedRead(srv->srv_root, cbProto[srv->srv_proto][CB_ACCEPTCLIENT], srv, 
 				srv->srv_server.cli_sock, NULL, 0)) {