--- libaitrpc/src/srv.c	2011/09/07 10:46:54	1.5.2.5
+++ libaitrpc/src/srv.c	2011/10/31 14:45:26	1.5.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.5.2.5 2011/09/07 10:46:54 misho Exp $
+* $Id: srv.c,v 1.5.2.6 2011/10/31 14:45:26 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -333,10 +333,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");
@@ -360,25 +357,25 @@ 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 (srv->srv_server.cli_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);
+			memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
 			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);
+			memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
 			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);
+			memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
 			break;
 		default:
 			return -1;
 	}
 
 	/* 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,7 +396,7 @@ 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, 
+	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, 
 				sizeof srv->srv_blob.server.cli_sa) == -1) {
 		LOGERR;
 		close(srv->srv_blob.server.cli_sock);
@@ -451,7 +448,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 +478,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 +497,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 +519,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 +557,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 +576,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 +616,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 +644,7 @@ 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, sizeof srv->srv_server.cli_sa) == -1) {
 		LOGERR;
 		close(srv->srv_server.cli_sock);
 		free(srv);
@@ -707,7 +691,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);
 		}
@@ -743,7 +727,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;
@@ -765,7 +749,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
@@ -787,7 +771,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;