--- libaitrpc/src/srv.c	2024/02/26 18:25:32	1.30.2.10
+++ libaitrpc/src/srv.c	2024/03/20 17:32:31	1.31
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.30.2.10 2024/02/26 18:25:32 misho Exp $
+* $Id: srv.c,v 1.31 2024/03/20 17:32:31 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -147,6 +147,11 @@ _allocClient(rpc_srv_t * __restrict srv, sockaddr_t * 
 
 		/* alloc empty buffer */
 		AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf);
+		if (!AIT_GET_BUF(&c->cli_buf)) {
+			array_Del(srv->srv_clients, n, 0);
+			e_free(c);
+			c = NULL;
+		}
 	}
 
 	return c;
@@ -308,7 +313,7 @@ rxPacket(sched_task_t *task)
 {
 	rpc_cli_t *c = TASK_ARG(task);
 	rpc_srv_t *s = c->cli_parent;
-	int len, noreply = 0, rlen = AIT_LEN(&c->cli_buf);
+	int len, noreply = 0, rlen;
 #if 0
 	u_short crc;
 #endif
@@ -998,7 +1003,7 @@ rxEXTPacket(sched_task_t *task)
 {
 	rpc_srv_t *srv = TASK_ARG(task);
 	rpc_cli_t *c = NULL;
-	int len, noreply = 0, rlen = AIT_LEN(&c->cli_buf);
+	int len, noreply = 0, rlen;
 	struct tagRPCCall *rpc;
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
 	sockaddr_t sa;
@@ -1566,8 +1571,7 @@ rpc_srv_initServer(u_char InstID, int concurentClients
 		pthread_mutex_destroy(&srv->srv_funcs.mtx);
 		e_free(srv);
 		return NULL;
-	} else
-		schedSignalDispatch(srv->srv_root, 42);
+	}
 
 	/* init pool for clients */
 	srv->srv_clients = array_Init(concurentClients);
@@ -1689,7 +1693,6 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 	schedPolling(srv->srv_root, &ts, NULL);
 	/* main rpc loop */
 	schedRun(srv->srv_root, &srv->srv_kill);
-	schedSignalDispatch(srv->srv_root, 0);
 
 	/* close all clients connections & server socket */
 	for (i = 0; i < array_Size(srv->srv_clients); i++) {
@@ -1828,8 +1831,7 @@ rpc_srv_initServer2(u_char InstID, int concurentClient
 		pthread_mutex_destroy(&srv->srv_funcs.mtx);
 		e_free(srv);
 		return NULL;
-	} else
-		schedSignalDispatch(srv->srv_root, 42);
+	}
 
 	/* init pool for clients */
 	srv->srv_clients = array_Init(concurentClients);
@@ -1947,8 +1949,7 @@ rpc_srv_initServerExt(u_char InstID, int netBuf, int f
 		pthread_mutex_destroy(&srv->srv_funcs.mtx);
 		e_free(srv);
 		return NULL;
-	} else
-		schedSignalDispatch(srv->srv_root, 42);
+	}
 
 	/* init pool for clients */
 	srv->srv_clients = array_Init(1);