--- libaitrpc/src/srv.c	2020/06/25 19:11:00	1.30
+++ libaitrpc/src/srv.c	2024/02/26 13:30:59	1.30.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.30 2020/06/25 19:11:00 misho Exp $
+* $Id: srv.c,v 1.30.2.6 2024/02/26 13:30:59 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 - 2016
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -291,7 +291,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));
 			}
@@ -387,7 +387,7 @@ rxPacket(sched_task_t *task)
 	schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), (int) noreply, rpc, len);
 err:
 	/* send RPC reply */
-	if (!noreply)
+	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);
 
@@ -544,7 +544,7 @@ rxUDPPacket(sched_task_t *task)
 	/* check integrity of packet */
 	crc = ntohs(rpc->call_crc);
 	rpc->call_crc ^= rpc->call_crc;
-	if (crc != crcFletcher16((u_short*) rpc, len / 2))
+	if (crc != crcFletcher16((u_short*) AIT_GET_BUF(&b), len / 2))
 		goto end;
 
 	/* check RPC packet session info */
@@ -575,7 +575,7 @@ rxUDPPacket(sched_task_t *task)
 	schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len);
 
 	/* send RPC reply */
-	if (!noreply)
+	if (!noreply && (rpc->call_io & RPC_REQ))
 		schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], 
 				c, TASK_FD(task), rpc, len);
 end:
@@ -708,7 +708,7 @@ rxRAWPacket(sched_task_t *task)
 	/* check integrity of packet */
 	crc = ntohs(rpc->call_crc);
 	rpc->call_crc ^= rpc->call_crc;
-	if (crc != crcFletcher16((u_short*) rpc, len / 2))
+	if (crc != crcFletcher16((u_short*) AIT_GET_BUF(&b), len / 2))
 		goto end;
 
 	/* check RPC packet session info */
@@ -739,7 +739,7 @@ rxRAWPacket(sched_task_t *task)
 	schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len);
 
 	/* send RPC reply */
-	if (!noreply)
+	if (!noreply && (rpc->call_io & RPC_REQ))
 		schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], 
 				c, TASK_FD(task), rpc, len);
 end:
@@ -909,7 +909,7 @@ rxBPFPacket(sched_task_t *task)
 	schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len);
 
 	/* send RPC reply */
-	if (!noreply)
+	if (!noreply && (rpc->call_io & RPC_REQ))
 		schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], 
 				c, TASK_FD(task), rpc, len);
 end:
@@ -1039,7 +1039,7 @@ rxEXTPacket(sched_task_t *task)
 	schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len);
 
 	/* send RPC reply */
-	if (!noreply)
+	if (!noreply && (rpc->call_io & RPC_REQ))
 		schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], 
 				c, TASK_FD(task), rpc, len);
 end:
@@ -1558,7 +1558,8 @@ 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);
@@ -1680,6 +1681,7 @@ 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++) {
@@ -1818,7 +1820,8 @@ 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);
@@ -1936,7 +1939,8 @@ 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);