--- libelwix/inc/elwix/avar.h	2015/06/25 17:53:49	1.9
+++ libelwix/inc/elwix/avar.h	2022/02/01 20:45:17	1.13.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: avar.h,v 1.9 2015/06/25 17:53:49 misho Exp $
+* $Id: avar.h,v 1.13.4.1 2022/02/01 20:45:17 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 - 2015
+Copyright 2004 - 2022
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@ typedef enum {
 	i8, i16, i32, i64,		/* integers ... */
 } ait_type_t;
 
-typedef struct {
+typedef struct __packed {
 	uint8_t		val_type;
 	union {
 		struct {
@@ -93,7 +93,7 @@ typedef struct {
 		int64_t		i64;
 	} val;
 	uint8_t		val_data[0];
-} __packed ait_val_t;	/* sizeof 16 bytes */
+} /*__packed*/ ait_val_t;	/* sizeof 16 bytes */
 
 #define AIT_TYPE(_vl)			((ait_type_t) (_vl)->val_type)
 #define AIT_LEN(_vl)			(_vl)->val_len
@@ -308,6 +308,7 @@ typedef struct {
 								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)), \
@@ -352,6 +353,7 @@ typedef struct {
 						switch (AIT_TYPE(__val)) { \
 							case buffer: \
 							case string: \
+								assert(!__val->val_in); \
 								if (__val->val.buffer) \
 									memset(__val->val.buffer, 0, \
 										AIT_LEN(__val)); \
@@ -375,8 +377,7 @@ typedef struct {
  * @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
  *
@@ -389,6 +390,41 @@ int ait_vars2buffer(unsigned char * __restrict buf, in
  */
 array_t *ait_buffer2vars(unsigned char * __restrict buf, int buflen, int vnum, int zcpy);
 /*
+ * ait_var2tlv() - Marshaling data from variable to TLV buffer
+ *
+ * @buf = Buffer, If =NULL then we return only needed buffer size
+ * @buflen = Size of buffer
+ * @var = Variable
+ * return: -1 error, 0 nothing done or >0 size of marshaled data
+ */
+int ait_var2tlv(u_char * __restrict buf, int buflen, ait_val_t * __restrict v);
+/*
+ * 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_tlv2var() - De-marshaling data from TLV buffer to variable
+ *
+ * @buf = Buffer
+ * @buflen = Size of buffer
+ * @next_tlv = Next TLV position, if it is !=NULL 
+ * return: =NULL error, !=NULL allocated variable array, after use must free with ait_freeVar()
+ */
+ait_val_t *ait_tlv2var(u_char * __restrict buf, int buflen, off_t *next_tlv);
+/*
+ * 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
@@ -409,6 +445,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