--- libelwix/src/net.c	2015/06/25 17:53:50	1.12
+++ libelwix/src/net.c	2016/05/14 11:31:38	1.12.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: net.c,v 1.12 2015/06/25 17:53:50 misho Exp $
+* $Id: net.c,v 1.12.4.1 2016/05/14 11:31:38 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -46,6 +46,7 @@ SUCH DAMAGE.
 #include "global.h"
 
 
+#ifndef __linux__
 static char hexlist[] = "0123456789abcdef";
 
 /*
@@ -112,6 +113,7 @@ e_link_addr(const char *mac, struct sockaddr_dl * __re
 	link_addr(mac, sdl);
 	return 0;
 }
+#endif
 
 /*
  * e_ether_ntoa() - Convert ethernet address to string
@@ -201,7 +203,10 @@ e_n2port(sockaddr_t * __restrict addr)
 const char *
 e_n2addr(sockaddr_t * __restrict addr, ait_val_t * __restrict val)
 {
-	char *s, str[INET6_ADDRSTRLEN] = { 0 };
+#ifndef __linux__
+	char *s;
+#endif
+	char str[INET6_ADDRSTRLEN] = { 0 };
 	const char *ret = NULL;
 
 	if (!addr || !val)
@@ -226,6 +231,7 @@ e_n2addr(sockaddr_t * __restrict addr, ait_val_t * __r
 		case AF_LOCAL:
 			ret = addr->sun.sun_path;
 			break;
+#ifndef __linux__
 		case AF_LINK:
 			if (!(s = e_link_ntoa(&addr->sdl))) {
 				LOGERR;
@@ -233,6 +239,7 @@ e_n2addr(sockaddr_t * __restrict addr, ait_val_t * __r
 			} else
 				ret = s;
 			break;
+#endif
 		default:
 			elwix_SetErr(EPROTONOSUPPORT, "Unsuported address family %d", 
 					addr->sa.sa_family);
@@ -277,19 +284,25 @@ e_gethostbyname(const char *psHost, u_short port, sock
 
 	switch (addr->sa.sa_family) {
 		case AF_INET:
+#ifndef __linux__
 			addr->sin.sin_len = sizeof(struct sockaddr_in);
+#endif
 			addr->sin.sin_family = AF_INET;
 			addr->sin.sin_port = htons(port);
 			memcpy(&addr->sin.sin_addr, host->h_addr, sizeof addr->sin.sin_addr);
 			return addr;
 		case AF_INET6:
+#ifndef __linux__
 			addr->sin6.sin6_len = sizeof(struct sockaddr_in6);
+#endif
 			addr->sin6.sin6_family = AF_INET6;
 			addr->sin6.sin6_port = htons(port);
 			memcpy(&addr->sin6.sin6_addr, host->h_addr, sizeof addr->sin6.sin6_addr);
 			return addr;
 		case AF_LOCAL:
+#ifndef __linux__
 			addr->sun.sun_len = sizeof(struct sockaddr_un);
+#endif
 			addr->sun.sun_family = AF_LOCAL;
 			memset(addr->sun.sun_path, 0, sizeof addr->sun.sun_path);
 			snprintf(addr->sun.sun_path, sizeof addr->sun.sun_path, "%s-%hu", psHost, port);
@@ -329,9 +342,11 @@ e_addrcmp(sockaddr_t * __restrict a, sockaddr_t * __re
 				else
 					return memcmp(&a->sin6.sin6_addr, &b->sin6.sin6_addr, 
 							sizeof a->sin6.sin6_addr);
+#ifndef __linux__
 			case AF_LINK:
 				return memcmp(&a->sdl.sdl_data, &b->sdl.sdl_data, 
 						sizeof a->sdl.sdl_data);
+#endif
 			case AF_UNSPEC:
 				return memcmp(a, b, sizeof(sockaddr_t));
 		}
@@ -433,7 +448,9 @@ e_getnet(const char *net)
 	}
 	switch (host->h_addrtype) {
 		case AF_INET:
+#ifndef __linux__
 			n->addr.sin.sin_len = sizeof(struct sockaddr_in);
+#endif
 			n->addr.sin.sin_family = host->h_addrtype;
 			memcpy(&n->addr.sin.sin_addr, host->h_addr, sizeof n->addr.sin.sin_addr);
 			if (wrk)
@@ -442,7 +459,9 @@ e_getnet(const char *net)
 				n->mask.in.s_addr = 0xFFFFFFFF;
 			break;
 		case AF_INET6:
+#ifndef __linux__
 			n->addr.sin6.sin6_len = sizeof(struct sockaddr_in6);
+#endif
 			n->addr.sin6.sin6_family = host->h_addrtype;
 			memcpy(&n->addr.sin6.sin6_addr, host->h_addr, sizeof n->addr.sin6.sin6_addr);
 			/* TODO: should support ipv6 mask */
