--- libaitrpc/src/srv.c	2024/02/26 11:00:37	1.30.2.3
+++ libaitrpc/src/srv.c	2024/02/26 18:25:32	1.30.2.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.30.2.3 2024/02/26 11:00:37 misho Exp $
+* $Id: srv.c,v 1.30.2.10 2024/02/26 18:25:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2022
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -87,7 +87,8 @@ rpc_freeCli(rpc_cli_t * __restrict c)
 {
 	rpc_srv_t *s = c->cli_parent;
 
-	schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL);
+	if (s->srv_proto == SOCK_STREAM)
+		schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, c, NULL);
 
 	/* free buffer */
 	AIT_FREE_VAL(&c->cli_buf);
@@ -291,7 +292,7 @@ execCall(sched_task_t *task)
 			if (TASK_VAL(task)) {
 				/* without reply */
 				ait_freeVars(&c->cli_vars);
-			} else {
+			} else if (rpc->call_io & RPC_REQ) {
 				/* reply */
 				rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c));
 			}
@@ -323,8 +324,15 @@ rxPacket(sched_task_t *task)
 
 	/* prepare rx */
 	len = recv(TASK_FD(task), &b, sizeof b, MSG_PEEK);
-	if (len == sizeof b)
+	if (len < 1) {
+		/* close connection */
+		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
+				TASK_ARG(task), 0, NULL, 0);
+		taskExit(task, NULL);
+	} else if (len == sizeof b)
 		rlen = ntohl(b.call_len);
+	else
+		goto end;
 
 	rlen = recv(TASK_FD(task), buf, rlen, 0);
 	if (rlen == -1) {
@@ -390,7 +398,7 @@ err:
 	if (!noreply && (rpc->call_io & RPC_REQ))
 		schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], 
 				TASK_ARG(task), TASK_FD(task), rpc, len);
-
+end:
 	/* lets get next packet */
 	schedReadSelf(task);
 	taskExit(task, NULL);
@@ -553,7 +561,7 @@ rxUDPPacket(sched_task_t *task)
 
 	c = _allocClient(srv, &sa);
 	if (!c) {
-		EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n");
+		EVERBOSE(1, "RPC client quota exceeded!");
 		usleep(2000);	/* blocked client delay */
 		goto end;
 	} else {
@@ -1383,8 +1391,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		close(srv->srv_blob.server.cli_sock);
 		AIT_FREE_VAL(&srv->srv_blob.dir);
 		return -1;
-	} else
-		schedSignalDispatch(srv->srv_blob.root, 42);
+	}
 
 	return 0;
 }
@@ -1459,7 +1466,6 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
 	schedPolling(srv->srv_blob.root, &ts, NULL);
 	/* main rpc loop */
 	schedRun(srv->srv_blob.root, &srv->srv_blob.kill);
-	schedSignalDispatch(srv->srv_blob.root, 0);
 
 	/* detach blobs */
 	TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) {
@@ -1960,4 +1966,26 @@ rpc_srv_initServerExt(u_char InstID, int netBuf, int f
 	rpc_register_srvPing(srv);
 
 	return srv;
+}
+
+/*
+ * rpc_srv_Return() - Prepare IPC return answer to RPC client
+ *
+ * @c = RPC client 
+ * return: number of arguments in response
+ */
+int
+rpc_srv_Return(rpc_cli_t *c)
+{
+	rpc_srv_t *s = c->cli_parent;
+	u_char *buf = AIT_GET_BUF(&c->cli_buf);
+	struct tagRPCCall *rpc = (struct tagRPCCall*) buf;
+
+	if (!RPC_CHK_NOREPLY(rpc)) {
+		rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c));
+		schedWrite(s->srv_root, cbProto[s->srv_proto][CB_TXPACKET], c, c->cli_sock, rpc, 0);
+	} else
+		rpc->call_argc ^= rpc->call_argc;
+
+	return rpc->call_argc;
 }