--- libaitrpc/src/srv.c	2010/06/24 13:58:17	1.1.1.1.2.10
+++ libaitrpc/src/srv.c	2010/06/24 15:01:19	1.1.1.1.2.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.1.1.1.2.10 2010/06/24 13:58:17 misho Exp $
+* $Id: srv.c,v 1.1.1.1.2.11 2010/06/24 15:01:19 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -86,7 +86,7 @@ rpc_srv_dispatchCall(void *arg)
 			rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n");
 			ret = -6;
 		} else
-			if ((ret = rpc_srv_execCall(s, f, rpc, v)) == -1)
+			if ((ret = rpc_srv_execCall(f, rpc, v)) == -1)
 				ret = -6;
 			else
 				argc = rpc_srv_getValsCall(f, &vals);
@@ -414,7 +414,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
-	while (!rpc_Kill) {
+	while (!blob_Kill && !rpc_Kill) {
 		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;
@@ -447,6 +447,8 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 		}
 	}
 
+	srv->srv_blob.state = disable;
+
 	return 0;
 }
 
@@ -668,21 +670,20 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 
 /*
  * rpc_srv_execCall() Execute registered call from RPC server
- * @data = RPC const data
  * @call = Register RPC call
  * @rpc = IN RPC call structure
  * @args = IN RPC call array of rpc values
  * return: -1 error, !=-1 ok
  */
 int
-rpc_srv_execCall(void * const data, rpc_func_t * __restrict call, 
-		struct tagRPCCall * __restrict rpc, rpc_val_t * __restrict args)
+rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, 
+		rpc_val_t * __restrict args)
 {
 	void *dl;
 	rpc_callback_t func;
 	int ret;
 
-	if (!data || !call || !rpc) {
+	if (!call || !rpc || !call->func_parent) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t exec call from RPC server ...\n");
 		return -1;
 	}
@@ -695,7 +696,7 @@ rpc_srv_execCall(void * const data, rpc_func_t * __res
 
 	func = dlsym(dl, (char*) call->func_name);
 	if (func)
-		ret = func(data, call, rpc->call_argc, args);
+		ret = func(call, rpc->call_argc, args);
 	else {
 		rpc_SetErr(ENOEXEC, "Error:: Can`t find function %s!\n", dlerror());
 		ret = -1;