--- libaitrpc/src/srv.c	2011/08/18 21:20:54	1.3.2.3
+++ libaitrpc/src/srv.c	2011/08/19 09:32:38	1.3.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.3.2.3 2011/08/18 21:20:54 misho Exp $
+* $Id: srv.c,v 1.3.2.8 2011/08/19 09:32:38 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -76,7 +76,7 @@ rpc_srv_dispatchCall(void *arg)
 			ret = -2;
 		}
 		memset(buf, 0, BUFSIZ);
-		if ((ret = recv(c->cli_sock, buf, BUFSIZ, 0)) == -1) {
+		if ((ret = read(c->cli_sock, buf, BUFSIZ)) == -1) {
 			LOGERR;
 			ret = -3;
 			break;
@@ -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,12 +223,12 @@ makeReply:
 
 				RPC_FREE_VAL(&vals[i]);
 			}
-			rpc_srv_freeValsCall(f);
+			rpc_srv_freeVars(f);
 			vals = NULL;
 			argc = 0;
 		}
 
-		if ((ret = send(c->cli_sock, buf, Limit, 0)) == -1) {
+		if ((ret = write(c->cli_sock, buf, Limit)) == -1) {
 			LOGERR;
 			ret = -8;
 			break;
@@ -280,7 +280,7 @@ rpc_srv_dispatchVars(void *arg)
 		}
 
 		memset(buf, 0, sizeof buf);
-		if ((ret = recv(c->cli_sock, buf, sizeof buf, 0)) == -1) {
+		if ((ret = read(c->cli_sock, buf, sizeof buf)) == -1) {
 			LOGERR;
 			ret = -3;
 			break;
@@ -343,7 +343,7 @@ makeReply:
 		// Replay to client!
 		blob->hdr_cmd = ret < 0 ? error : ok;
 		blob->hdr_ret = ret;
-		if ((ret = send(c->cli_sock, buf, sizeof buf, 0)) == -1) {
+		if ((ret = write(c->cli_sock, buf, sizeof buf)) == -1) {
 			LOGERR;
 			ret = -8;
 			break;
@@ -421,8 +421,9 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int
 	}
 
 	/* create BLOB server socket */
+	srv->srv_blob.server.cli_type = sockType ? sockType : SOCK_STREAM;
 	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, 
-			sockType ? sockType : SOCK_STREAM, 0);
+			srv->srv_blob.server.cli_type, 0);
 	if (srv->srv_blob.server.cli_sock == -1) {
 		LOGERR;
 		return -1;
@@ -535,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;
@@ -673,13 +674,13 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	}
 
 	/* create server socket */
-	srv->srv_server.cli_sock = socket(family, sockType ? sockType : SOCK_STREAM, 0);
+	srv->srv_server.cli_type = sockType ? sockType : SOCK_STREAM;
+	srv->srv_server.cli_sock = socket(family, srv->srv_server.cli_type, 0);
 	if (srv->srv_server.cli_sock == -1) {
 		LOGERR;
 		free(srv);
 		return NULL;
-	} else
-		srv->srv_server.cli_type = sockType;
+	}
 	if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {
 		LOGERR;
 		close(srv->srv_server.cli_sock);
@@ -786,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;