--- libaitrpc/src/srv.c	2016/08/02 10:39:50	1.28.2.2
+++ libaitrpc/src/srv.c	2016/08/08 13:21:13	1.29
@@ -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.29 2016/08/08 13:21:13 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 };
@@ -498,7 +498,7 @@ txUDPPacket(sched_task_t *task)
 
 	/* send reply */
 	ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, 
-			&c->cli_sa.sa, sizeof c->cli_sa.sa);
+			&c->cli_sa.sa, e_addrlen(&c->cli_sa));
 	if (ret == -1) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
@@ -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;
 
@@ -640,7 +640,7 @@ txRAWPacket(sched_task_t *task)
 
 	/* send reply */
 	ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, 
-			&c->cli_sa.sa, sizeof c->cli_sa.sa);
+			&c->cli_sa.sa, e_addrlen(&c->cli_sa));
 	if (ret == -1) {
 		/* close connection */
 		schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], 
@@ -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;
 
@@ -679,15 +679,18 @@ rxRAWPacket(sched_task_t *task)
 			rpc = (struct tagRPCCall*) (h + 1);
 		}
 	} else {
+#ifdef IPV6_REMOVE_HEADER
 		struct ip6_hdr *h;
 		h = (struct ip6_hdr*) AIT_GET_BUF(&b);
-		if (rlen < (ntohs(h->ip6_plen) + sizeof(struct ip6_hdr)) || 
-				h->ip6_nxt != IPPROTO_ERPC)
+		if (rlen < ntohs(h->ip6_plen) || h->ip6_nxt != IPPROTO_ERPC)
 			goto end;
 		else {
 			rlen -= sizeof(struct ip6_hdr);
 			rpc = (struct tagRPCCall*) (h + 1);
 		}
+#else
+		rpc = (struct tagRPCCall*) AIT_GET_BUF(&b);
+#endif
 	}
 	if (rlen < sizeof(struct tagRPCCall))
 		goto end;
@@ -1194,7 +1197,7 @@ flushBLOB(sched_task_t *task)
 		e_free(b);
 	}
 
-	if (!schedSignalSelf(task)) {
+	if (sigArg) {
 		/* disabled kqueue support in libaitsched */
 		struct sigaction sa;
 
@@ -1203,9 +1206,11 @@ flushBLOB(sched_task_t *task)
 		sa.sa_handler = (void (*)(int)) flushBLOB;
 		sa.sa_flags = SA_RESTART | SA_RESETHAND;
 		sigaction(SIGFBLOB, &sa, NULL);
+		return NULL;
+	} else {
+		schedSignalSelf(task);
+		taskExit(task, NULL);
 	}
-
-	taskExit(task, NULL);
 }
 
 static void *
@@ -1214,7 +1219,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 +1286,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");
@@ -1299,19 +1305,22 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 
 	srv->srv_blob.server.cli_parent = srv;
 
-	memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(sockaddr_t));
+	memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof srv->srv_blob.server.cli_sa);
 	switch (srv->srv_blob.server.cli_sa.sa.sa_family) {
 		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 +1353,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 +1503,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 +1511,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 +1593,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