--- libaitrpc/src/builtin.c	2013/03/07 23:10:50	1.12
+++ libaitrpc/src/builtin.c	2014/01/28 14:05:43	1.18
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.12 2013/03/07 23:10:50 misho Exp $
+* $Id: builtin.c,v 1.18 2014/01/28 14:05:43 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -133,10 +133,9 @@ rpcServerSessions(rpc_cli_t *cli, struct tagRPCCall *r
 	RPC_CALLBACK_CHECK_INPUT(cli);
 	srv = RPC_SRV_SERVER(cli);
 
-	AIT_SET_I32(ait_getVars(&RPC_RETVARS(cli), 3), array_Size(srv->srv_clients));
+	AIT_SET_I32(ait_getVars(&RPC_RETVARS(cli), 2), array_Size(srv->srv_clients));
 	AIT_SET_U8(ait_getVars(&RPC_RETVARS(cli), 0), srv->srv_session.sess_version);
-	AIT_SET_U32(ait_getVars(&RPC_RETVARS(cli), 1), srv->srv_session.sess_program);
-	AIT_SET_U8(ait_getVars(&RPC_RETVARS(cli), 2), srv->srv_session.sess_process);
+	AIT_SET_U8(ait_getVars(&RPC_RETVARS(cli), 1), srv->srv_session.sess_instance);
 
 	return 0;
 }
@@ -152,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;
 }
 
@@ -275,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)