--- libaitio/inc/aitio.h	2011/10/07 09:14:40	1.11.2.23
+++ libaitio/inc/aitio.h	2011/10/14 07:39:47	1.11.2.27
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.11.2.23 2011/10/07 09:14:40 misho Exp $
+* $Id: aitio.h,v 1.11.2.27 2011/10/14 07:39:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -232,7 +232,11 @@ typedef struct {
 						AIT_LEN(__val) = 0; \
 					} while (0)
 
+struct io_ether_addr {
+	u_int8_t ether_addr_octet[6];
+};
 
+
 // io_GetErrno() Get error code of last operation
 inline int io_GetErrno();
 // io_GetError() Get error text of last operation
@@ -240,6 +244,22 @@ inline const char *io_GetError();
 
 
 /*
+ * io_ether_ntoa() Convert ethernet address to string
+ * @n = ethernet address structure, like struct ether_addr
+ * @a = string
+ * @len = string length
+ * return: NULL error or !=NULL string a
+ */
+inline char *io_ether_ntoa(const struct io_ether_addr *n, char * __restrict a, int len);
+/*
+ * io_ether_aton() Convert string to ethernet address
+ * @a = string
+ * @e = ethernet address structure, like struct ether_addr
+ * return: NULL error or !=NULL ethernet address structure
+ */
+inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e);
+
+/*
  * io_vals2buffer() Marshaling data from array with variables to buffer
  * @buf = Buffer
  * @buflen = Size of buffer
@@ -760,9 +780,11 @@ int io_Blowfish(unsigned char *pInput, int inLen, unsi
  * @inLen = Input buffer data length
  * @ppOutput = Output buffer with cipher data, must be free after use
  * @pKey = Key
+ * @IV = IVector/Nonce/Counter, Warning: IV must be variable, because we write there!!!
  * return: -1 error or >-1 how many cipher blocks proceeded
  */
-int io_ctr_AES(u_char *pInput, int inLen, u_char **ppOutput, u_char *pKey);
+int io_ctr_AES(unsigned char *pInput, int inLen, unsigned char **ppOutput, 
+		unsigned char *pKey, unsigned char IV[AES_BLOCK_SIZE]);
 
 
 /*
@@ -793,7 +815,8 @@ inline void ioFreePTY(int ptyfd, const char *ttyname);
  * @ypxl = y pixels
  * return: -1 error or 0 ok
  */
-inline int ioChgWinPTY(int ptyfd, u_short row, u_short col, u_short xpxl, u_short ypxl);
+inline int ioChgWinPTY(int ptyfd, unsigned short row, unsigned short col, 
+		unsigned short xpxl, unsigned short ypxl);
 /*
  * ioSetOwnerTTY() Set owner to TTY
  * @ttyname = tty filename