--- libaitrpc/src/aitrpc.c	2015/07/22 20:01:46	1.20
+++ libaitrpc/src/aitrpc.c	2016/08/08 13:21:13	1.21
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.c,v 1.20 2015/07/22 20:01:46 misho Exp $
+* $Id: aitrpc.c,v 1.21 2016/08/08 13:21:13 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2015
+Copyright 2004 - 2016
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -138,20 +138,25 @@ rpc_Read(int sock, int type, int flags, sockaddr_t * _
 	sockaddr_t sa2;
 	socklen_t salen;
 	int ret = 0, hlen, cx = 0;
-	struct ether_header *eh;
-	struct bpf_hdr *h;
 	ether_addr_t bcst = {{ [0 ... sizeof bcst - 1] = 0xff }};
 	u_char *buf = AIT_GET_BUF(pkt);
 	size_t blen = AIT_LEN(pkt);
 	struct tagRPCCall *rpc = (struct tagRPCCall *) buf;
+#ifndef __linux__
+	struct ether_header *eh;
+	struct bpf_hdr *h;
 	ait_val_t v = AIT_VAL_INIT;
+#endif
 
 try2read:
 	pfd.fd = sock;
 	pfd.events = POLLIN | POLLPRI;
 	memset(buf, 0, blen);
 	memset(&sa2, 0, sizeof sa2);
-	salen = sa2.ss.ss_len = (u_char) MIN(sizeof(sockaddr_t), 0xff);
+	salen = E_SOCKADDR_MAX;
+#ifndef __linux__
+	sa2.ss.ss_len = salen;
+#endif
 	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || 
 			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 		if (ret)
@@ -168,6 +173,7 @@ try2read:
 		case SOCK_EXT:
 			ret = read(sock, buf, blen);
 			break;
+#ifndef __linux__
 		case SOCK_BPF:
 			if (!sa) {
 				rpc_SetErr(EINVAL, "Invalid argument(s)!");
@@ -217,6 +223,7 @@ try2read:
 				AIT_FREE_VAL(&v);
 			}
 			break;
+#endif
 		case SOCK_RAW:
 		case SOCK_DGRAM:
 			if (!sa) {
@@ -247,8 +254,13 @@ try2read:
 
 	/* check RPC packet header */
 	if (type == SOCK_RAW) {
+#ifdef IPV6_REMOVE_HEADER
 		hlen = sa->sa.sa_family == AF_INET ? 
 			sizeof(struct ip) : sizeof(struct ip6_hdr);
+#else
+		hlen = sa->sa.sa_family == AF_INET ? 
+			sizeof(struct ip) : 0;
+#endif
 		ret -= hlen;
 		if (ret > 0)
 			memmove(buf, buf + hlen, blen - hlen);
@@ -292,8 +304,10 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * 
 	struct pollfd pfd;
 	int ret = 0;
 	u_char *buf = AIT_GET_BUF(pkt);
+#ifndef __linux__
 	ait_val_t v = AIT_VAL_INIT;
 	struct ether_header *eh;
+#endif
 
 
 	pfd.fd = sock;
@@ -314,6 +328,7 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * 
 		case SOCK_EXT:
 			ret = write(sock, buf, blen);
 			break;
+#ifndef __linux__
 		case SOCK_BPF:
 			if (!sa) {
 				rpc_SetErr(EINVAL, "Invalid argument(s)!");
@@ -331,6 +346,7 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * 
 
 			AIT_FREE_VAL(&v);
 			break;
+#endif
 		case SOCK_RAW:
 		case SOCK_DGRAM:
 			if (!sa) {
@@ -338,7 +354,7 @@ rpc_Write(int sock, int type, int flags, sockaddr_t * 
 				return -1;
 			}
 
-			ret = sendto(sock, buf, blen, flags, &sa->sa, sa->sa.sa_len);
+			ret = sendto(sock, buf, blen, flags, &sa->sa, e_addrlen(sa));
 			break;
 		default:
 			rpc_SetErr(EINVAL, "Invalid argument(s)!");