@@ -470,7 +489,13 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest
 {
 	ether_addr_t *a = NULL;
 	struct ifaddrs *p, *ifa = NULL;
+#ifdef __linux__
+	int s;
+	struct ifreq req;
 
+	memset(&req, 0, sizeof req);
+#endif
+
 	if (!ifname)
 		return NULL;
 
@@ -482,11 +507,29 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest
 
 	getifaddrs(&ifa);
 	for (p = ifa; p && p->ifa_name; p++)
+#ifndef __linux__
 		if (p->ifa_name && !strcmp(p->ifa_name, ifname) && p->ifa_addr && 
 				p->ifa_addr->sa_family == AF_LINK) {
 			memcpy(a, LLADDR((struct sockaddr_dl*) p->ifa_addr), sizeof(ether_addr_t));
 			break;
 		}
+#else
+		if (p->ifa_name && !strcmp(p->ifa_name, ifname)) {
+			s = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+			if (s == -1) {
+				e_free(a);
+				a = NULL;
+				break;
+			} else
+				strlcpy(req.ifr_name, ifname, sizeof req.ifr_name);
+			if (ioctl(s, SIOCGIFHWADDR, &req) == -1) {
+				e_free(a);
+				a = NULL;
+			} else
+				memcpy(a, req.ifr_addr.sa_data, sizeof(ether_addr_t));
+			break;
+		}
+#endif
 	freeifaddrs(ifa);
 
 	return a;
@@ -523,6 +566,7 @@ e_get1stiface(char *szIface, int iflen)
 sockaddr_t *
 e_getifacebyname(const char *psIface, sockaddr_t * __restrict addr)
 {
+#ifndef __linux__
 	char szIface[64] = { [0 ... 63] = 0 };
 	struct ifaddrs *p, *ifa = NULL;
 
@@ -541,6 +585,10 @@ e_getifacebyname(const char *psIface, sockaddr_t * __r
 	freeifaddrs(ifa);
 
 	return addr;
+#else
+	elwix_SetErr(ENOSYS, "Unsuported routine on linux");
+	return NULL;
+#endif
 }
 
 /*
@@ -553,6 +601,7 @@ e_getifacebyname(const char *psIface, sockaddr_t * __r
 sockaddr_t *
 e_getlinkbyname(const char *psHost, sockaddr_t * __restrict addr)
 {
+#ifndef __linux__
 	ait_val_t v;
 	sockaddr_t *a = addr;
 
@@ -572,6 +621,10 @@ e_getlinkbyname(const char *psHost, sockaddr_t * __res
 
 	AIT_FREE_VAL(&v);
 	return a;
+#else
+	elwix_SetErr(ENOSYS, "Unsuported routine on linux");
+	return NULL;
+#endif
 }
 
 /*
@@ -588,6 +641,7 @@ sockaddr_t *
 e_getlinkbyether(const ether_addr_t * __restrict mac, u_short idx, u_char type, 
 		const char *iface, sockaddr_t * __restrict addr)
 {
+#ifndef __linux__
 	sockaddr_t *a = addr;
 
 	if (!addr)
@@ -607,4 +661,8 @@ e_getlinkbyether(const ether_addr_t * __restrict mac, 
 	memcpy(LLADDR(&addr->sdl), mac, addr->sdl.sdl_alen);
 
 	return a;
+#else
+	elwix_SetErr(ENOSYS, "Unsuported routine on linux");
+	return NULL;
+#endif
 }