--- libaitrpc/src/srv.c	2011/11/03 13:35:39	1.5.2.8
+++ libaitrpc/src/srv.c	2011/11/03 15:22:47	1.5.2.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.5.2.8 2011/11/03 13:35:39 misho Exp $
+* $Id: srv.c,v 1.5.2.11 2011/11/03 15:22:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -101,7 +101,10 @@ rpc_srv_dispatchCall(void *arg)
 		if (ret < sizeof(struct tagRPCCall)) {
 			rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
 			ret = -4;
-			break;
+			if (s->srv_kill != kill)
+				continue;
+			else
+				break;
 		} else
 			rpc = (struct tagRPCCall*) buf;
 		/* check RPC packet session info */
@@ -117,7 +120,7 @@ rpc_srv_dispatchCall(void *arg)
 
 		/* RPC is OK! Go decapsulate variables ... */
 		if (ntohs(rpc->call_argc)) {
-			arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, 
+			arr = io_buffer2vars(buf + Limit, s->srv_netbuf - Limit, 
 					ntohs(rpc->call_argc), 1);
 			if (!arr) {
 				ret = -5;
@@ -160,7 +163,7 @@ makeReply:
 
 		if (argc && arr) {
 			/* Go Encapsulate variables ... */
-			if ((i = io_vals2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
+			if ((i = io_vars2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
 				rpc_srv_freeVars(f);
 				argc = 0;
 				ret = -7;
@@ -183,7 +186,10 @@ makeReply:
 			rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, "
 					"really is %d\n", Limit, ret);
 			ret = -9;
-			break;
+			if (s->srv_kill != kill)
+				continue;
+			else
+				break;
 		}
 	} while (ret > -1 || s->srv_kill != kill);
 
@@ -249,7 +255,10 @@ rpc_srv_dispatchVars(void *arg)
 		if (ret < sizeof(struct tagBLOBHdr)) {
 			rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n");
 			ret = -4;
-			break;
+			if (s->srv_kill != kill && s->srv_blob.state != kill)
+				continue;
+			else
+				break;
 		} else
 			blob = (struct tagBLOBHdr*) buf;
 		/* check BLOB packet session info */
@@ -310,7 +319,10 @@ makeReply:
 			rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, "
 					"really is %d\n", sizeof buf, ret);
 			ret = -9;
-			break;
+			if (s->srv_kill != kill && s->srv_blob.state != kill)
+				continue;
+			else
+				break;
 		}
 	} while (ret > -1 || s->srv_kill != kill);
 
@@ -343,8 +355,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		rpc_SetErr(EPERM, "Warning:: Already started BLOB server!\n");
 		return 0;
 	}
-	if (!Port)
-		Port = RPC_DEFPORT + 1;
 
 	memset(&srv->srv_blob, 0, sizeof srv->srv_blob);
 	if (access(diskDir, R_OK | W_OK) == -1) {
@@ -357,22 +367,20 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	srv->srv_blob.server.cli_parent = srv;
 
 	memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa);
-	switch (srv->srv_server.cli_sa.sa.sa_family) {
+	switch (sa.sa.sa_family) {
 		case AF_INET:
-			sa.sin.sin_port = htons(Port);
-			memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
+			sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1);
 			break;
 		case AF_INET6:
-			sa.sin6.sin6_port = htons(Port);
-			memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
+			sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1);
 			break;
 		case AF_LOCAL:
 			strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path);
-			memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
 			break;
 		default:
 			return -1;
 	}
+	memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
 
 	/* create BLOB server socket */
 	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0);
@@ -708,7 +716,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 	pthread_mutex_lock(&(*psrv)->srv_mtx);
 	while ((f = (*psrv)->srv_funcs)) {
 		(*psrv)->srv_funcs = f->func_next;
-		rpc_srv_destroyVars(f);
+		io_freeVars(&f->func_vars);
 		free(f);
 	}
 	pthread_mutex_unlock(&(*psrv)->srv_mtx);