--- libaitio/src/bpf.c 2013/06/24 14:43:00 1.1.2.3 +++ libaitio/src/bpf.c 2013/06/25 08:45:50 1.1.2.7 @@ -95,7 +95,7 @@ allocZCbuf(u_int len) * 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, int whdr, u_int *buflen, void **zcbuf) { int n = 1, eth = -1; register int i; @@ -124,9 +124,9 @@ io_etherOpen(const char *csIface, int flags, int whdr, close(eth); return -1; } - if (buflen) { + if (buflen && *buflen) { if (!zcbuf) { - if (ioctl(eth, BIOCSBLEN, &buflen) == -1) { + if (ioctl(eth, BIOCSBLEN, buflen) == -1) { LOGERR; close(eth); return -1; @@ -143,8 +143,9 @@ io_etherOpen(const char *csIface, int flags, int whdr, LOGERR; close(eth); return -1; - } - if (!(*zcbuf = allocZCbuf(MIN(n, buflen)))) { + } else + *buflen = MIN(n, *buflen); + if (!(*zcbuf = allocZCbuf(*buflen))) { close(eth); return -1; } @@ -170,4 +171,93 @@ io_etherOpen(const char *csIface, int flags, int whdr, } return eth; +} + +/* + * io_etherSend() - Send packet to bpf + * + * @eth = bpf handle + * @buf = buffer + * @buflen = buffer length + * return: -1 error or !=-1 written bytes + */ +ssize_t +io_etherSend(int eth, const void *buf, size_t buflen) +{ + ssize_t wlen = 0; + + if (!buf || !buflen) { + io_SetErr(EINVAL, "invalid arguments"); + return -1; + } + + wlen = write(eth, buf, buflen); + if (wlen == -1) + LOGERR; + return wlen; +} + +#ifdef __FreeBSD__ +static inline ssize_t +nextZCbuf(void ** __restrict zcache, struct bpf_zbuf * __restrict zbuf, + const void * __restrict buf) +{ + ssize_t rlen = -1; + struct bpf_zbuf_header *bzh; + + if (!*zcache || *zcache == zbuf->bz_bufb) { + bzh = (struct bpf_zbuf_header *) zbuf->bz_bufa; + if (bzh->bzh_user_gen != atomic_load_acq_int(&bzh->bzh_kernel_gen)) { + rlen = atomic_load_acq_int(&bzh->bzh_kernel_len); + *zcache = zbuf->bz_bufa; + if (buf) + buf = ((caddr_t) *zcache) + sizeof(struct bpf_zbuf_header); + } + } else if (*zcache == zbuf->bz_bufa) { + bzh = (struct bpf_zbuf_header *) zbuf->bz_bufb; + if (bzh->bzh_user_gen != atomic_load_acq_int(&bzh->bzh_kernel_gen)) { + rlen = atomic_load_acq_int(&bzh->bzh_kernel_len); + *zcache = zbuf->bz_bufb; + if (buf) + buf = ((caddr_t) *zcache) + sizeof(struct bpf_zbuf_header); + } + } + + return rlen; +} +#endif + +/* + * io_etherRecv() - Receive packet from bpf + * + * @eth = bpf handle + * @buf = buffer + * @buflen = buffer length + * @zcbuf = zero copy buffer, if BPF supports it and isn't NULL + * return: -1 error or !=-1 readed bytes + */ +ssize_t +io_etherRecv(int eth, void * __restrict buf, size_t buflen, void * __restrict zcbuf) +{ + ssize_t rlen = 0; + void **zcache = NULL; + + if (!buf || !buflen) { + io_SetErr(EINVAL, "invalid arguments"); + return -1; + } + + if (!zcbuf) { + rlen = read(eth, buf, buflen); + if (rlen == -1) + LOGERR; + } else { +#ifdef __FreeBSD__ + rlen = nextZCbuf(zcache, (struct bpf_zbuf*) zcbuf, buf); +#else + io_SetErr(ENOTSUP, "bpf zero copy buffer mode is not supported"); +#endif + } + + return rlen; }