--- libelwix/inc/elwix/avar.h	2022/01/21 23:14:31	1.12.2.1
+++ libelwix/inc/elwix/avar.h	2024/12/05 12:33:49	1.14.30.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: avar.h,v 1.12.2.1 2022/01/21 23:14:31 misho Exp $
+* $Id: avar.h,v 1.14.30.1 2024/12/05 12:33:49 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 - 2022
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -368,6 +368,9 @@ typedef struct __packed {
 						AIT_KEY(__val) = 0; \
 					} while (0)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * ait_vars2buffer() - Marshaling data from array with variables to buffer
@@ -390,15 +393,33 @@ 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
+ * @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
@@ -580,5 +601,8 @@ ait_val_t *ait_findKeyHash(array_t * __restrict vars, 
  */
 int ait_hashKeyVars(array_t * __restrict vars);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif