--- libaitio/inc/aitio.h	2011/09/01 08:13:10	1.11.2.10
+++ libaitio/inc/aitio.h	2011/09/19 21:59:57	1.11.2.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.11.2.10 2011/09/01 08:13:10 misho Exp $
+* $Id: aitio.h,v 1.11.2.14 2011/09/19 21:59:57 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -160,7 +160,7 @@ typedef struct {
 							__val->val_type = buffer; AIT_LEN(__val) = _len; \
 							memcpy(__val->val.buffer, (_v), _len); \
 						} } while (0)
-#define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
+#define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \
 						__val->val.string = (int8_t*) strdup((_v)); \
 						if (__val->val.string) { \
 							__val->val_type = string; \
@@ -172,6 +172,7 @@ typedef struct {
 #define AIT_SET_BLOB2(_vl, _bv)		do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \
 						__val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \
 						__val->val.blob = (_bv)->blob_var; } while (0)
+#define AIT_NEW_BLOB(_vl, _len)		AIT_SET_BLOB((_vl), 0, _len)
 
 #define AIT_SET_U8(_vl, _n)		do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val_type = u8; __val->val.u8 = _n; \
@@ -251,6 +252,24 @@ int io_vals2buffer(unsigned char *buf, int buflen, arr
  * 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);
+/*
+ * io_vals2map() 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);
+/*
+ * io_map2vals() De-marshaling data from memory map to array with variables
+ * @buf = Buffer
+ * @buflen = Size of buffer
+ * @vnum = Number of variables into buffer
+ * @zcpy = Zero-copy for variables, if !=0 don't use io_arrayFree() for free variables and 
+ 		*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);
 
 /*
  * ioPromptRead() Read data from input h[0] with prompt to output h[1]
@@ -730,6 +749,26 @@ int ioCipher(unsigned char *pInput, int inLen, unsigne
 */
 int io_Blowfish(unsigned char *pInput, int inLen, unsigned char **ppOutput, 
 		unsigned char *pKey, unsigned char *pIV, int nMode);
+
+
+/*
+ * ioAllocPTY() Allocate new PTY
+ * @ptyfd = master fd, pty
+ * @ttyfd = slave fd, tty
+ * @name = tty device name if not null
+ * @namesiz = name length, must be above 63 bytes.
+ * @term = termios for terminal
+ * @winz = winsize for terminal
+ * return: -1 error or 0 ok
+ */
+inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * __restrict name, int namesiz, 
+		struct termios * __restrict term, struct winsize * __restrict winz);
+/*
+ * ioFreePTY() Release PTY
+ * @ttyname = tty filename
+ * return: none
+ */
+inline void ioFreePTY(const char *ttyname);
 
 
 #endif