--- libaitrpc/src/builtin.c	2015/03/09 22:01:34	1.20.2.1
+++ libaitrpc/src/builtin.c	2015/07/19 23:54:48	1.22.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: builtin.c,v 1.20.2.1 2015/03/09 22:01:34 misho Exp $
+* $Id: builtin.c,v 1.22.2.1 2015/07/19 23:54:48 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -148,11 +148,13 @@ rpcServerShutdown(RPC_CALL_STDARGS)
 	RPC_CALLBACK_CHECK_INPUT(cli);
 	srv = RPC_SRV_SERVER(cli);
 	
-	rpc_freeCli(cli);
-
-	srv->srv_kill = 1;
 	if (srv->srv_blob.tid)
 		pthread_kill(srv->srv_blob.tid, SIGFBLOB);
+	while (srv->srv_blob.root) {
+		srv->srv_blob.kill = 1;
+		usleep(1000);
+	}
+	srv->srv_kill = 1;
 	return 0;
 }
 
@@ -161,7 +163,6 @@ rpcServerPing(RPC_CALL_STDARGS)
 {
 	if (ntohl((u_long) rpc->call_req.flags) == RPC_REPLY)
 		AIT_SET_U16(ait_getVars(&RPC_RETVARS(cli), 0), random() % USHRT_MAX);
-	printf("alabala\n");
 	return 0;
 }