--- libaitio/inc/aitio.h	2013/12/12 15:20:22	1.38.10.14
+++ libaitio/inc/aitio.h	2016/08/10 13:55:00	1.41.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.38.10.14 2013/12/12 15:20:22 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 <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2016
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -53,13 +53,15 @@ SUCH DAMAGE.
 #include <syslog.h>
 #include <openssl/evp.h>
 #include <openssl/aes.h>
-#include <sys/tty.h>
-#include <sys/ioctl_compat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/uio.h>
+#ifndef __linux__
+#include <sys/tty.h>
+#include <sys/ioctl_compat.h>
 #include <net/if_dl.h>
 #include <net/bpf.h>
+#endif
 #include <netinet/in.h>
 #include <elwix.h>
 #include <aitsched.h>
@@ -94,7 +96,7 @@ typedef void *(*sock_cb_t)(sock_cli_t*);
 struct tagCliSock {
 	void				*cli_parent;
 	int				cli_fd;
-	int				cli_pty;
+	intptr_t			cli_pty;
 	sockaddr_t			cli_addr;
 	char				cli_name[64];
 	char				cli_cmdline[PATH_MAX];
@@ -149,10 +151,17 @@ prog_t *io_progInit(const char *progName, 
  *
  * @prg = program pool
  * @execNum = execute program(s) (0 max)
- * return: 0 error, >0 executed programs and abs(<0) executed programs with logged error
+ * return: -1 error, >0 executed programs
  */
 int io_progOpen(prog_t * __restrict prg, unsigned int execNum);
 /*
+ * io_progOpen2() - Start program from pool on first unused slot
+ *
+ * @prg = program pool
+ * return: -1 error, >-1 reside at slot
+ */
+int io_progOpen2(prog_t * __restrict prg);
+/*
  * io_progGrow() - Execute to number of programs in pool
  *
  * @prg = program pool
@@ -178,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
@@ -197,7 +218,7 @@ void io_progDestroy(prog_t ** __restrict pprg);
  * io_progCheck() - Check exit status of program pool
  *
  * @prg = program pool
- * @re = resurrect program
+ * @re = resurrect program to init number
  * return: -1 error or >-1 exited programs
  */
 int io_progCheck(prog_t * __restrict prg, int re);
@@ -257,13 +278,13 @@ void ioCloseSocket(sock_t ** __restrict s);
  */
 int ioCloseClient(sock_cli_t * __restrict c);
 /*
- * ioSetupProg() - Setup program pool to socket server
+ * ioSetupProg2Socket() - Setup program pool to socket server
  *
  * @s = Socket
  * @p = Program pool
  * return: -1 error or 0 ok
  */
-int ioSetupProg(sock_t * __restrict s, prog_t * __restrict p);
+int ioSetupProg2Socket(sock_t * __restrict s, prog_t * __restrict p);
 /*
  * ioUpSocket() - Setup socket for use
  *
@@ -615,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
@@ -641,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
  *