--- libaitio/src/bpf.c	2013/06/24 11:09:55	1.1.2.2
+++ libaitio/src/bpf.c	2013/06/24 14:43:00	1.1.2.3
@@ -26,24 +26,76 @@ io_get1stiface(char *szIface, int iflen)
  * io_etherClose() - Close BPF interface
  *
  * @eth = bpf handle
+ * @zcbuf = zero copy buffer, if BPF supports it and isn't NULL
  * return: none
  */
 void
-io_etherClose(int eth)
+io_etherClose(int eth, void **zcbuf)
 {
+#ifdef __FreeBSD__
+	struct bpf_zbuf *zbuf = NULL;
+#endif
+
 	if (eth > STDERR_FILENO)
 		close(eth);
+
+	if (zcbuf && *zcbuf) {
+#ifdef __FreeBSD__
+		zbuf = *zcbuf;
+		munmap(zbuf->bz_bufb, zbuf->bz_buflen);
+		munmap(zbuf->bz_bufa, zbuf->bz_buflen);
+		e_free(*zcbuf);
+		*zcbuf = NULL;
+#endif
+	}
 }
 
+#ifdef __FreeBSD__
+static inline struct bpf_zbuf *
+allocZCbuf(u_int len)
+{
+	struct bpf_zbuf *zbuf = NULL;
+
+	zbuf = e_malloc(sizeof(struct bpf_zbuf));
+	if (!zbuf) {
+		io_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		return NULL;
+	} else
+		memset(zbuf, 0, sizeof(struct bpf_zbuf));
+
+	zbuf->bz_buflen = roundup(len, getpagesize());
+	zbuf->bz_bufa = mmap(NULL, zbuf->bz_buflen, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
+	if (zbuf->bz_bufa == MAP_FAILED) {
+		LOGERR;
+		e_free(zbuf);
+		return NULL;
+	} else
+		memset(zbuf->bz_bufa, 0, zbuf->bz_buflen);
+	zbuf->bz_bufb = mmap(NULL, zbuf->bz_buflen, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
+	if (zbuf->bz_bufb == MAP_FAILED) {
+		LOGERR;
+		munmap(zbuf->bz_bufa, zbuf->bz_buflen);
+		e_free(zbuf);
+		return NULL;
+	} else
+		memset(zbuf->bz_bufb, 0, zbuf->bz_buflen);
+
+	return zbuf;
+}
+#endif
+
 /*
  * io_etherOpen() - Open BPF interface to device
  *
  * @csIface = interface name
  * @flags = open flags
+ * @whdr = with complete headers
+ * @buflen = buffer length
+ * @zcbuf = zero copy buffer, if BPF supports it and isn't NULL
  * return: -1 error or >-1 bpf handle
  */
 int
-io_etherOpen(const char *csIface, int flags)
+io_etherOpen(const char *csIface, int flags, int whdr, u_int buflen, void **zcbuf)
 {
 	int n = 1, eth = -1;
 	register int i;
@@ -67,22 +119,53 @@ io_etherOpen(const char *csIface, int flags)
 		close(eth);
 		return -1;
 	}
-	n = USHRT_MAX + 1;
-	if (ioctl(eth, BIOCSBLEN, &n) == -1) {
+	if (whdr && ioctl(eth, BIOCSHDRCMPLT, &n) == -1) {
 		LOGERR;
 		close(eth);
 		return -1;
 	}
+	if (buflen) {
+		if (!zcbuf) {
+			if (ioctl(eth, BIOCSBLEN, &buflen) == -1) {
+				LOGERR;
+				close(eth);
+				return -1;
+			}
+		} else {
+#ifdef __FreeBSD__
+			n = BPF_BUFMODE_ZBUF;
+			if (ioctl(eth, BIOCSETBUFMODE, &n) == -1) {
+				LOGERR;
+				close(eth);
+				return -1;
+			}
+			if (ioctl(eth, BIOCGETZMAX, &n) == -1) {
+				LOGERR;
+				close(eth);
+				return -1;
+			}
+			if (!(*zcbuf = allocZCbuf(MIN(n, buflen)))) {
+				close(eth);
+				return -1;
+			}
+			if (ioctl(eth, BIOCSETZBUF, (struct bpf_zbuf*) *zcbuf) == -1) {
+				LOGERR;
+				io_etherClose(eth, zcbuf);
+				return -1;
+			}
+#endif
+		}
+	}
 	if (csIface)
 		strlcpy(szStr, csIface, sizeof szStr);
 	else if (io_get1stiface(szStr, sizeof szStr) == -1) {
-		close(eth);
+		io_etherClose(eth, zcbuf);
 		return -1;
 	}
 	strlcpy(ifr.ifr_name, szStr, sizeof ifr.ifr_name);
 	if (ioctl(eth, BIOCSETIF, &ifr) == -1) {
 		LOGERR;
-		close(eth);
+		io_etherClose(eth, zcbuf);
 		return -1;
 	}