--- libaitrpc/src/builtin.c	2013/04/02 09:17:06	1.12.2.1
+++ libaitrpc/src/builtin.c	2013/09/05 00:27:10	1.16.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.12.2.1 2013/04/02 09:17:06 misho Exp $
+* $Id: builtin.c,v 1.16.4.1 2013/09/05 00:27:10 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -151,14 +151,16 @@ rpcServerShutdown(rpc_cli_t *cli, struct tagRPCCall *r
 	rpc_freeCli(cli);
 
 	srv->srv_kill = 1;
+	if (srv->srv_blob.tid)
+		pthread_kill(srv->srv_blob.tid, SIGFBLOB);
 	return 0;
 }
 
 static int
 rpcServerPing(rpc_cli_t *cli, struct tagRPCCall *rpc, array_t *iv)
 {
-	if (rpc->call_req.flags == RPC_REPLY)
-		AIT_SET_U16(ait_getVars(&RPC_RETVARS(cli), 0), ntohs(rpc->call_seq));
+	if (ntohl((u_long) rpc->call_req.flags) == RPC_REPLY)
+		AIT_SET_U16(ait_getVars(&RPC_RETVARS(cli), 0), random() % USHRT_MAX);
 	return 0;
 }
 
@@ -274,7 +276,7 @@ rpcBLOBServerClients(rpc_cli_t *cli, struct tagRPCCall
  * @srv = RPC server instance
  * return: -1 error or 0 ok
  */
-inline int
+int
 rpc_register_srvPing(rpc_srv_t * __restrict srv)
 {
 	if (!srv)