libaitio/inc/aitio.h - diff

Return to aitio.h CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / inc

Diff for /libaitio/inc/aitio.h between versions 1.17.4.6 and 1.18.2.5

version 1.17.4.6, 2012/05/18 09:19:53	version 1.18.2.5, 2012/05/23 14:06:08
Line 49 SUCH DAMAGE.	Line 49 SUCH DAMAGE.

#define COMPAT_43TTY	#define COMPAT_43TTY

	#include <atree.h>
	#include <ampool.h>
#include <assert.h>	#include <assert.h>
#include <openssl/evp.h>	#include <openssl/evp.h>
#include <openssl/aes.h>	#include <openssl/aes.h>
Line 60 SUCH DAMAGE.	Line 62 SUCH DAMAGE.
#include <netinet/in.h>	#include <netinet/in.h>


	#define IO_SYSM 0
	#define IO_MPOOL 1

#define VACUUM_LEFT 1	#define VACUUM_LEFT 1
#define VACUUM_BETWEEN 2	#define VACUUM_BETWEEN 2

Line 142 typedef struct {	Line 147 typedef struct {
#define AIT_GET_F64(_vl) (assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)	#define AIT_GET_F64(_vl) (assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)

#define AIT_SET_DATA(_vl, _p, _len) do { ait_val_t *__val = (_vl); \	#define AIT_SET_DATA(_vl, _p, _len) do { ait_val_t *__val = (_vl); \
__val = realloc(__val, sizeof(ait_val_t) + _len); \	__val = io_realloc(__val, sizeof(ait_val_t) + _len); \
if (__val) { \	if (__val) { \
__val->val_type = data; AIT_LEN(__val) = _len; \	__val->val_type = data; AIT_LEN(__val) = _len; \
if ((_p)) \	if ((_p)) \
Line 154 typedef struct {	Line 159 typedef struct {
__val->val_type = ptr; AIT_LEN(__val) = _len; \	__val->val_type = ptr; AIT_LEN(__val) = _len; \
__val->val.ptr = _p; } while (0)	__val->val.ptr = _p; } while (0)
#define AIT_RE_BUF(_vl, _len) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_RE_BUF(_vl, _len) do { ait_val_t *__val = (_vl); assert(__val); \
void *__ptr = realloc(AIT_GET_BUF(__val), _len); \	void *__ptr = io_realloc(AIT_GET_BUF(__val), _len); \
if (__ptr) { \	if (__ptr) { \
__val->val.buffer = __ptr; AIT_LEN(__val) = _len; \	__val->val.buffer = __ptr; AIT_LEN(__val) = _len; \
} } while (0)	} } while (0)
#define AIT_SET_BUF2(_vl, _c, _len) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_SET_BUF2(_vl, _c, _len) do { ait_val_t *__val = (_vl); assert(__val); \
__val->val.buffer = malloc(_len); \	__val->val.buffer = io_malloc(_len); \
if (__val->val.buffer) { \	if (__val->val.buffer) { \
__val->val_type = buffer; AIT_LEN(__val) = _len; \	__val->val_type = buffer; AIT_LEN(__val) = _len; \
memset(__val->val.buffer, _c, _len); \	memset(__val->val.buffer, _c, _len); \
} } while (0)	} } while (0)
#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \
__val->val.buffer = malloc(_len); \	__val->val.buffer = io_malloc(_len); \
if (__val->val.buffer) { \	if (__val->val.buffer) { \
__val->val_type = buffer; AIT_LEN(__val) = _len; \	__val->val_type = buffer; AIT_LEN(__val) = _len; \
if ((_v)) \	if ((_v)) \
Line 173 typedef struct {	Line 178 typedef struct {
else \	else \
memset(__val->val.buffer, 0, _len); \	memset(__val->val.buffer, 0, _len); \
} } while (0)	} } while (0)
#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val && (_v)); \	#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \
__val->val.string = (int8_t*) strdup((_v)); \	__val->val.string = (int8_t*) io_strdup((_v)); \
if (__val->val.string) { \	if (__val->val.string) { \
__val->val_type = string; \	__val->val_type = string; \
AIT_LEN(__val) = strlen((_v)) + 1; \	AIT_LEN(__val) = strlen((_v)) + 1; \
} } while (0)	} } while (0)
#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \
assert(AIT_TYPE(__val) == string); \	assert(AIT_TYPE(__val) == string); \
void *__p = realloc(__val->val.string, \	void *__p = io_realloc(__val->val.string, \
AIT_LEN(__val) + strlen((_v))); \	AIT_LEN(__val) + strlen((_v))); \
if (__p) { \	if (__p) { \
__val->val.string = __p; \	__val->val.string = __p; \
Line 246 typedef struct {	Line 251 typedef struct {
} while (0)	} while (0)

#define AIT_INIT_VAL(_vl) (memset((_vl), 0, sizeof(ait_val_t)))	#define AIT_INIT_VAL(_vl) (memset((_vl), 0, sizeof(ait_val_t)))
/* if attribute zeroCopy is set not execute free() */	/* if attribute zeroCopy is set not execute io_free() */
#define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \
switch (AIT_TYPE(__val)) { \	switch (AIT_TYPE(__val)) { \
case buffer: \	case buffer: \
if (__val->val.buffer) { \	if (__val->val.buffer) { \
free(__val->val.buffer); \	io_free(__val->val.buffer); \
__val->val.buffer = NULL; \	__val->val.buffer = NULL; \
} \	} \
break; \	break; \
case string: \	case string: \
if (__val->val.string) { \	if (__val->val.string) { \
free(__val->val.string); \	io_free(__val->val.string); \
__val->val.string = NULL; \	__val->val.string = NULL; \
} \	} \
break; \	break; \
Line 292 inline int io_GetErrno();	Line 297 inline int io_GetErrno();
inline const char *io_GetError();	inline const char *io_GetError();


	// io_mm_inuse() Check for memory management model
	inline int io_mm_inuse();

/*	/*
	* ioLibInit() - Init libaitio library memory management
	*
	* @mm = memory management (IO_SYSM or IO_MPOOL)
	* @maxmem = memory limit
	* return: -1 error or !=-1 used memory management model
	*/
	inline int ioLibInit(int mm, unsigned long maxmem);
	/*
	* ioLibFini() - Finish libaitio library memory management
	*
	* return: none
	*/
	inline void ioLibFini();

	/* memory management hooks */
	extern void (io_malloc)(size_t);
	extern void (io_calloc)(size_t, size_t);
	extern void (io_realloc)(void*, size_t);
	extern char (io_strdup)(const char*);
	extern void (io_free)(void);


	/*
* io_ether_ntoa() - Convert ethernet address to string	* io_ether_ntoa() - Convert ethernet address to string
*	*
* @n = ethernet address structure, like struct ether_addr	* @n = ethernet address structure, like struct ether_addr
Line 417 inline void io_freeVars(array_t ** __restrict vars);	Line 448 inline void io_freeVars(array_t ** __restrict vars);
* @n = index of variable into array	* @n = index of variable into array
* return: NULL error or !=NULL ait_val_t element	* return: NULL error or !=NULL ait_val_t element
*/	*/
inline ait_val_t io_getVars(array_t __restrict vars, int n);	inline ait_val_t io_getVars(array_t * __restrict vars, int n);
/*	/*
* io_sortVars() - Sorting array with variables	* io_sortVars() - Sorting array with variables
*	*
Line 486 int ioRegexGet(const char csRegex, const char csData	Line 517 int ioRegexGet(const char csRegex, const char csData
* @csRegex = Regulare expression pattern	* @csRegex = Regulare expression pattern
* @csData = Source data	* @csData = Source data
* @csNew = Data for replace	* @csNew = Data for replace
* return: NULL not match or error; !=NULL allocated new string, must be free after use!	* return: NULL not match or error; !=NULL allocated new string, must be io_free after use!
*/	*/
char ioRegexReplace(const char csRegex, const char csData, const char csNew);	char ioRegexReplace(const char csRegex, const char csData, const char csNew);

Line 494 char ioRegexReplace(const char csRegex, const char *	Line 525 char ioRegexReplace(const char csRegex, const char *
* ioStrAst() - Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"	* ioStrAst() - Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"
*	*
* @csString = Input string	* @csString = Input string
* return: NULL error, !=NULL Allocated new string evaluated from input string, must be free()	* return: NULL error, !=NULL Allocated new string evaluated from input string, must be io_free()
*/	*/
char ioStrAst(const char csString);	char ioStrAst(const char csString);

Line 531 inline int io_TrimStr(char * __restrict psLine);	Line 562 inline int io_TrimStr(char * __restrict psLine);
*	*
* @psLine = Text string	* @psLine = Text string
* @lineLen = Length of Text string	* @lineLen = Length of Text string
* return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free)	* return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be io_free)
*/	*/
inline unsigned char io_Ch2Hex(unsigned char psLine, int lineLen);	inline unsigned char io_Ch2Hex(unsigned char psLine, int lineLen);
/*	/*
Line 539 inline unsigned char io_Ch2Hex(unsigned char psLine,	Line 570 inline unsigned char io_Ch2Hex(unsigned char psLine,
*	*
* @psLine = Text string	* @psLine = Text string
* @lineLen = Length of Text string	* @lineLen = Length of Text string
* return: NULL nothing to do or error; !=0 Allocated new converted string(must be free)	* return: NULL nothing to do or error; !=0 Allocated new converted string(must be io_free)
*/	*/
inline char io_Hex2Ch(unsigned char psLine, int lineLen);	inline char io_Hex2Ch(unsigned char psLine, int lineLen);

Line 656 int io_arrayVacuum(array_t * __restrict arr, int fromW	Line 687 int io_arrayVacuum(array_t * __restrict arr, int fromW
free((_arr)->arr_data[_d]); \	free((_arr)->arr_data[_d]); \
(_arr)->arr_data[_d] = NULL; \	(_arr)->arr_data[_d] = NULL; \
} while (0)	} while (0)
#define io_arraySyncLast(_arr) do { \
assert((_arr)); \
(_arr)->arr_last = io_arrayLen((_arr)); \
} while (0)

/*	/*
* io_arrayElem() - Always GET/PUT element into dynamic array, if not enough elements grow array	* io_arrayElem() - Always GET/PUT element into dynamic array, if not enough elements grow array
Line 705 inline int io_argsNum(const char csArgs, const char	Line 732 inline int io_argsNum(const char csArgs, const char
* @psArgs = Input arguments line, after execute string is modified!!!	* @psArgs = Input arguments line, after execute string is modified!!!
* @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs	* @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs
* @csDelim = Delimiter(s) for separate	* @csDelim = Delimiter(s) for separate
* @parr = Output array of arguments ... (must be free with io_arrayDestroy() after use!)	* @parr = Output array of arguments ... (must be io_free with io_arrayDestroy() after use!)
* return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items	* return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
*/	*/
int io_arrayMake(char * __restrict psArgs, int nargs, const char *csDelim,	int io_arrayMake(char * __restrict psArgs, int nargs, const char *csDelim,
Line 815 sarr_t io_array2sarr(array_t * __restrict a, int seg	Line 842 sarr_t io_array2sarr(array_t * __restrict a, int seg
* io_CopyEnv() - Copy environment to new environment array;	* io_CopyEnv() - Copy environment to new environment array;
*	*
* @oldenv = Environment array	* @oldenv = Environment array
* return: NULL error; !=NULL Allocated new environment array(must be free)	* return: NULL error; !=NULL Allocated new environment array(must be io_free)
*/	*/
char io_CopyEnv(const char oldenv);	char io_CopyEnv(const char oldenv);
/*	/*
Line 823 char io_CopyEnv(const char oldenv);	Line 850 char io_CopyEnv(const char oldenv);
*	*
* @psProg = Program name for execute	* @psProg = Program name for execute
* @oldarg = Arguments array	* @oldarg = Arguments array
* return: NULL error; !=NULL Allocated execution array(must be free)	* return: NULL error; !=NULL Allocated execution array(must be io_free)
*/	*/
char *io_ExecArgs(const char psProg, const char **oldarg);	char *io_ExecArgs(const char psProg, const char **oldarg);
/*	/*
Line 940 extern int io_Debug;	Line 967 extern int io_Debug;
*	*
* @pInput = input buffer	* @pInput = input buffer
* @inLen = input buffer len	* @inLen = input buffer len
* @ppOutput = output allocated buffe, must be free after use	* @ppOutput = output allocated buffe, must be io_free after use
* @Cipher = cipher engine, like EVP_bf_cbc() or etc...	* @Cipher = cipher engine, like EVP_bf_cbc() or etc...
* @pKey = key	* @pKey = key
* @pIV = IV, salt (8 bytes)	* @pIV = IV, salt (8 bytes)
Line 955 int ioCipher(unsigned char *pInput, int inLen, unsigne	Line 982 int ioCipher(unsigned char *pInput, int inLen, unsigne
*	*
* @pInput = input buffer	* @pInput = input buffer
* @inLen = input buffer len	* @inLen = input buffer len
* @ppOutput = output allocated buffe, must be free after use	* @ppOutput = output allocated buffe, must be io_free after use
* @pKey = key	* @pKey = key
* @pIV = IV, salt (8 bytes)	* @pIV = IV, salt (8 bytes)
* @nMode = Mode 0 - decrypting or 1 - encrypting	* @nMode = Mode 0 - decrypting or 1 - encrypting
Line 968 int io_Blowfish(unsigned char *pInput, int inLen, unsi	Line 995 int io_Blowfish(unsigned char *pInput, int inLen, unsi
*	*
* @pInput = Input buffer with ASCII	* @pInput = Input buffer with ASCII
* @inLen = Input buffer data length	* @inLen = Input buffer data length
* @ppOutput = Output buffer with cipher data, must be free after use	* @ppOutput = Output buffer with cipher data, must be io_free after use
* @pKey = Key	* @pKey = Key
* @IV = IVector/Nonce/Counter, Warning: IV must be variable, because we write there!!!	* @IV = IVector/Nonce/Counter, Warning: IV must be variable, because we write there!!!
* return: -1 error or >-1 how many cipher blocks proceeded	* return: -1 error or >-1 how many cipher blocks proceeded

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.17.4.6
changed lines
	Added in v.1.18.2.5