--- libaitio/src/bpf.c	2014/02/08 20:15:58	1.5.4.4
+++ libaitio/src/bpf.c	2016/08/10 13:59:44	1.7.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bpf.c,v 1.5.4.4 2014/02/08 20:15:58 misho Exp $
+* $Id: bpf.c,v 1.7.2.1 2016/08/10 13:59:44 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 - 2014
+Copyright 2004 - 2016
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,64 +47,6 @@ SUCH DAMAGE.
 
 
 /*
- * io_get1stiface() - Get first interface of host
- *
- * @szIface = interface string buffer
- * @iflen = size of interface buffer
- * return: -1 error or 0 ok
- */
-int
-io_get1stiface(char *szIface, int iflen)
-{
-	struct ifaddrs *ifa;
-
-	if (!szIface || !iflen)
-		return -1;
-
-	getifaddrs(&ifa);
-	strlcpy(szIface, ifa->ifa_name, iflen);
-	freeifaddrs(ifa);
-	return 0;
-}
-
-/*
- * io_getmaciface() - Get MAC address from interface name
- *
- * @csIface = interface name
- * @ea = ethernet address
- * return: -1 error, 0 ok or 1 not found
- */
-int
-io_getmaciface(const char *csIface, ether_addr_t * __restrict ea)
-{
-	struct ifaddrs *ifa, *ifp;
-	struct sockaddr_dl *dl;
-	int ret = 1;
-
-	if (!csIface || !ea)
-		return -1;
-	else
-		memset(ea, 0, sizeof(ether_addr_t));
-
-	getifaddrs(&ifa);
-	for (ifp = ifa; ifp; ifp = ifp->ifa_next)
-		if (!strcmp(csIface, ifp->ifa_name) && ifp->ifa_addr && 
-				ifp->ifa_addr->sa_family == AF_LINK) {
-			dl = (struct sockaddr_dl*) ifp->ifa_addr;
-			if ((dl->sdl_type == IFT_ETHER || dl->sdl_type == IFT_L2VLAN || 
-					dl->sdl_type == IFT_BRIDGE) && 
-					dl->sdl_alen == ETHER_ADDR_LEN) {
-				memcpy(ea, LLADDR(dl), sizeof(ether_addr_t));
-				ret = 0;
-				break;
-			}
-		}
-	freeifaddrs(ifa);
-
-	return ret;
-}
-
-/*
  * io_etherClose() - Close BPF interface
  *
  * @eth = bpf handle
@@ -208,17 +150,11 @@ io_etherOpen(const char *csIface, int flags, u_int whd
 
 	if (csIface)
 		strlcpy(szStr, csIface, sizeof szStr);
-	else if (io_get1stiface(szStr, sizeof szStr) == -1) {
+	else if (e_get1stiface(szStr, sizeof szStr) == -1) {
 		close(eth);
 		return -1;
 	}
 
-	n = wdlt;
-	if (wdlt && ioctl(eth, BIOCSDLT, &n) == -1) {
-		LOGERR;
-		close(eth);
-		return -1;
-	}
 	n = 1;
 	if (whdr && ioctl(eth, BIOCSHDRCMPLT, &n) == -1) {
 		LOGERR;
@@ -282,6 +218,13 @@ io_etherOpen(const char *csIface, int flags, u_int whd
 		return -1;
 	}
 
+	n = wdlt;
+	if (wdlt && ioctl(eth, BIOCSDLT, &n) == -1) {
+		LOGERR;
+		close(eth);
+		return -1;
+	}
+
 	return eth;
 }
 
@@ -409,6 +352,7 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu
 	return rlen;
 }
 
+#ifndef __linux__
 /*
  * io_etherFilter() - BPF filter routine
  *
@@ -455,3 +399,4 @@ io_etherFilter(int eth, int io, struct bpf_insn * __re
 		LOGERR;
 	return ret;
 }
+#endif