--- libaitio/src/bpf.c	2013/10/21 16:12:57	1.3.8.3
+++ libaitio/src/bpf.c	2013/12/15 22:57:20	1.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bpf.c,v 1.3.8.3 2013/10/21 16:12:57 misho Exp $
+* $Id: bpf.c,v 1.5 2013/12/15 22:57:20 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -68,6 +68,43 @@ io_get1stiface(char *szIface, int iflen)
 }
 
 /*
+ * 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
@@ -194,12 +231,20 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 	}
 
 	if (!zcbuf) {
-		n = (buflen && *buflen) ? *buflen : getpagesize();
+		if (ioctl(eth, BIOCGBLEN, &n) == -1) {
+			LOGERR;
+			close(eth);
+			return -1;
+		} else
+			n = (buflen && *buflen) ? *buflen : getpagesize();
+
 		if (ioctl(eth, BIOCSBLEN, &n) == -1) {
 			LOGERR;
 			close(eth);
 			return -1;
 		}
+		if (buflen)
+			*buflen = n;
 	} else {
 #ifdef __FreeBSD__
 		n = BPF_BUFMODE_ZBUF;
@@ -234,15 +279,6 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		LOGERR;
 		io_etherClose(eth, zcbuf);
 		return -1;
-	}
-
-	if (buflen && *buflen) {
-		if (ioctl(eth, BIOCGBLEN, &n) == -1) {
-			LOGERR;
-			io_etherClose(eth, zcbuf);
-			return -1;
-		} else
-			*buflen = n;
 	}
 
 	return eth;