--- libaitio/inc/aitio.h 2010/09/27 16:08:37 1.5.2.1 +++ libaitio/inc/aitio.h 2011/04/20 22:56:32 1.8 @@ -1,15 +1,65 @@ /************************************************************************* -* (C) 2010 AITNET ltd - Sofia/Bulgaria - -* by Michael Pounov +* (C) 2010 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.5.2.1 2010/09/27 16:08:37 misho Exp $ +* $Id: aitio.h,v 1.8 2011/04/20 22:56:32 misho Exp $ * -*************************************************************************/ +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #ifndef __AITIO_H #define __AITIO_H +#include +#include + + +#define VACUUM_LEFT 1 +#define VACUUM_BETWEEN 2 + + +typedef struct _tagArray { + int arr_num; + void **arr_data; +} array_t; + typedef struct _tagURLItem { int vallen; char *value; @@ -33,12 +83,13 @@ struct tagReqXML { unsigned char xml_line[BUFSIZ]; url_Item_t xml_namespace; - url_Item_t xml_container; + union { + url_Item_t container; + url_Item_t path; + } xml_node; url_Item_t xml_data; url_Item_t xml_attribute; url_Item_t xml_value; - - char *xml_reserved; }; @@ -96,6 +147,13 @@ int ioRegexGet(const char *csRegex, const char *csData char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew); /* + * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" + * @csString = Input string + * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free() +*/ +char *ioVarAst(const char *csString); + +/* * io_Path2File() Parse and make path/filename pair * @csArgs = Input argument line * @psPath = Output Path, if ==NULL path not returned @@ -106,36 +164,6 @@ char *ioRegexReplace(const char *csRegex, const char * */ inline int io_Path2File(const char * __restrict csArgs, char * __restrict psPath, int pathLen, char * __restrict psFile, int fileLen); -/* - * io_MakeAV() Parse and make attribute/value pair - * @csArgs = Input argument line - * @csDelim = Delimiter for separate - * @psAttr = Output Attribute - * @attrLen = Size of attribute array - * @psValue = Output Value, if ==NULL this element not present value or not wanted for return - * @valLen = Size of value array - * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items -*/ -inline int io_MakeAV(const char * __restrict csArgs, const char *csDelim, - char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen); -/* - * io_SizeArray() Parse and calculate size of array - * @csArgs = Input arguments line - * @csDelim = Delimiter(s) for separate - * return: 0 error format; -1 error:: can`t read; >0 ok, number of items -*/ -inline int io_SizeArray(const char *csArgs, const char *csDelim); -/* - * io_MakeArray() Parse and make array of arguments values ... - * (input string will be modified! and output array must be free) - * @psArgs = Input arguments line, after execute string is modified!!! - * @csDelim = Delimiter(s) for separate - * @args = Output array of arguments ... (must be free() after procced function!) - * @nargs = Maximum requested count of arguments from input string psArgs - * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items -*/ -inline int io_MakeArray(char * __restrict psArgs, const char *csDelim, - char *** __restrict args, int nargs); /* * io_UnquotStr() Remove quots from input text string @@ -177,6 +205,105 @@ inline unsigned char *io_Ch2Hex(unsigned char *psLine, inline char *io_Hex2Ch(unsigned char *psLine, int lineLen); /* + * io_arrayInit() - Create and initialize dynamic array + * @numItems = Number of Items + * return: NULL error, != NULL allocated memory for array + */ +inline array_t *io_arrayInit(int numItems); +/* + * io_arrayDestroy() - Free all data in dynamic array and Destroy dynamic array + * @parr = Array + * return: none + */ +inline void io_arrayDestroy(array_t ** __restrict parr); +/* + * io_arrayFree() - Free all data in dynamic array + * (WARNING! If assign static array dont use this!!!) + * @arr = Array + * return: none + */ +inline void io_arrayFree(array_t * __restrict arr); +/* + * io_arrayLen() - Get last used element in dynamic array (array Length) + * @arr = Array + * return: -1 error, 0 empty or >0 position of last used element + */ +inline int io_arrayLen(array_t * __restrict arr); +/* + * io_arrayGrow() - Grow/Shrink dynamic array, Use with care when it shrink!!! + * @arr = Array + * @newNumItems = Number of Items + * return: -1 error, 0 ok + */ +int io_arrayGrow(array_t * __restrict arr, int newNumItems); +/* + * io_arrayVacuum() - Vacuum dynamic array, empty elements will be deleted + * @arr = Array + * @fromWhere = 1 begin, 2 ALL empty elements + * return: -1 error, 0 ok + */ +int io_arrayVacuum(array_t * __restrict arr, int fromWhere); + +#define io_arraySize(_arr) ((assert(_arr)), _arr->arr_num) + +#define io_arrayGet(_arr, _d, _type) ((assert(_arr && _arr->arr_num > _d)), \ + ((_type) *(_arr->arr_data + _d))) +#define io_arraySet(_arr, _d, _ptr) do { \ + assert(_arr && _arr->arr_num > _d); \ + *(_arr->arr_data + _d) = (void*) _ptr; \ + } while (0) + +/* + * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position + * @arr = Array + * @data = Element, if set NULL return only first empty position + * return: -1 not found empty position, array is full!, >-1 return position of stored element into array + */ +inline int io_arrayPush(array_t * __restrict arr, void **data); +/* + * io_arrayPop() - Pop element from dynamic array like stack manner, last used position + * @arr = Array + * @data = Element, if set NULL return only first empty position + * @delAfter = Delete after Pop element, !=0 delete element from array after return data + * return: -1 not found used position, array is empty!, >-1 return element position + */ +inline int io_arrayPop(array_t * __restrict arr, void ** __restrict data, int delAfter); + +/* + * io_argsNum() Parse and calculate number of arguments + * @csArgs = Input arguments line + * @csDelim = Delimiter(s) for separate + * return: 0 error format; -1 error:: can`t read; >0 ok, number of items + */ +inline int io_argsNum(const char *csArgs, const char *csDelim); + +/* + * io_arrayMake() Parse and make array from arguments ... (input string will be modified!!! + * and output array must be free with io_arrayDestroy() after use!) + * @psArgs = Input arguments line, after execute string is modified!!! + * @nargs = Maximum requested count of arguments from input string psArgs, if 0 all psArgs + * @csDelim = Delimiter(s) for separate + * @parr = Output array of arguments ... (must be free with io_arrayDestroy() after use!) + * 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, + array_t ** __restrict parr); + +/* + * io_MakeAV() Parse and make attribute/value pair + * @csArgs = Input argument line + * @csDelim = Delimiter for separate + * @psAttr = Output Attribute + * @attrLen = Size of attribute array + * @psValue = Output Value, if ==NULL this element not present value or not wanted for return + * @valLen = Size of value array + * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items +*/ +int io_MakeAV(const char * __restrict csArgs, const char *csDelim, + char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen); + + +/* * ioURLGet() Parse and get data from input URL * @csURL = Input URL line * @url = Output parsed URL @@ -220,7 +347,15 @@ int ioXMLGet(const char *csXML, struct tagReqXML *xml) */ int ioMkDir(const char *csDir, int mode); +/* + * ioWatchDirLoop() Function for watching changes in directory and fire callback + * @csDir = Full directory path + * @callback = Callback if raise event! nOp -1 delete, 0 change/move, 1 create + * return: -1 error, !=-1 ok, number of total signaled events +*/ +int ioWatchDirLoop(const char *csDir, int (*callback)(const char *csName, int nOp)); + /* * io_rread() Raw VFS read function * @fd = File handle @@ -280,6 +415,36 @@ extern int io_Debug; __func__, __LINE__, ait##_GetErrno(), \ ait##_GetError()); \ } while (0) + + +/* Crypto framework */ + +/* + * ioCipher() Cipher wrapper for all supported crypto algorythms + * @pInput = input buffer + * @inLen = input buffer len + * @ppOutput = output allocated buffe, must be free after use + * @Cipher = cipher engine, like EVP_bf_cbc() or etc... + * @pKey = key + * @pIV = IV, salt (8 bytes) + * @nMode = Mode 0 - decrypting or 1 - encrypting + * return: 0 not present data or error!; >0 number of processed and returned bytes into ppOutput +*/ +int ioCipher(unsigned char *pInput, int inLen, unsigned char **ppOutput, const EVP_CIPHER *Cipher, + unsigned char *pKey, unsigned char *pIV, int nMode); + +/* + * io_Blowfish() Blowfish cipher algorythm, work with ASCII hex strings + * @pInput = input buffer + * @inLen = input buffer len + * @ppOutput = output allocated buffe, must be free after use + * @pKey = key + * @pIV = IV, salt (8 bytes) + * @nMode = Mode 0 - decrypting or 1 - encrypting + * return: 0 not present data or error!; >0 number of processed and returned bytes into ppOutput +*/ +int io_Blowfish(unsigned char *pInput, int inLen, unsigned char **ppOutput, + unsigned char *pKey, unsigned char *pIV, int nMode); #endif