--- libaitrpc/src/srv.c	2016/08/02 15:18:41	1.28.2.4
+++ libaitrpc/src/srv.c	2022/10/13 22:09:36	1.30.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.28.2.4 2016/08/02 15:18:41 misho Exp $
+* $Id: srv.c,v 1.30.2.2 2022/10/13 22:09:36 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 - 2022
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -424,8 +424,10 @@ acceptClients(sched_task_t *task)
 		AIT_FREE_VAL(&c->cli_buf);
 		array_Del(srv->srv_clients, c->cli_id, 42);
 		goto end;
-	} else
+	} else {
 		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
+		fcntl(c->cli_sock, F_SETFD, FD_CLOEXEC);
+	}
 
 #ifdef TCP_SESSION_TIMEOUT
 	/* armed timer for close stateless connection */
@@ -542,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 */
@@ -706,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 */
@@ -1197,7 +1199,7 @@ flushBLOB(sched_task_t *task)
 		e_free(b);
 	}
 
-	if (!schedSignalSelf(task)) {
+	if (sigArg) {
 		/* disabled kqueue support in libaitsched */
 		struct sigaction sa;
 
@@ -1206,9 +1208,11 @@ flushBLOB(sched_task_t *task)
 		sa.sa_handler = (void (*)(int)) flushBLOB;
 		sa.sa_flags = SA_RESTART | SA_RESETHAND;
 		sigaction(SIGFBLOB, &sa, NULL);
+		return NULL;
+	} else {
+		schedSignalSelf(task);
+		taskExit(task, NULL);
 	}
-
-	taskExit(task, NULL);
 }
 
 static void *
@@ -1262,6 +1266,7 @@ acceptBLOBClients(sched_task_t *task)
 		setsockopt(c->cli_sock, IPPROTO_TCP, TCP_NOPUSH, &n, sizeof n);
 #endif
 		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
+		fcntl(c->cli_sock, F_SETFD, FD_CLOEXEC);
 	}
 
 	schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0);