--- libaitrpc/src/srv.c	2011/09/07 09:42:46	1.5.2.4
+++ libaitrpc/src/srv.c	2011/11/03 15:28:36	1.5.2.12
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.5.2.4 2011/09/07 09:42:46 misho Exp $
+* $Id: srv.c,v 1.5.2.12 2011/11/03 15:28:36 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,8 +163,8 @@ makeReply:
 
 		if (argc && arr) {
 			/* Go Encapsulate variables ... */
-			if ((i = io_vals2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
-				rpc_srv_freeVals(f);
+			if ((i = io_vars2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
+				io_clrVars(f->func_vars);
 				argc = 0;
 				ret = -7;
 				rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n");
@@ -169,7 +172,7 @@ makeReply:
 			} else {
 				Limit += i;
 
-				rpc_srv_freeVals(f);
+				io_clrVars(f->func_vars);
 			}
 		}
 
@@ -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);
 
@@ -333,10 +345,7 @@ int
 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir)
 {
 	int n = 1;
-	struct sockaddr sa;
-	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
-	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
+	io_sockaddr_t sa;
 
 	if (!srv) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n");
@@ -346,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) {
@@ -360,25 +367,23 @@ 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_family) {
+	switch (sa.sa.sa_family) {
 		case AF_INET:
-			sin->sin_port = htons(Port);
-			memcpy(&srv->srv_blob.server.cli_sa, sin, sizeof(struct sockaddr));
+			sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1);
 			break;
 		case AF_INET6:
-			sin6->sin6_port = htons(Port);
-			memcpy(&srv->srv_blob.server.cli_sa, sin6, sizeof(struct sockaddr));
+			sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1);
 			break;
 		case AF_LOCAL:
-			strlcat(sun->sun_path, ".blob", sizeof sun->sun_path);
-			memcpy(&srv->srv_blob.server.cli_sa, sun, sizeof(struct sockaddr));
+			strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path);
 			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_family, SOCK_STREAM, 0);
+	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0);
 	if (srv->srv_blob.server.cli_sock == -1) {
 		LOGERR;
 		return -1;
@@ -399,8 +404,8 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		close(srv->srv_blob.server.cli_sock);
 		return -1;
 	}
-	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa, 
-				sizeof srv->srv_blob.server.cli_sa) == -1) {
+	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, 
+				srv->srv_blob.server.cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		close(srv->srv_blob.server.cli_sock);
 		return -1;
@@ -451,7 +456,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 
 	/* close all clients connections & server socket */
 	for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++)
-		if (c->cli_sa.sa_family)
+		if (c->cli_sa.sa.sa_family)
 			shutdown(c->cli_sock, SHUT_RDWR);
 	close(srv->srv_blob.server.cli_sock);
 
@@ -481,7 +486,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 int
 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 {
-	socklen_t salen = sizeof(struct sockaddr);
+	socklen_t salen = sizeof(io_sockaddr_t);
 	register int i;
 	rpc_cli_t *c;
 	fd_set fds;
@@ -500,7 +505,7 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 
 	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)
+			if (!c->cli_sa.sa.sa_family)
 				break;
 		if (i >= srv->srv_numcli) {
 #ifdef HAVE_PTHREAD_YIELD
@@ -522,7 +527,7 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 		if (!ret)
 			continue;
 
-		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen);
+		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;
@@ -560,10 +565,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	rpc_srv_t *srv = NULL;
 	int n = 1;
 	struct hostent *host = NULL;
-	struct sockaddr sa;
-	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
-	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
+	io_sockaddr_t sa;
 
 	if (!concurentClients || !regProgID || 
 			(family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {
@@ -582,24 +584,25 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 		}
 	}
 	memset(&sa, 0, sizeof sa);
-	sa.sa_family = family;
+	sa.sa.sa_family = family;
 	switch (family) {
 		case AF_INET:
-			sin->sin_len = sizeof(struct sockaddr_in);
-			sin->sin_port = htons(Port);
+			sa.sin.sin_len = sizeof(struct sockaddr_in);
+			sa.sin.sin_port = htons(Port);
 			if (csHost)
-				memcpy(&sin->sin_addr, host->h_addr, host->h_length);
+				memcpy(&sa.sin.sin_addr, host->h_addr, host->h_length);
 			break;
 		case AF_INET6:
-			sin6->sin6_len = sizeof(struct sockaddr_in6);
-			sin6->sin6_port = htons(Port);
+			sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
+			sa.sin6.sin6_port = htons(Port);
 			if (csHost)
-				memcpy(&sin6->sin6_addr, host->h_addr, host->h_length);
+				memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length);
 			break;
 		case AF_LOCAL:
-			sun->sun_len = sizeof(struct sockaddr_un);
+			sa.sun.sun_len = sizeof(struct sockaddr_un);
 			if (csHost)
-				strlcpy(sun->sun_path, csHost, sizeof sun->sun_path);
+				strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path);
+			unlink(sa.sun.sun_path);
 			break;
 		default:
 			rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n");
@@ -621,18 +624,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 
 	srv->srv_server.cli_tid = pthread_self();
 	srv->srv_server.cli_parent = srv;
-	switch (family) {
-		case AF_INET:
-			memcpy(&srv->srv_server.cli_sa, sin, sizeof srv->srv_server.cli_sa);
-			break;
-		case AF_INET6:
-			memcpy(&srv->srv_server.cli_sa, sin6, sizeof srv->srv_server.cli_sa);
-			break;
-		case AF_LOCAL:
-			memcpy(&srv->srv_server.cli_sa, sun, sizeof srv->srv_server.cli_sa);
-			unlink(sun->sun_path);
-			break;
-	}
+	memcpy(&srv->srv_server.cli_sa, &sa, sizeof sa);
 
 	/* create server socket */
 	srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0);
@@ -660,7 +652,8 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 		free(srv);
 		return NULL;
 	}
-	if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa, sizeof srv->srv_server.cli_sa) == -1) {
+	if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, 
+				srv->srv_server.cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		close(srv->srv_server.cli_sock);
 		free(srv);
@@ -707,7 +700,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 
 	/* close all clients connections & server socket */
 	for (i = 0, c = (*psrv)->srv_clients; i < (*psrv)->srv_numcli && c; i++, c++)
-		if (c->cli_sa.sa_family) {
+		if (c->cli_sa.sa.sa_family) {
 			shutdown(c->cli_sock, SHUT_RDWR);
 			close(c->cli_sock);
 		}
@@ -723,6 +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;
+		io_freeVars(&f->func_vars);
 		free(f);
 	}
 	pthread_mutex_unlock(&(*psrv)->srv_mtx);
@@ -742,7 +736,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 int
 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 {
-	socklen_t salen = sizeof(struct sockaddr);
+	socklen_t salen = sizeof(io_sockaddr_t);
 	register int i;
 	rpc_cli_t *c;
 	fd_set fds;
@@ -764,7 +758,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 
 	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)
+			if (!c->cli_sa.sa.sa_family)
 				break;
 		if (i >= srv->srv_numcli) {
 #ifdef HAVE_PTHREAD_YIELD
@@ -786,7 +780,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 		if (!ret)
 			continue;
 
-		c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen);
+		c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;