--- libaitio/inc/aitio.h 2011/10/31 14:13:02 1.12.2.1 +++ libaitio/inc/aitio.h 2012/03/27 22:31:37 1.15.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.12.2.1 2011/10/31 14:13:02 misho Exp $ +* $Id: aitio.h,v 1.15.2.3 2012/03/27 22:31:37 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 -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -78,45 +78,11 @@ typedef struct _tagArray { void **arr_data; } array_t; -/* URL staff ... */ - -typedef struct _tagURLItem { - int vallen; - char *value; -} url_Item_t; - -struct tagIOURL { - unsigned char url_line[BUFSIZ]; - - url_Item_t url_tech; - url_Item_t url_user; - url_Item_t url_pass; - url_Item_t url_host; - url_Item_t url_port; - url_Item_t url_path; - url_Item_t url_args; - - char *url_reserved; -}; - -struct tagReqXML { - unsigned char xml_line[BUFSIZ]; - - url_Item_t xml_namespace; - 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; -}; - /* AIT RPC variables and managment */ typedef enum { - empty, /* empty -> variable is not set */ - buffer, string, blob, /* buffer -> uint8_t*; string -> int8_t*; blob -> void*(+socket); */ + empty, ptr, data, /* empty -> variable is not set; ptr -> void*; data -> data after struct */ + buffer, string, blob, /* buffer -> uint8_t*; string -> int8_t*; blob -> uint32_t blobID(+socket); */ f32, f64, /* float -> f32; double -> f64 */ u8, u16, u32, u64, /* unsigned integers ... */ i8, i16, i32, i64, /* integers ... */ @@ -124,10 +90,13 @@ typedef enum { typedef struct { uint8_t val_type; + uint8_t val_pad; + uint16_t val_hash; uint32_t val_len; union { uint64_t net; + void *ptr; uint8_t *buffer; int8_t *string; uint32_t blob; @@ -142,13 +111,21 @@ typedef struct { int32_t i32; int64_t i64; } val; + uint8_t val_data[0]; } __packed ait_val_t; #define AIT_TYPE(_vl) ((ait_type_t) (_vl)->val_type) #define AIT_LEN(_vl) (_vl)->val_len +#define AIT_HASH(_vl) (_vl)->val_hash +#define AIT_RAW(_vl) (_vl)->val.net +#define AIT_VOID(_vl) (_vl)->val.ptr #define AIT_BLOB_CHUNKS(_vl, _n) (assert((_vl)), AIT_LEN((_vl)) / _n + (AIT_LEN((_vl)) % _n) ? 1 : 0) #define AIT_ISEMPTY(_vl) (assert((_vl)), AIT_TYPE((_vl)) == empty) +#define AIT_GET_LIKE(_vl, _type) (assert((_vl)), (_type) (_vl)->val.ptr) + +#define AIT_GET_PTR(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == ptr), (_vl)->val.ptr) +#define AIT_GET_DATA(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == data), (_vl)->val_data) #define AIT_GET_BUF(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer) #define AIT_GET_STR(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == string), (_vl)->val.string) #define AIT_GET_BLOB(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob) @@ -163,18 +140,38 @@ typedef struct { #define AIT_GET_F32(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32) #define AIT_GET_F64(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64) -#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \ +#define AIT_SET_DATA(_vl, _p, _len) do { ait_val_t *__val = (_vl); \ + __val = realloc(__val, sizeof(ait_val_t) + _len); \ + if (__val) { \ + __val->val_type = data; AIT_LEN(__val) = _len; \ + if ((_p)) \ + memcpy(__val->val_data, (_p), _len); \ + } \ + (_vl) = __val; \ + } while (0); +#define AIT_SET_PTR(_vl, _p, _len) do { ait_val_t *__val = (_vl); assert(__val); \ + __val->val_type = ptr; AIT_LEN(__val) = _len; \ + __val->val.ptr = _p; } while (0) +#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val.buffer = malloc(_len); \ if (__val->val.buffer) { \ __val->val_type = buffer; AIT_LEN(__val) = _len; \ memcpy(__val->val.buffer, (_v), _len); \ } } while (0) -#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \ +#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val.string = (int8_t*) strdup((_v)); \ if (__val->val.string) { \ __val->val_type = string; \ AIT_LEN(__val) = strlen((_v)) + 1; \ } } while (0) +#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ + assert(AIT_TYPE(__val) == string); \ + void *__p = realloc(AIT_LEN(__val) + strlen((_v))); \ + if (__p) { \ + __val->val.string = __p; \ + AIT_LEN(__val) += strlen((_v)); \ + strlcat(__val->val.string, (_v), AIT_LEN(__val)); \ + } } while (0) #define AIT_SET_BLOB(_vl, _n, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val_type = blob; AIT_LEN(__val) = _len; \ __val->val.blob = _n; } while (0) @@ -216,7 +213,11 @@ typedef struct { /* if attribute zeroCopy is set not execute free() */ #define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \ - switch (__val->val_type) { \ + if (AIT_TYPE(__val) == data) { \ + free(__val); \ + break; \ + } \ + switch (AIT_TYPE(__val)) { \ case buffer: \ if (__val->val.buffer) { \ free(__val->val.buffer); \ @@ -239,6 +240,7 @@ typedef struct { struct io_ether_addr { u_int8_t ether_addr_octet[6]; }; +typedef struct io_ether_addr io_ether_addr_t; typedef union { struct sockaddr_storage ss; @@ -250,6 +252,9 @@ typedef union { } io_sockaddr_t; +#define io_align(x, a) (((x) + (a)) & ~(a)) + + // io_GetErrno() Get error code of last operation inline int io_GetErrno(); // io_GetError() Get error text of last operation @@ -258,6 +263,7 @@ inline const char *io_GetError(); /* * io_ether_ntoa() Convert ethernet address to string + * * @n = ethernet address structure, like struct ether_addr * @a = string * @len = string length @@ -266,22 +272,50 @@ inline const char *io_GetError(); inline char *io_ether_ntoa(const struct io_ether_addr *n, char * __restrict a, int len); /* * io_ether_aton() Convert string to ethernet address + * * @a = string * @e = ethernet address structure, like struct ether_addr * return: NULL error or !=NULL ethernet address structure */ inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e); +/* + * io_n2port() Extract port from network structure + * + * @addr = Address + * return: 0 not supported family type or port number + */ +inline u_short io_n2port(io_sockaddr_t * __restrict addr); +/* + * io_n2addr() Extract address from network structure + * + * @addr = Address + * @val = Value for store string address + * return: NULL error or !=NULL string address from val + */ +const char *io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * __restrict val); +/* + * io_gethostbyname() Get host and port and make network structure + * + * @psHost = Hostname + * @port = Port + * @addr = Network address structure + * return: NULL error or !=NULL network structure + */ +io_sockaddr_t *io_gethostbyname(const char *psHost, unsigned short port, + io_sockaddr_t * __restrict addr); /* - * io_vals2buffer() Marshaling data from array with variables to buffer + * io_vars2buffer() Marshaling data from array with variables to buffer + * * @buf = Buffer * @buflen = Size of buffer * @vars = Variable array * return: -1 error, 0 nothing done or >0 size of marshaled data */ -int io_vals2buffer(unsigned char *buf, int buflen, array_t *vars); +int io_vars2buffer(unsigned char *buf, int buflen, array_t *vars); /* - * io_buffer2vals() De-marshaling data from buffer to array with variables + * io_buffer2vars() De-marshaling data from buffer to array with variables + * * @buf = Buffer * @buflen = Size of buffer * @vnum = Number of variables into buffer @@ -289,17 +323,19 @@ int io_vals2buffer(unsigned char *buf, int buflen, arr *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy() * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy() */ -array_t *io_buffer2vals(unsigned char *buf, int buflen, int vnum, int zcpy); +array_t *io_buffer2vars(unsigned char *buf, int buflen, int vnum, int zcpy); /* - * io_vals2map() Marshaling data from array with variables to memory map + * io_vars2map() Marshaling data from array with variables to memory map + * * @buf = Buffer * @buflen = Size of buffer * @vars = Variable array * return: -1 error, 0 nothing done or >0 size of marshaled data */ -int io_vals2map(u_char *buf, int buflen, array_t *vars); +int io_vars2map(unsigned char *buf, int buflen, array_t *vars); /* - * io_map2vals() De-marshaling data from memory map to array with variables + * io_map2vars() De-marshaling data from memory map to array with variables + * * @buf = Buffer * @buflen = Size of buffer * @vnum = Number of variables into buffer @@ -307,10 +343,47 @@ int io_vals2map(u_char *buf, int buflen, array_t *vars *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy() * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy() */ -array_t *io_map2vals(u_char *buf, int buflen, int vnum, int zcpy); +array_t *io_map2vars(unsigned char *buf, int buflen, int vnum, int zcpy); /* + * io_allocVar() Allocate memory for variable + * + * return: NULL error or new variable, after use free variable with io_freeVar() + */ +inline ait_val_t *io_allocVar(void); +/* + * io_freeVar() Free allocated memory for variable + * + * @val = Variable + * return: none + */ +inline void io_freeVar(ait_val_t * __restrict val); +/* + * io_allocVars() Allocate ait_val_t array + * + * @varnum = Number of variables + * return: =NULL error or !=NULL allocated array + */ +inline array_t *io_allocVars(int varnum); +/* + * io_clrVars() Clear ait_val_t elements from array + * + * @vars = Variable array + * return: -1 error or size of array + */ +inline int io_clrVars(array_t * __restrict vars); +/* + * io_freeVars() Free ait_val_t array + * + * @vars = Variable array + * return: none + */ +inline void io_freeVars(array_t ** __restrict vars); + + +/* * ioPromptRead() Read data from input h[0] with prompt to output h[1] + * * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout * @csPrompt = Prompt before input, may be NULL * @psData = Readed data @@ -320,6 +393,7 @@ array_t *io_map2vals(u_char *buf, int buflen, int vnum int ioPromptRead(int *h, const char *csPrompt, char * __restrict psData, int dataLen); /* * ioPromptPassword() Read password from input h[0] with prompt to output h[1] + * * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout * @csPrompt = Prompt before input, may be NULL * @psPass = Readed password @@ -331,6 +405,7 @@ int ioPromptPassword(int *h, const char *csPrompt, cha /* * ioRegexVerify() Function for verify data match in regex expression + * * @csRegex = Regulare expression pattern * @csData = Data for check and verify * @startPos = Return start positions @@ -340,6 +415,7 @@ int ioPromptPassword(int *h, const char *csPrompt, cha const char *ioRegexVerify(const char *csRegex, const char *csData, int *startPos, int *endPos); /* * ioRegexGet() Function for get data match in regex expression + * * @csRegex = Regulare expression pattern * @csData = Data from get * @psString = Returned string if match @@ -349,6 +425,7 @@ const char *ioRegexVerify(const char *csRegex, const c int ioRegexGet(const char *csRegex, const char *csData, char * __restrict psString, int strLen); /* * ioRegexReplace() Function for replace data match in regex expression with newdata + * * @csRegex = Regulare expression pattern * @csData = Source data * @csNew = Data for replace @@ -357,50 +434,44 @@ 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[:[-]#[:#]]}" + * ioStrAst() 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); +char *ioStrAst(const char *csString); /* - * io_Path2File() Parse and make path/filename pair - * @csArgs = Input argument line - * @psPath = Output Path, if ==NULL path not returned - * @pathLen = Size of path array - * @psFile = Output File - * @fileLen = Size of file array - * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items -*/ -inline int io_Path2File(const char * __restrict csArgs, char * __restrict psPath, int pathLen, - char * __restrict psFile, int fileLen); - -/* * io_UnquotStr() Remove quots from input text string + * * @psLine = Text string * return: 0 nothing to do; 1 successful unquoted string */ inline int io_UnquotStr(unsigned char * __restrict psLine); /* * io_LTrimStr() Remove left whitespaces from text string + * * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ inline int io_LTrimStr(unsigned char * __restrict psLine); /* * io_RTrimStr() Remove right whitespaces from text string + * * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ inline int io_RTrimStr(unsigned char * __restrict psLine); /* * io_TrimStr() Remove left and right whitespaces from text string + * * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ inline int io_TrimStr(unsigned char * __restrict psLine); /* * io_Ch2Hex() Convert from Char string to Hex string + * * @psLine = 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) @@ -408,6 +479,7 @@ inline int io_TrimStr(unsigned char * __restrict psLin inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen); /* * io_Hex2Ch() Convert from Hex string to Char string + * * @psLine = Text string * @lineLen = Length of Text string * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) @@ -415,13 +487,29 @@ inline unsigned char *io_Ch2Hex(unsigned char *psLine, inline char *io_Hex2Ch(unsigned char *psLine, int lineLen); /* + * io_Path2File() - Parse and make path/filename pair + * + * @csArgs = Input argument line + * @psPath = Output Path, if ==NULL path not returned + * @pathLen = Size of path array + * @psFile = Output File + * @fileLen = Size of file array + * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items + */ +inline int +io_Path2File(const char * __restrict csArgs, char * __restrict psPath, + int pathLen, char * __restrict psFile, int fileLen); + +/* * 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 and destroy dynamic array + * * @parr = Array * return: none */ @@ -429,12 +517,14 @@ inline void io_arrayDestroy(array_t ** __restrict parr /* * io_arrayFree() - Free all data in dynamic array items * (WARNING! If assign static array dont use this!!!) + * * @arr = Array * return: none */ inline void io_arrayFree(array_t * __restrict arr); /* * io_arrayFrom() - Create and fill array from array with pointers + * * @pargv = Array with pointers * @argc = Number of Items, if 0 walk through argv and stop when reach NULL item * return: NULL error, != NULL allocated new array @@ -442,18 +532,21 @@ inline void io_arrayFree(array_t * __restrict arr); inline array_t *io_arrayFrom(const char *** __restrict pargv, int argc); /* * io_arrayTo() - Create and fill array with pointers from dynamic array + * * @arr = Array * return: NULL error, != NULL allocated memory for array, NULL terminated */ inline char **io_arrayTo(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_arrayConcat() Concat source array to destination array + * * @dest = Destination array * @src = Source array * return: -1 error; >0 new count of destination array @@ -461,6 +554,7 @@ inline int io_arrayLen(array_t * __restrict arr); int io_arrayConcat(array_t * __restrict dest, array_t * __restrict src); /* * io_arrayCopy() Copy source array to destination array + * * @dest = Destination array, after use free with io_arrayDestroy() * @src = Source array * return: -1 error; >0 count of destination array @@ -468,6 +562,7 @@ int io_arrayConcat(array_t * __restrict dest, array_t int io_arrayCopy(array_t ** __restrict dest, array_t * __restrict src); /* * io_arrayGrow() - Grow/Shrink dynamic array, Use with care when it shrink!!! + * * @arr = Array * @newNumItems = Number of Items * @freeShrink = Free elements before shrink array @@ -476,6 +571,7 @@ int io_arrayCopy(array_t ** __restrict dest, array_t * int io_arrayGrow(array_t * __restrict arr, int newNumItems, int freeShrink); /* * io_arrayVacuum() - Vacuum dynamic array, empty elements will be deleted + * * @arr = Array * @fromWhere = 1 begin, 2 ALL empty elements * return: -1 error, 0 ok @@ -501,7 +597,17 @@ int io_arrayVacuum(array_t * __restrict arr, int fromW } while (0) /* + * io_arrayElem() - Always GET/PUT element into dynamic array, if not enough elements grow array + * + * @arr = Array + * @n = Position + * @data = Element, if set NULL GET element at position or !=NULL PUT element at position + * return: -1 error or !=-1 return element at position + */ +inline void *io_arrayElem(array_t * __restrict arr, int n, void *data); +/* * 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 @@ -509,6 +615,7 @@ int io_arrayVacuum(array_t * __restrict arr, int fromW 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 last used position * @delAfter = Delete after Pop element, !=0 delete element from array after return data @@ -518,6 +625,7 @@ inline int io_arrayPop(array_t * __restrict arr, void /* * 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 @@ -527,6 +635,7 @@ inline int io_argsNum(const char *csArgs, const char * /* * 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 @@ -538,6 +647,7 @@ int io_arrayMake(char * __restrict psArgs, int nargs, /* * io_MakeAV() Parse and make attribute/value pair + * * @csArgs = Input argument line * @csDelim = Delimiter for separate * @psAttr = Output Attribute @@ -551,6 +661,7 @@ int io_MakeAV(const char * __restrict csArgs, const ch /* * io_sarrInit() - Create and initialize dynamic split-order array + * * @numItems = Number of Items * @segLen = Length of segment * return: NULL error, != NULL allocated memory for array @@ -558,12 +669,14 @@ int io_MakeAV(const char * __restrict csArgs, const ch inline sarr_t *io_sarrInit(int numItems, int segLen); /* * io_sarrDestroy() - Free all data in dynamic split-order array and Destroy array + * * @parr = Array * return: none */ inline void io_sarrDestroy(sarr_t ** __restrict parr); /* * io_sarrGrow() - Grow/Shrink dynamic split-order array, Use with care when it shrink!!! + * * @arr = Array * @newNumItems = Number of Items * return: -1 error, 0 ok @@ -571,6 +684,7 @@ inline void io_sarrDestroy(sarr_t ** __restrict parr); int io_sarrGrow(sarr_t * __restrict arr, int newNumItems); /* * io_sarrVacuum() - Vacuum dynamic split-order array, empty segments will be freed + * * @arr = Array * return: -1 error, >-1 freed segments */ @@ -579,6 +693,7 @@ inline int io_sarrVacuum(sarr_t * __restrict arr); #define io_sarrSeg(_arr) (assert((_arr)), (_arr)->sarr_seg) /* * io_sarrCopy() Copy source split array to destination split array + * * @dest = Destination split array, after use free with io_sarrDestroy() * @src = Source split array * return: -1 error; >0 count of destination split array @@ -586,6 +701,7 @@ inline int io_sarrVacuum(sarr_t * __restrict arr); int io_sarrCopy(sarr_t ** __restrict dest, sarr_t * __restrict src); /* * io_sarrGet() - Get element from dynamic split-order array + * * @arr = Array * @idx = Index (warning 1st element is at position 1) * return: NULL not found, !=NULL element @@ -594,6 +710,7 @@ inline void *io_sarrGet(sarr_t * __restrict arr, unsig /* * io_sarrGet2() - Always get element from dynamic split-order array * Function automatic grow array. Good use for Hash tables! + * * @arr = Array * @idx = Index (warning 1st element is at position 1) * return: NULL not found, !=NULL element @@ -601,6 +718,7 @@ inline void *io_sarrGet(sarr_t * __restrict arr, unsig void *io_sarrGet2(sarr_t * __restrict arr, unsigned int idx); /* * io_sarrSet() - Set element to dynamic split-order array + * * @arr = Array * @idx = Index (warning 1st element is at position 1) * @data = Value @@ -611,6 +729,7 @@ inline void *io_sarrSet(sarr_t * __restrict arr, unsig #define io_sarr(_arr, _idx, _type) (_type)io_sarrGet((_arr), _idx) /* * io_sarr2array() - Convert from split-order array to dynamic array + * * @sa = split array * @sarrFree = after convert split array !=0 will be destroyed sarray * return: NULL error or != NULL new array @@ -618,6 +737,7 @@ inline void *io_sarrSet(sarr_t * __restrict arr, unsig array_t *io_sarr2array(sarr_t ** __restrict sa, int sarrFree); /* * io_array2sarr() - Convert from dynamic array to split-order array + * * @a = array * @segLen = Length of segment * @arrFree = after convert array !=0 will be destroyed @@ -627,12 +747,14 @@ sarr_t *io_array2sarr(array_t ** __restrict a, int seg /* * io_CopyEnv() Copy environment to new environment array; + * * @oldenv = Environment array * return: NULL error; !=NULL Allocated new environment array(must be free) */ char **io_CopyEnv(const char **oldenv); /* * io_ExecArgs() Build exec arguments from other array + * * @psProg = Program name for execute * @oldarg = Arguments array * return: NULL error; !=NULL Allocated execution array(must be free) @@ -640,49 +762,15 @@ char **io_CopyEnv(const char **oldenv); char **io_ExecArgs(const char *psProg, const char **oldarg); /* * io_FreeNullTerm() Free dynamic allocated null terminated array with strings + * * @arr = Pointer to array for free * return: none */ inline void io_FreeNullTerm(char *** __restrict arr); /* - * ioURLGet() Parse and get data from input URL - * @csURL = Input URL line - * @url = Output parsed URL - * return: 0 error format not find tech:// and return URL like path; - -1 error:: can`t read; >0 ok, up bits for known elements -*/ -int ioURLGet(const char *csURL, struct tagIOURL *url); -/* - * ioURLGetValue() Get value from parsed URL - * @url = Input parsed URL - * @csAttr = Attribute for search - * @psValue = Return value of attribute, if ==NULL only check for existence of attribute - * @valLen = Size of psValue array - * return: 0 error attribute not find; -1 error:: can`t read; >0 ok, find at position -*/ -int ioURLGetValue(struct tagIOURL *url, const char *csAttr, char * __restrict psValue, int valLen); -/* - * ioURLGetFile() Get file from parsed URL - * @url = Input parsed URL - * @psValue = Return filename, if not specified file in url path, replace with / - * @valLen = Size of psValue array - * return: -1 error:: can`t read; 0 ok -*/ -int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen); - - -/* - * ioXMLGet() Parse and get data from input XML request string [ns:]container[|attribute[=value]][?data] - * @csXML = Input XML request line - * @xml = Output parsed XML request - * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits -*/ -int ioXMLGet(const char *csXML, struct tagReqXML *xml); - - -/* * ioMkDir() Function for racursive directory creation and validation + * * @csDir = Full directory path * @mode = Mode for directory creation if missing dir * return: -1 error, 0 directory path exist, >0 created missing dirs @@ -691,6 +779,7 @@ 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 @@ -700,6 +789,7 @@ int ioWatchDirLoop(const char *csDir, int (*callback)( /* * io_rread() Raw VFS read function + * * @fd = File handle * @buf = Read buffer * @nbytes = Read buffer size @@ -710,6 +800,7 @@ int ioWatchDirLoop(const char *csDir, int (*callback)( inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update); /* * io_rwrite() Raw VFS write function + * * @fd = File handle * @buf = Write buffer * @nbytes = Write bytes from buffer @@ -727,33 +818,50 @@ inline int io_rwrite(int fd, void * __restrict buf, si /* Debug helper macros */ extern int io_Debug; -#define io_initDebug(x) io_Debug = (x); -#define io_addDebug io_Debug++ +#define io_enableDEBUG int io_Debug +#define io_initDebug(x) (io_Debug = (x)) +#define io_incDebug (io_Debug++) +#define io_decDebug (io_Debug--) + +/* Debug macros */ +#define ioVERBOSE(x) if ((x) <= io_Debug) +#define ioTRACE(x) if ((x) <= io_Debug) \ + syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__) #define ioDEBUG(x, fmt, ...) do { \ assert((fmt)); \ char str[STRSIZ] = { 0 }; \ snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ if ((x) <= io_Debug) \ - syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \ + syslog(LOG_DEBUG, "Debug(%d):%s(%d): %s\n", \ (x), __func__, __LINE__, str); \ } while (0) +/* Logger macro */ +#define ioLOGGER(x, fmt, ...) do { \ + assert((fmt)); \ + char str[STRSIZ] = { 0 }; \ + snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + syslog((x), "Logger:%s(%d): %s\n", \ + __func__, __LINE__, str); \ + } while (0) + +/* Error state macros */ #define ioERROR(x, fmt, ...) do { \ assert((fmt)); \ char str[STRSIZ] = { 0 }; \ snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ - syslog(LOG_ERR, "ioError():%s(%d): #%d - %s\n", \ + syslog(LOG_ERR, "Error:%s(%d): #%d - %s\n", \ __func__, __LINE__, (x), str); \ } while (0) -#define io_sysERROR(x) do { \ +#define ioSYSERR(x) do { \ if (x > 0 || errno) \ - syslog(LOG_ERR, "ioError(sys):%s(%d): #%d - %s\n", \ + syslog(LOG_ERR, "Error(sys):%s(%d): #%d - %s\n", \ __func__, __LINE__, x > 0 ? x : errno, \ strerror(x > 0 ? x : errno)); \ } while (0) -#define io_aitERROR(ait) do { \ +#define ioLIBERR(ait) do { \ if (ait##_GetErrno()) \ - syslog(LOG_ERR, "ioError(ait):%s(%d): #%d - %s\n", \ + syslog(LOG_ERR, "Error(lib):%s(%d): #%d - %s\n", \ __func__, __LINE__, ait##_GetErrno(), \ ait##_GetError()); \ } while (0) @@ -763,6 +871,7 @@ extern int io_Debug; /* * ioCipher() Cipher wrapper for all supported crypto algorythms + * * @pInput = input buffer * @inLen = input buffer len * @ppOutput = output allocated buffe, must be free after use @@ -777,6 +886,7 @@ int ioCipher(unsigned char *pInput, int inLen, unsigne /* * 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 @@ -789,6 +899,7 @@ int io_Blowfish(unsigned char *pInput, int inLen, unsi unsigned char *pKey, unsigned char *pIV, int nMode); /* * io_ctr_AES() Encrypt/Decrypt stream cipher CTR_AES + * * @pInput = Input buffer with ASCII * @inLen = Input buffer data length * @ppOutput = Output buffer with cipher data, must be free after use @@ -802,6 +913,7 @@ int io_ctr_AES(unsigned char *pInput, int inLen, unsig /* * ioAllocPTY() Allocate new PTY and TTY + * * @ptyfd = master fd, pty * @ttyfd = slave fd, tty * @name = tty device name if not null @@ -814,6 +926,7 @@ inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * _ struct termios * __restrict term, struct winsize * __restrict winz); /* * ioFreePTY() Release PTY and TTY device + * * @ptyfd = master fd, pty (==-1 skip closing pty) * @ttyname = tty filename * return: none @@ -821,6 +934,7 @@ inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * _ inline void ioFreePTY(int ptyfd, const char *ttyname); /* * ioChgWinPTY() Change window size of PTY + * * @ptyfd = master fd, pty * @row = row * @col = col @@ -832,6 +946,7 @@ inline int ioChgWinPTY(int ptyfd, unsigned short row, unsigned short xpxl, unsigned short ypxl); /* * ioSetOwnerTTY() Set owner to TTY + * * @ttyname = tty filename * @UID = uid * @GID = gid @@ -840,6 +955,7 @@ inline int ioChgWinPTY(int ptyfd, unsigned short row, int ioSetOwnerTTY(const char *ttyname, uid_t UID, gid_t GID); /* * ioSetSidTTY() Makes the process's controlling TTY and sets it to sane modes. + * * @ttyfd = slave fd, tty * @ttyname = tty filename * return: -1 error or 0 ok @@ -847,6 +963,7 @@ int ioSetOwnerTTY(const char *ttyname, uid_t UID, gid_ int ioSetSidTTY(int *ttyfd, const char *ttyname); /* * ioSetRAWMode() Enter into RAW mode + * * @fd = tty fd * @otio = saved old termios for later restore if !=NULL * return: -1 error or 0 ok @@ -854,6 +971,7 @@ int ioSetSidTTY(int *ttyfd, const char *ttyname); inline int ioSetRAWMode(int fd, struct termios *otio); /* * ioRestoreMode() Restore termios to tty fd + * * @fd = tty fd * @tio = termios structure for restore * return: -1 error or 0 ok @@ -861,6 +979,7 @@ inline int ioSetRAWMode(int fd, struct termios *otio); inline int ioRestoreMode(int fd, struct termios tio); /* * ioForkPTY() Fork new process with session leader and new TTY + * * @ptyfd = master fd, pty * @name = tty device name if not null * @namesiz = name length, must be above 63 bytes. @@ -874,11 +993,76 @@ pid_t ioForkPTY(int *ptyfd, char * __restrict name, in /* * ioCreatePIDFile() Create PID file + * * @csName = PID filename * @ifExists = !=0 if filename exists return error * return: -1 error or 0 ok */ inline int ioCreatePIDFile(const char *csName, int ifExists); + +/* + * ioSendFile() AITNET sendfile() userland implementation, not dependant from OS + * + * @s = socket + * @csFile = file for send + * @sendLen = bytes to send, if 0 send all data + * @offset = start file offset + * @sndbuf = SO_SNDBUF value, if 0 use default + * return: 0 error, >0 ok, sended bytes + */ +size_t ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset, int sndbuf); +/* + * ioRecvFile() Receive file from socket, fastest (zero-copy) way + * + * @s = socket + * @csFile = file for receive + * @recvLen = receive bytes + * @over = overwrite file if exists with mode like 0644 + * @rcvbuf = SO_RCVBUF value, if 0 use default + * return: 0 error, >0 ok, received bytes + */ +size_t ioRecvFile(int s, const char *csFile, size_t recvLen, int over, int rcvbuf); + + +/* Buffered file access over memory block */ + +/* + * io_fmemopen() File buffered stream operations over memory block + * + * @base = Base address of memory block, if =NULL Infinit length(auto-grow) + * @basesize = Size of memory block + * return: NULL error or !=NULL Opened file resource + */ +FILE *io_fmemopen(void ** __restrict base, off_t basesize); +/* + * io_fmapopen() File buffered stream operations over MMAP block + * + * @csFile = Filename for MMAP, if =NULL private MMAP block + * @mode = File open mode + * @perm = If file not exists will be created with this access permissions + * @prot = MMAP protection + * @flags = MMAP mode flags + * @offset = Map from file offset, if csFile==NULL then this is size of MMAP private block + * return: NULL error or !=NULL Opened file resource + */ +FILE *io_fmapopen(const char *csFile, int mode, int perm, int prot, int flags, off_t offset); +/* + * io_fd2buf() Convert open file handle to buffered file I/O + * + * @fd = File handle + * @mode = Permissions for new buffered file I/O + * return: NULL error or open buffered file + */ +inline FILE *io_fd2buf(int fd, const char *mode); +/* + * io_dumbFile() Create empry or dumb file with fixed size + * + * @csFile = Filename for create + * @mode = File access permissions + * @size = File size + * return: -1 error or open file handle + */ +int io_dumbFile(const char *csFile, int mode, off_t size); #endif