--- libaitio/inc/aitio.h 2013/12/12 21:17:53 1.38.10.16 +++ libaitio/inc/aitio.h 2016/08/10 13:55:00 1.41.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.38.10.16 2013/12/12 21:17:53 misho Exp $ +* $Id: aitio.h,v 1.41.2.1 2016/08/10 13:55:00 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 @@ -53,13 +53,15 @@ SUCH DAMAGE. #include #include #include -#include -#include #include #include #include +#ifndef __linux__ +#include +#include #include #include +#endif #include #include #include @@ -185,6 +187,18 @@ int io_progVacuum(prog_t * __restrict prg, unsigned in */ int io_progCloseAt(prog_t * __restrict prg, unsigned int idx); /* + * io_progCloseOf() - Close program at pool with certain handle + * + * @prg = program pool + * @h = handle of program + * return: 0 error, >0 closed programs + */ +#ifdef POPEN_STREAM +int io_progCloseOf(prog_t * __restrict prg, FILE *h); +#else +int io_progCloseOf(prog_t * __restrict prg, int h); +#endif +/* * io_progClose() - Close all programs in pool * * @prg = program pool @@ -622,22 +636,6 @@ int io_dumbFile(const char *csFile, int mode, off_t si /* - * 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); -/* - * 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); -/* * io_etherOpen() - Open BPF interface to device * * @csIface = interface name @@ -648,8 +646,8 @@ int io_getmaciface(const char *csIface, ether_addr_t * * @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, - unsigned int *buflen, void **zcbuf); +int io_etherOpen(const char *csIface, int flags, unsigned int whdr, + unsigned int wdlt, unsigned int *buflen, void **zcbuf); /* * io_etherClose() - Close BPF interface *