--- libelwix/inc/elwix/avar.h 2022/01/06 15:13:01 1.12 +++ libelwix/inc/elwix/avar.h 2022/01/24 17:08:21 1.13 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: avar.h,v 1.12 2022/01/06 15:13:01 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 @@ -377,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 * @@ -391,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 @@ -411,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