--- libaitrpc/src/srv.c	2016/08/02 10:39:50	1.28.2.2
+++ libaitrpc/src/srv.c	2016/08/02 12:00:39	1.28.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.28.2.2 2016/08/02 10:39:50 misho Exp $
+* $Id: srv.c,v 1.28.2.3 2016/08/02 12:00:39 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -401,7 +401,7 @@ acceptClients(sched_task_t *task)
 {
 	rpc_srv_t *srv = TASK_ARG(task);
 	rpc_cli_t *c = NULL;
-	socklen_t salen = sizeof(sockaddr_t);
+	socklen_t salen = E_SOCKADDR_MAX;
 	int sock;
 #ifdef TCP_SESSION_TIMEOUT
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
@@ -517,7 +517,7 @@ rxUDPPacket(sched_task_t *task)
 	u_short crc;
 	struct tagRPCCall *rpc;
 	sockaddr_t sa;
-	socklen_t salen = (u_char) MIN(sizeof(sockaddr_t), 0xff);
+	socklen_t salen = E_SOCKADDR_MAX;
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
 	ait_val_t b = AIT_VAL_INIT;
 
@@ -659,7 +659,7 @@ rxRAWPacket(sched_task_t *task)
 	u_short crc;
 	struct tagRPCCall *rpc;
 	sockaddr_t sa;
-	socklen_t salen = (u_char) MIN(sizeof(sockaddr_t), 0xff);
+	socklen_t salen = E_SOCKADDR_MAX;
 	struct timespec ts = { DEF_RPC_TIMEOUT, 0 };
 	ait_val_t b = AIT_VAL_INIT;
 
@@ -1214,7 +1214,7 @@ acceptBLOBClients(sched_task_t *task)
 	rpc_srv_t *srv = TASK_ARG(task);
 	rpc_cli_t *c = NULL;
 	register int i;
-	socklen_t salen = sizeof(sockaddr_t);
+	socklen_t salen = E_SOCKADDR_MAX;
 	int sock;
 #ifdef TCP_NOPUSH
 	int n = 1;
@@ -1281,6 +1281,7 @@ int
 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir)
 {
 	int n = 1;
+	socklen_t salen;
 
 	if (!srv || srv->srv_kill) {
 		rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server");
@@ -1304,14 +1305,17 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		case AF_INET:
 			srv->srv_blob.server.cli_sa.sin.sin_port = 
 				htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin.sin_port) + 1);
+			salen = sizeof srv->srv_blob.server.cli_sa.sin;
 			break;
 		case AF_INET6:
 			srv->srv_blob.server.cli_sa.sin6.sin6_port = 
 				htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin6.sin6_port) + 1);
+			salen = sizeof srv->srv_blob.server.cli_sa.sin6;
 			break;
 		case AF_LOCAL:
 			strlcat(srv->srv_blob.server.cli_sa.sun.sun_path, ".blob", 
 					sizeof srv->srv_blob.server.cli_sa.sun.sun_path);
+			salen = sizeof srv->srv_blob.server.cli_sa.sun;
 			break;
 		default:
 			AIT_FREE_VAL(&srv->srv_blob.dir);
@@ -1344,8 +1348,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		AIT_FREE_VAL(&srv->srv_blob.dir);
 		return -1;
 	}
-	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, 
-				sizeof srv->srv_blob.server.cli_sa.sa) == -1) {
+	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, salen) == -1) {
 		LOGERR;
 		close(srv->srv_blob.server.cli_sock);
 		AIT_FREE_VAL(&srv->srv_blob.dir);
@@ -1495,6 +1498,7 @@ rpc_srv_initServer(u_char InstID, int concurentClients
 	int n = 1;
 	rpc_srv_t *srv = NULL;
 	sockaddr_t sa = E_SOCKADDR_INIT;
+	socklen_t salen;
 
 	if (!concurentClients || (proto < 0 || proto > SOCK_RAW)) {
 		rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server");
@@ -1502,7 +1506,7 @@ rpc_srv_initServer(u_char InstID, int concurentClients
 	}
 	if (!Port && proto < SOCK_RAW)
 		Port = RPC_DEFPORT;
-	if (!e_gethostbyname(csHost, Port, &sa))
+	if (!(salen = e_gethostbyname(csHost, Port, &sa)))
 		return NULL;
 	if (!proto)
 		proto = SOCK_STREAM;
@@ -1584,8 +1588,7 @@ rpc_srv_initServer(u_char InstID, int concurentClients
 		LOGERR;
 		goto err;
 	}
-	if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, 
-				sizeof srv->srv_server.cli_sa.sa) == -1) {
+	if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, salen) == -1) {
 		LOGERR;
 		goto err;
 	} else