--- libaitio/src/bpf.c	2013/10/21 16:12:57	1.3.8.3
+++ libaitio/src/bpf.c	2014/02/08 20:15:58	1.5.4.4
@@ -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.4.4 2014/02/08 20:15:58 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -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
@@ -77,7 +114,7 @@ io_get1stiface(char *szIface, int iflen)
 void
 io_etherClose(int eth, void **zcbuf)
 {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 	struct bpf_zbuf *zbuf = NULL;
 #endif
 
@@ -85,7 +122,7 @@ io_etherClose(int eth, void **zcbuf)
 		close(eth);
 
 	if (zcbuf && *zcbuf) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 		zbuf = *zcbuf;
 		munmap(zbuf->bz_bufb, zbuf->bz_buflen);
 		munmap(zbuf->bz_bufa, zbuf->bz_buflen);
@@ -95,7 +132,7 @@ io_etherClose(int eth, void **zcbuf)
 	}
 }
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 static inline struct bpf_zbuf *
 allocZCbuf(u_int len)
 {
@@ -141,7 +178,7 @@ allocZCbuf(u_int len)
  * return: -1 error or >-1 bpf handle
  */
 int
-io_etherOpen(const char *csIface, int flags, int whdr, int wdlt, 
+io_etherOpen(const char *csIface, int flags, u_int whdr, u_int wdlt, 
 		u_int *buflen, void **zcbuf)
 {
 	int eth = -1;
@@ -150,7 +187,7 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 	struct ifreq ifr;
 	u_int n = 1;
 
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) || !defined(ZCBUF_ENABLE)
 	if (zcbuf) {
 		io_SetErr(ENOTSUP, "bpf zero copy buffer mode is not supported");
 		return -1;
@@ -176,13 +213,14 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		return -1;
 	}
 
-	n = 1;
-	if (whdr && ioctl(eth, BIOCSHDRCMPLT, &n) == -1) {
+	n = wdlt;
+	if (wdlt && ioctl(eth, BIOCSDLT, &n) == -1) {
 		LOGERR;
 		close(eth);
 		return -1;
 	}
-	if (wdlt && ioctl(eth, BIOCSDLT, &wdlt) == -1) {
+	n = 1;
+	if (whdr && ioctl(eth, BIOCSHDRCMPLT, &n) == -1) {
 		LOGERR;
 		close(eth);
 		return -1;
@@ -194,14 +232,22 @@ 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__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 		n = BPF_BUFMODE_ZBUF;
 		if (ioctl(eth, BIOCSETBUFMODE, &n) == -1) {
 			LOGERR;
@@ -236,15 +282,6 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		return -1;
 	}
 
-	if (buflen && *buflen) {
-		if (ioctl(eth, BIOCGBLEN, &n) == -1) {
-			LOGERR;
-			io_etherClose(eth, zcbuf);
-			return -1;
-		} else
-			*buflen = n;
-	}
-
 	return eth;
 }
 
@@ -272,7 +309,7 @@ io_etherSend(int eth, const void *buf, size_t buflen)
 	return wlen;
 }
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 static inline void
 ackZCbuf(struct bpf_zbuf_header *bzh)
 {
@@ -345,7 +382,7 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu
 			return -1;
 		}
 	} else {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 		rlen = nextZCbuf(eth, (struct bpf_zbuf*) zcbuf, buf, buflen);
 		if (!rlen)
 			rlen = nextZCbuf(eth, (struct bpf_zbuf*) zcbuf, buf, buflen);