--- libaitio/inc/aitio.h	2011/11/03 14:17:39	1.12.2.5
+++ libaitio/inc/aitio.h	2011/12/13 02:23:07	1.13
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.12.2.5 2011/11/03 14:17:39 misho Exp $
+* $Id: aitio.h,v 1.13 2011/12/13 02:23:07 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -273,17 +273,39 @@ inline char *io_ether_ntoa(const struct io_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_n2port() Extract port from network structure
+ * @addr = Address
+ * return: 0 not supported family type or port number
+ */
+inline u_short io_n2port(io_sockaddr_t * __restrict addr);
+/*
+ * io_n2addr() Extract address from network structure
+ * @addr = Address
+ * @val = Value for store string address
+ * return: NULL error or !=NULL string address from val
+ */
+const char *io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * __restrict val);
+/*
+ * io_gethostbyname() Get host and port and make network structure
+ * @psHost = Hostname
+ * @port = Port
+ * @addr = Network address structure
+ * return: NULL error or !=NULL network structure
+ */
+io_sockaddr_t *io_gethostbyname(const char *psHost, unsigned short port, 
+		io_sockaddr_t * __restrict addr);
 
 /*
- * io_vals2buffer() Marshaling data from array with variables to buffer
+ * io_vars2buffer() Marshaling data from array with variables to buffer
  * @buf = Buffer
  * @buflen = Size of buffer
  * @vars = Variable array
  * return: -1 error, 0 nothing done or >0 size of marshaled data
  */
-int io_vals2buffer(unsigned char *buf, int buflen, array_t *vars);
+int io_vars2buffer(unsigned char *buf, int buflen, array_t *vars);
 /*
- * io_buffer2vals() De-marshaling data from buffer to array with variables
+ * io_buffer2vars() De-marshaling data from buffer to array with variables
  * @buf = Buffer
  * @buflen = Size of buffer
  * @vnum = Number of variables into buffer
@@ -291,17 +313,17 @@ int io_vals2buffer(unsigned char *buf, int buflen, arr
  		*DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy()
  * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy()
  */
-array_t *io_buffer2vals(unsigned char *buf, int buflen, int vnum, int zcpy);
+array_t *io_buffer2vars(unsigned char *buf, int buflen, int vnum, int zcpy);
 /*
- * io_vals2map() Marshaling data from array with variables to memory map
+ * io_vars2map() Marshaling data from array with variables to memory map
  * @buf = Buffer
  * @buflen = Size of buffer
  * @vars = Variable array
  * return: -1 error, 0 nothing done or >0 size of marshaled data
  */
-int io_vals2map(u_char *buf, int buflen, array_t *vars);
+int io_vars2map(unsigned char *buf, int buflen, array_t *vars);
 /*
- * io_map2vals() De-marshaling data from memory map to array with variables
+ * io_map2vars() De-marshaling data from memory map to array with variables
  * @buf = Buffer
  * @buflen = Size of buffer
  * @vnum = Number of variables into buffer
@@ -309,21 +331,30 @@ int io_vals2map(u_char *buf, int buflen, array_t *vars
  		*DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy()
  * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy()
  */
-array_t *io_map2vals(u_char *buf, int buflen, int vnum, int zcpy);
+array_t *io_map2vars(unsigned char *buf, int buflen, int vnum, int zcpy);
 
 /*
  * io_allocVars() Allocate ait_val_t array
  * @varnum = Number of variables
  * return: =NULL error or !=NULL allocated array
  */
-inline array_t *io_allocVars(u_int varnum);
+inline array_t *io_allocVars(int varnum);
 /*
+ * io_clrVars() Clear ait_val_t elements from array
+ * @vars = Variable array
+ * return: -1 error or size of array
+ */
+inline int io_clrVars(array_t * __restrict vars);
+/*
  * io_freeVars() Free ait_val_t array
  * @vars = Variable array
  * return: none
  */
 inline void io_freeVars(array_t ** __restrict vars);
 
+#define io_elemVars(_vars, _n, _val)	((ait_val_t*) io_arrayElem((_vars), \
+							(_n), (void**) (_val)))
+
 /*
  * ioPromptRead() Read data from input h[0] with prompt to output h[1]
  * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout
@@ -372,11 +403,11 @@ int ioRegexGet(const char *csRegex, const char *csData
 char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew);
 
 /*
- * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"
+ * ioStrAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"
  * @csString = Input string
  * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free()
 */
-char *ioVarAst(const char *csString);
+char *ioStrAst(const char *csString);
 
 /*
  * io_Path2File() Parse and make path/filename pair
@@ -515,6 +546,14 @@ int io_arrayVacuum(array_t * __restrict arr, int fromW
 						*((_arr)->arr_data + _d) = NULL; \
 					} while (0)
 
+/*
+ * io_arrayElem() - Always GET/PUT element into dynamic array, if not enough elements grow array
+ * @arr = Array
+ * @n = Position
+ * @data = Element, if set NULL GET element at position or !=NULL PUT element at position
+ * return: -1 error or !=-1 return element at position
+ */
+inline void *io_arrayElem(array_t * __restrict arr, int n, void **data);
 /*
  * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position
  * @arr = Array