--- libaitio/src/bpf.c	2013/10/21 15:39:15	1.3.8.2
+++ libaitio/src/bpf.c	2014/11/17 22:33:14	1.6.6.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bpf.c,v 1.3.8.2 2013/10/21 15:39:15 misho Exp $
+* $Id: bpf.c,v 1.6.6.2 2014/11/17 22:33:14 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
@@ -47,27 +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_etherClose() - Close BPF interface
  *
  * @eth = bpf handle
@@ -77,7 +56,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 +64,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 +74,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 +120,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 +129,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;
@@ -169,22 +148,42 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 		return -1;
 	}
 
+	if (csIface)
+		strlcpy(szStr, csIface, sizeof szStr);
+	else if (io_get1stiface(szStr, sizeof szStr) == -1) {
+		close(eth);
+		return -1;
+	}
+
+	n = 1;
+	if (whdr && ioctl(eth, BIOCSHDRCMPLT, &n) == -1) {
+		LOGERR;
+		close(eth);
+		return -1;
+	}
+	if (ioctl(eth, BIOCIMMEDIATE, &n) == -1) {
+		LOGERR;
+		close(eth);
+		return -1;
+	}
+
 	if (!zcbuf) {
 		if (ioctl(eth, BIOCGBLEN, &n) == -1) {
 			LOGERR;
 			close(eth);
 			return -1;
 		} else
-			n = (buflen && *buflen) ? *buflen : n;
+			n = (buflen && *buflen) ? *buflen : getpagesize();
+
 		if (ioctl(eth, BIOCSBLEN, &n) == -1) {
 			LOGERR;
 			close(eth);
 			return -1;
 		}
-		if (buflen && *buflen)
+		if (buflen)
 			*buflen = n;
 	} else {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
 		n = BPF_BUFMODE_ZBUF;
 		if (ioctl(eth, BIOCSETBUFMODE, &n) == -1) {
 			LOGERR;
@@ -211,12 +210,6 @@ io_etherOpen(const char *csIface, int flags, int whdr,
 #endif
 	}
 
-	if (csIface)
-		strlcpy(szStr, csIface, sizeof szStr);
-	else if (io_get1stiface(szStr, sizeof szStr) == -1) {
-		io_etherClose(eth, zcbuf);
-		return -1;
-	}
 	memset(&ifr, 0, sizeof ifr);
 	strlcpy(ifr.ifr_name, szStr, sizeof ifr.ifr_name);
 	if (ioctl(eth, BIOCSETIF, &ifr) == -1) {
@@ -225,22 +218,12 @@ 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;
-		io_etherClose(eth, zcbuf);
+		close(eth);
 		return -1;
 	}
-	if (wdlt && ioctl(eth, BIOCSDLT, &wdlt) == -1) {
-		LOGERR;
-		io_etherClose(eth, zcbuf);
-		return -1;
-	}
-	if (ioctl(eth, BIOCIMMEDIATE, &n) == -1) {
-		LOGERR;
-		io_etherClose(eth, zcbuf);
-		return -1;
-	}
 
 	return eth;
 }
@@ -269,7 +252,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)
 {
@@ -342,7 +325,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);