--- libelwix/inc/elwix/avar.h	2019/08/16 15:23:33	1.10.42.1
+++ libelwix/inc/elwix/avar.h	2022/01/24 17:08:21	1.13
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: avar.h,v 1.10.42.1 2019/08/16 15:23:33 misho Exp $
+* $Id: avar.h,v 1.13 2022/01/24 17:08:21 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 - 2019
+Copyright 2004 - 2022
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -304,14 +304,11 @@ typedef struct __packed {
 								AIT_SET_STR((_vl), \
 										AIT_GET_STR((_v))); \
 								break; \
-							case data: \
-								AIT_SET_DATA((_vl), \
-										AIT_GET_DATA((_v)), \
-								break; \
 							default: \
 								break; \
 						} \
 					} while (0)
+/* Additional helper macro, which can help about copy data variables */
 #define AIT_COPY_DATA(_vl, _v)          do { AIT_COPY_VAL((_vl), (_v)); \
 						if (AIT_TYPE((_vl)) == data) \
 							AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), \
@@ -335,23 +332,19 @@ typedef struct __packed {
 								if (!__val->val_in && \
 										__val->val.buffer) \
 									e_free(__val->val.buffer); \
+								__val->val.buffer = NULL; \
 								break; \
 							case string: \
 								if (!__val->val_in && \
 										__val->val.string) \
 									e_free(__val->val.string); \
+								__val->val.string = NULL; \
 								break; \
-							case data: \
-								if (!__val->val_in) \
-									memset(__val->val_data, 0, \
-											AIT_LEN(__val)); \
-								break; \
 							default: \
 								break; \
 						} \
 						__val->val_type = empty; \
 						__val->val_opt ^= __val->val_opt; \
-						__val->val.net ^= __val->val.net; \
 						AIT_LEN(__val) = 0; \
 						AIT_KEY(__val) = 0; \
 					} while (0)
@@ -360,6 +353,7 @@ typedef struct __packed {
 						switch (AIT_TYPE(__val)) { \
 							case buffer: \
 							case string: \
+								assert(!__val->val_in); \
 								if (__val->val.buffer) \
 									memset(__val->val.buffer, 0, \
 										AIT_LEN(__val)); \
@@ -383,8 +377,7 @@ typedef struct __packed {
  * @vars = Variable array
  * return: -1 error, 0 nothing done or >0 size of marshaled data
  */
-int ait_vars2buffer(unsigned char * __restrict buf, int buflen, 
-		array_t * __restrict vars);
+int ait_vars2buffer(unsigned char * __restrict buf, int buflen, array_t * __restrict vars);
 /*
  * ait_buffer2vars() - De-marshaling data from buffer to array with variables
  *
@@ -397,6 +390,23 @@ int ait_vars2buffer(unsigned char * __restrict buf, in
  */
 array_t *ait_buffer2vars(unsigned char * __restrict buf, int buflen, int vnum, int zcpy);
 /*
+ * ait_vars2tlv() - Marshaling data from array with variables to TLV buffer
+ *
+ * @buf = Buffer, If =NULL then we return only needed buffer size
+ * @buflen = Size of buffer
+ * @vars = Variable array
+ * return: -1 error, 0 nothing done or >0 size of marshaled data
+ */
+int ait_vars2tlv(u_char * __restrict buf, int buflen, array_t * __restrict vars);
+/*
+ * ait_tlv2vars() - De-marshaling data from TLV buffer to array with variables
+ *
+ * @buf = Buffer
+ * @buflen = Size of buffer
+ * return: =NULL error, !=NULL allocated variable array, after use must free with ait_freeVars()
+ */
+array_t *ait_tlv2vars(u_char * __restrict buf, int buflen);
+/*
  * ait_vars2map() - Marshaling data from array with variables to memory map
  *
  * @buf = Buffer
@@ -417,6 +427,14 @@ int ait_vars2map(unsigned char * __restrict buf, int b
  */
 array_t *ait_map2vars(unsigned char * __restrict buf, int buflen, int vnum, int zcpy);
 
+/*
+ * ait_array2vars() - Build array with variables from Null Terminated String Array
+ *
+ * @args = Null-terminated array with strings
+ * @dn = Convert numbers from strings to numbers into variables
+ * return: =NULL error, !=NULL allocated variable array, after use must free with ait_freeVars()
+ */
+array_t *ait_array2vars(const char **args, int dn);
 
 /*
  * ait_allocVar() - Allocate memory for variable