--- libaitrpc/src/srv.c	2011/08/19 06:58:31	1.3.2.4
+++ libaitrpc/src/srv.c	2011/08/19 08:24:13	1.3.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.3.2.4 2011/08/19 06:58:31 misho Exp $
+* $Id: srv.c,v 1.3.2.7 2011/08/19 08:24:13 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -156,7 +156,7 @@ rpc_srv_dispatchCall(void *arg)
 			if ((ret = rpc_srv_execCall(f, rpc, v)) == -1)
 				ret = -9;
 			else
-				argc = rpc_srv_getValsCall(f, &vals);
+				argc = rpc_srv_getVars(f, &vals);
 makeReply:
 		memset(buf, 0, BUFSIZ);
 		rrpc = (struct tagRPCRet*) buf;
@@ -174,7 +174,7 @@ makeReply:
 			if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) {
 				for (i = 0; i < argc; i++)
 					RPC_FREE_VAL(&vals[i]);
-				rpc_srv_freeValsCall(f);
+				rpc_srv_freeVars(f);
 				vals = NULL;
 				argc = 0;
 				ret = -7;
@@ -223,7 +223,7 @@ makeReply:
 
 				RPC_FREE_VAL(&vals[i]);
 			}
-			rpc_srv_freeValsCall(f);
+			rpc_srv_freeVars(f);
 			vals = NULL;
 			argc = 0;
 		}
@@ -529,7 +529,6 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
-	printf("server.cli_type=%d:%d\n", srv->srv_blob.server.cli_type, SOCK_STREAM);
 	if (srv->srv_blob.server.cli_type == SOCK_STREAM || 
 			srv->srv_blob.server.cli_type == SOCK_SEQPACKET)
 		if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) {
@@ -537,7 +536,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 			return -1;
 		}
 
-	while (!blob_Kill && !rpc_Kill) {
+	while (srv->srv_blob.state != kill && srv->srv_kill != kill) {
 		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;
@@ -788,7 +787,7 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 			return -1;
 		}
 
-	while (!rpc_Kill) {
+	while (srv->srv_kill != kill) {
 		for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;