--- libelwix/src/net.c	2016/05/14 11:31:38	1.12.4.1
+++ libelwix/src/net.c	2016/05/14 13:12:43	1.12.4.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: net.c,v 1.12.4.1 2016/05/14 11:31:38 misho Exp $
+* $Id: net.c,v 1.12.4.2 2016/05/14 13:12:43 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
@@ -506,7 +506,7 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest
 		memset(a, 0, sizeof(ether_addr_t));
 
 	getifaddrs(&ifa);
-	for (p = ifa; p && p->ifa_name; p++)
+	for (p = ifa; p && p->ifa_name; p = p->ifa_next) {
 #ifndef __linux__
 		if (p->ifa_name && !strcmp(p->ifa_name, ifname) && p->ifa_addr && 
 				p->ifa_addr->sa_family == AF_LINK) {
@@ -530,6 +530,7 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest
 			break;
 		}
 #endif
+	}
 	freeifaddrs(ifa);
 
 	return a;
@@ -556,6 +557,7 @@ e_get1stiface(char *szIface, int iflen)
 	return 0;
 }
 
+#ifndef __linux__
 /*
  * e_getifacebyname() - Get interface and make network structure
  *
@@ -566,7 +568,6 @@ 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;
 
@@ -576,7 +577,7 @@ e_getifacebyname(const char *psIface, sockaddr_t * __r
 	memset(addr, 0, sizeof(sockaddr_t));
 	getifaddrs(&ifa);
 	strlcpy(szIface, psIface ? psIface : ifa->ifa_name, sizeof szIface);
-	for (p = ifa; p && p->ifa_name; p++)
+	for (p = ifa; p && p->ifa_name; p = p->ifa_next)
 		if (p->ifa_name && !strcmp(p->ifa_name, szIface) && p->ifa_addr && 
 				p->ifa_addr->sa_family == AF_LINK) {
 			memcpy(&addr->sdl, p->ifa_addr, sizeof(struct sockaddr_dl));
@@ -585,10 +586,6 @@ e_getifacebyname(const char *psIface, sockaddr_t * __r
 	freeifaddrs(ifa);
 
 	return addr;
-#else
-	elwix_SetErr(ENOSYS, "Unsuported routine on linux");
-	return NULL;
-#endif
 }
 
 /*
@@ -601,7 +598,6 @@ 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;
 
@@ -621,10 +617,6 @@ 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
 }
 
 /*
@@ -641,7 +633,6 @@ 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)
@@ -661,8 +652,5 @@ 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
 }
+#endif