--- libaitio/src/bpf.c 2013/06/26 22:48:53 1.2 +++ libaitio/src/bpf.c 2015/01/19 23:32:30 1.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: bpf.c,v 1.2 2013/06/26 22:48:53 misho Exp $ +* $Id: bpf.c,v 1.7 2015/01/19 23:32:30 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 -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2014 by Michael Pounov . 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) { @@ -135,12 +114,14 @@ allocZCbuf(u_int len) * @csIface = interface name * @flags = open flags * @whdr = with complete headers + * @wdlt = with data link type * @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, int whdr, u_int *buflen, void **zcbuf) +io_etherOpen(const char *csIface, int flags, u_int whdr, u_int wdlt, + u_int *buflen, void **zcbuf) { int eth = -1; register int i; @@ -148,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; @@ -167,22 +148,42 @@ io_etherOpen(const char *csIface, int flags, int whdr, return -1; } + if (csIface) + strlcpy(szStr, csIface, sizeof szStr); + else if (e_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; @@ -209,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) { @@ -223,17 +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 (ioctl(eth, BIOCIMMEDIATE, &n) == -1) { - LOGERR; - io_etherClose(eth, zcbuf); - return -1; - } return eth; } @@ -262,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) { @@ -321,6 +311,7 @@ ssize_t io_etherRecv(int eth, void * __restrict buf, size_t buflen, void * __restrict zcbuf) { ssize_t rlen = 0; + struct bpf_hdr *h; if (!buf || !buflen) { io_SetErr(EINVAL, "invalid arguments"); @@ -329,10 +320,12 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu if (!zcbuf) { rlen = read(eth, buf, buflen); - if (rlen == -1) + if (rlen == -1) { LOGERR; + 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); @@ -342,5 +335,66 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu #endif } + h = (struct bpf_hdr*) buf; + rlen -= h->bh_hdrlen; + + if (h->bh_caplen != rlen) { + if (h->bh_caplen < rlen) + rlen = h->bh_caplen; + else { + io_SetErr(EIO, "Captured %d bytes should be at most %d bytes", + h->bh_caplen, rlen); + return -1; + } + } + + memmove(buf, buf + h->bh_hdrlen, rlen); return rlen; +} + +/* + * io_etherFilter() - BPF filter routine + * + * @eth = bpf handle + * @io = filter direction + * (IO_ETHER_FILTER_PROMISC|IO_ETHER_FILTER_NOTREAD|IO_ETHER_FILTER_READ|IO_ETHER_FILTER_WRITE) + * @insn = BPF filter instruction array + * @insnlen = Length of BPF filter instruction array + * return: -1 error or 0 ok + */ +int +io_etherFilter(int eth, int io, struct bpf_insn * __restrict insn, size_t insnlen) +{ + int ret = 0; + struct bpf_program fcode = { 0 }; + + if (io != IO_ETHER_FILTER_PROMISC && (!insn || !insnlen)) { + io_SetErr(EINVAL, "invalid arguments"); + return -1; + } + + switch (io) { + case IO_ETHER_FILTER_PROMISC: /* promiscuous mode */ + ret = ioctl(eth, BIOCPROMISC, NULL); + break; + case IO_ETHER_FILTER_NOTREAD: /* read not filter */ + fcode.bf_len = insnlen / sizeof(struct bpf_insn); + fcode.bf_insns = insn; + ret = ioctl(eth, BIOCSETFNR, &fcode); + break; + case IO_ETHER_FILTER_READ: /* read filter */ + fcode.bf_len = insnlen / sizeof(struct bpf_insn); + fcode.bf_insns = insn; + ret = ioctl(eth, BIOCSETF, &fcode); + break; + case IO_ETHER_FILTER_WRITE: /* write filter */ + fcode.bf_len = insnlen / sizeof(struct bpf_insn); + fcode.bf_insns = insn; + ret = ioctl(eth, BIOCSETWF, &fcode); + break; + } + + if (ret == -1) + LOGERR; + return ret; }