--- libaitio/src/bpf.c	2016/08/10 13:59:44	1.7.2.1
+++ libaitio/src/bpf.c	2016/08/11 13:31:51	1.7.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bpf.c,v 1.7.2.1 2016/08/10 13:59:44 misho Exp $
+* $Id: bpf.c,v 1.7.2.2 2016/08/11 13:31:51 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -63,15 +63,15 @@ io_etherClose(int eth, void **zcbuf)
 	if (eth > STDERR_FILENO)
 		close(eth);
 
-	if (zcbuf && *zcbuf) {
 #if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
+	if (zcbuf && *zcbuf) {
 		zbuf = *zcbuf;
 		munmap(zbuf->bz_bufb, zbuf->bz_buflen);
 		munmap(zbuf->bz_bufa, zbuf->bz_buflen);
 		e_free(*zcbuf);
 		*zcbuf = NULL;
-#endif
 	}
+#endif
 }
 
 #if defined(__FreeBSD__) && defined(ZCBUF_ENABLE)
@@ -114,7 +114,7 @@ allocZCbuf(u_int len)
  * @csIface = interface name
  * @flags = open flags
  * @whdr = with complete headers
- * @wdlt = with data link type
+ * @wdlt = with data link type, on Linux is protocol number
  * @buflen = buffer length
  * @zcbuf = zero copy buffer, if BPF supports it and isn't NULL
  * return: -1 error or >-1 bpf handle
@@ -124,10 +124,14 @@ io_etherOpen(const char *csIface, int flags, u_int whd
 		u_int *buflen, void **zcbuf)
 {
 	int eth = -1;
-	register int i;
 	char szStr[STRSIZ];
 	struct ifreq ifr;
+#ifndef __linux__
+	register int i;
 	u_int n = 1;
+#else
+	sockaddr_t sa = {{ 0 }};
+#endif
 
 #if !defined(__FreeBSD__) || !defined(ZCBUF_ENABLE)
 	if (zcbuf) {
@@ -136,6 +140,7 @@ io_etherOpen(const char *csIface, int flags, u_int whd
 	}
 #endif
 
+#ifndef __linux__
 	for (i = 0; i < BPF_DEV_MAX; i++) {
 		memset(szStr, 0, sizeof szStr);
 		snprintf(szStr, sizeof szStr, "/dev/bpf%d", i);
@@ -143,6 +148,9 @@ io_etherOpen(const char *csIface, int flags, u_int whd
 		if (eth > STDERR_FILENO)
 			break;
 	}
+#else
+	eth = socket(AF_PACKET, whdr ? SOCK_RAW : SOCK_DGRAM, htons((u_short) wdlt));
+#endif
 	if (eth < 3) {
 		LOGERR;
 		return -1;
@@ -155,6 +163,7 @@ io_etherOpen(const char *csIface, int flags, u_int whd
 		return -1;
 	}
 
+#ifndef __linux__
 	n = 1;
 	if (whdr && ioctl(eth, BIOCSHDRCMPLT, &n) == -1) {
 		LOGERR;
@@ -224,7 +233,25 @@ io_etherOpen(const char *csIface, int flags, u_int whd
 		close(eth);
 		return -1;
 	}
+#else
+	memset(&ifr, 0, sizeof ifr);
+	strlcpy(ifr.ifr_name, szStr, sizeof ifr.ifr_name);
+	if (ioctl(eth, SIOCGIFINDEX, &ifr)) {
+		LOGERR;
+		close(eth);
+		return -1;
+	}
 
+	sa.sll.sll_family = AF_PACKET;
+	sa.sll.sll_ifindex = ifr.ifr_ifindex;
+	sa.sll.sll_protocol = htons((u_short) wdlt);
+	if (bind(eth, &sa.sa, sizeof(sa.sll)) == -1) {
+		LOGERR;
+		close(eth);
+		return -1;
+	}
+#endif
+
 	return eth;
 }
 
@@ -311,7 +338,9 @@ ssize_t
 io_etherRecv(int eth, void * __restrict buf, size_t buflen, void * __restrict zcbuf)
 {
 	ssize_t rlen = 0;
+#ifndef __linux__
 	struct bpf_hdr *h;
+#endif
 
 	if (!buf || !buflen) {
 		io_SetErr(EINVAL, "invalid arguments");
@@ -335,6 +364,7 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu
 #endif
 	}
 
+#ifndef __linux__
 	h = (struct bpf_hdr*) buf;
 	rlen -= h->bh_hdrlen;
 
@@ -349,6 +379,7 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu
 	}
 
 	memmove(buf, buf + h->bh_hdrlen, rlen);
+#endif
 	return rlen;
 }