--- libaitio/src/bpf.c 2013/12/15 22:57:20 1.5 +++ libaitio/src/bpf.c 2016/08/18 09:06:31 1.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: bpf.c,v 1.5 2013/12/15 22:57:20 misho Exp $ +* $Id: bpf.c,v 1.8 2016/08/18 09:06:31 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 - 2016 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,64 +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_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 @@ -114,25 +56,25 @@ io_getmaciface(const char *csIface, ether_addr_t * __r void io_etherClose(int eth, void **zcbuf) { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE) struct bpf_zbuf *zbuf = NULL; #endif if (eth > STDERR_FILENO) close(eth); +#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE) 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 } +#endif } -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE) static inline struct bpf_zbuf * allocZCbuf(u_int len) { @@ -172,28 +114,33 @@ 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 */ 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; - register int i; char szStr[STRSIZ]; struct ifreq ifr; +#ifndef __linux__ + register int i; u_int n = 1; +#else + sockaddr_t sa = {{ 0 }}; +#endif -#ifndef __FreeBSD__ +#if !defined(__FreeBSD__) || !defined(ZCBUF_ENABLE) if (zcbuf) { io_SetErr(ENOTSUP, "bpf zero copy buffer mode is not supported"); return -1; } #endif +#ifndef __linux__ for (i = 0; i < BPF_DEV_MAX; i++) { memset(szStr, 0, sizeof szStr); snprintf(szStr, sizeof szStr, "/dev/bpf%d", i); @@ -201,6 +148,9 @@ io_etherOpen(const char *csIface, int flags, int whdr, 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; @@ -208,22 +158,18 @@ io_etherOpen(const char *csIface, int flags, int whdr, if (csIface) strlcpy(szStr, csIface, sizeof szStr); - else if (io_get1stiface(szStr, sizeof szStr) == -1) { + else if (e_get1stiface(szStr, sizeof szStr) == -1) { close(eth); return -1; } +#ifndef __linux__ n = 1; if (whdr && ioctl(eth, BIOCSHDRCMPLT, &n) == -1) { LOGERR; close(eth); return -1; } - if (wdlt && ioctl(eth, BIOCSDLT, &wdlt) == -1) { - LOGERR; - close(eth); - return -1; - } if (ioctl(eth, BIOCIMMEDIATE, &n) == -1) { LOGERR; close(eth); @@ -246,7 +192,7 @@ io_etherOpen(const char *csIface, int flags, int whdr, if (buflen) *buflen = n; } else { -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) && defined(ZCBUF_ENABLE) n = BPF_BUFMODE_ZBUF; if (ioctl(eth, BIOCSETBUFMODE, &n) == -1) { LOGERR; @@ -281,6 +227,31 @@ io_etherOpen(const char *csIface, int flags, int whdr, return -1; } + n = wdlt; + if (wdlt && ioctl(eth, BIOCSDLT, &n) == -1) { + LOGERR; + 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; } @@ -308,7 +279,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) { @@ -367,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"); @@ -381,7 +354,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); @@ -391,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; @@ -405,9 +379,11 @@ io_etherRecv(int eth, void * __restrict buf, size_t bu } memmove(buf, buf + h->bh_hdrlen, rlen); +#endif return rlen; } +#ifndef __linux__ /* * io_etherFilter() - BPF filter routine * @@ -454,3 +430,4 @@ io_etherFilter(int eth, int io, struct bpf_insn * __re LOGERR; return ret; } +#endif